This commit was manufactured by cvs2svn to create tag
'Root_R2_0_maintenance'.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.classpath b/bundles/org.eclipse.wst.jsdt.web.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.options b/bundles/org.eclipse.wst.jsdt.web.core/.options
deleted file mode 100644
index 89a2c96..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.options
+++ /dev/null
@@ -1,35 +0,0 @@
-org.eclipse.jst.jsp.core/debug=true
-org.eclipse.jst.jsp.core/debug/tracefilter=
-org.eclipse.jst.jsp.core/debug/jspindexmanager=false
-org.eclipse.jst.jsp.core/debug/jsptranslation=false
-org.eclipse.jst.jsp.core/debug/jsptranslationstodisk=false
-org.eclipse.jst.jsp.core/debug/jspsearch=false
-
-org.eclipse.jst.jsp.core/taglib/resolve=false
-
-
-# org.eclipse.jst.jsp.core.contentmodel.tld.TLDCMDocumentManager._debug
-org.eclipse.jst.jsp.core/debug/tldcmdocument/manager=false
-org.eclipse.jst.jsp.core/debug/tldcmdocument/cache=false
-
-# org.eclipse.jst.jsp.core.contentmodel.tld.CMDocumentFactoryTLD._debug
-org.eclipse.jst.jsp.core/debug/tldcmdocument/factory=false
-
-#org.eclipse.jst.jsp.core.internal.contentmodel.ProjectDescription._debugIndexCreation
-org.eclipse.jst.jsp.core/taglib/indexcreation=false
-#org.eclipse.jst.jsp.core.internal.contentmodel.ProjectDescription._debugIndexTime
-org.eclipse.jst.jsp.core/taglib/indextime=false
-
-#org.eclipse.jst.jsp.core.internal.contentmodel.TaglibIndex._debugEvents
-org.eclipse.jst.jsp.core/taglib/events=false
-#org.eclipse.jst.jsp.core.internal.contentmodel.TaglibIndex._debugIndexCreation
-org.eclipse.jst.jsp.core/taglib/indexcreation=false
-#org.eclipse.jst.jsp.core.internal.contentmodel.TaglibIndex._debugResolution
-org.eclipse.jst.jsp.core/taglib/resolve=false
-
-org.eclipse.jst.jsp.core/debug/jspjavamapping=false
-
-org.eclipse.jst.jsp.core/debug/jspvalidator=false
-org.eclipse.jst.jsp.core/debug/taglibvars=false
-
-org.eclipse.jst.jsp.core/debug/taglibclassloader
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.project b/bundles/org.eclipse.wst.jsdt.web.core/.project
deleted file mode 100644
index 22cb875..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a5be61a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,49 +0,0 @@
-#Tue Mar 27 10:40:34 CDT 2007
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_source_code=true
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=true
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=true
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=true
-cleanup.sort_members_all=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_Eclipse [built-in] + Brad Tweaks
-cleanup_settings_version=2
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 76954a2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JSDT Web Support Core (Incubation)
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.core; singleton:=true
-Bundle-Version: 0.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.jsdt.web.core.internal;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.java;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.java.search;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.modelhandler;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.project,
- org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.provisional.text;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.tasks;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.validation;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.text
-Require-Bundle: com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text,
- org.eclipse.wst.jsdt.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.jsdt.ui
-Eclipse-LazyStart: true
-Import-Package: org.eclipse.swt.widgets,
- org.eclipse.wst.common.componentcore,
- org.eclipse.wst.common.componentcore.internal.util,
- org.eclipse.wst.common.componentcore.resources
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/eclipse.inf b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Processed using Jarprocessor
-pack200.conditioned = true
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/build.properties b/bundles/org.eclipse.wst.jsdt.web.core/build.properties
deleted file mode 100644
index 8491309..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-bin.includes = .options,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               component.xml
-src.includes = component.xml
-              
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/component.xml b/bundles/org.eclipse.wst.jsdt.web.core/component.xml
deleted file mode 100644
index 0d66ac2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/component.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.jsdt.web">
-	<component-depends unrestricted="true" />
-	<plugin id="org.eclipse.wst.jsdt.web.core" fragment="false" />
-	<package name="org.eclipse.wst.jsdt.web.core.taglib" api="false">
-		<type name="IJarRecord" implement="false" />
-		<!-- <type name="ITagDirRecord" implement="false" /> -->
-		<!-- <type name="ITaglibIndexListener" implement="true" /> -->
-		<type name="ITaglibDescriptor" implement="false" />
-		<type name="ITaglibRecord" implement="false" />
-		<!-- <type name="ITaglibRecordEvent" implement="false" /> -->
-		<type name="ITLDRecord" implement="false" />
-		<type name="IURLRecord" implement="false" />
-		<type name="TaglibIndex" subclass="false" instantiate="false" />
-	</package>
-	<plugin id="org.eclipse.wst.jsdt.web.ui" fragment="false" />
-	<package name="org.eclipse.wst.jsdt.web.ui" api="false">
-		<type name="StructuredTextViewerConfigurationJSP" subclass="true" instantiate="true" />
-	</package>
-	<package name="org.eclipse.wst.jsdt.web.ui.views.contentoutline" api="false">
-		<type name="JSPContentOutlineConfiguration" subclass="true" instantiate="true" />
-	</package>
-	<plugin id="org.eclipse.wst.jsdt.web.ui.infopop" fragment="false" />
-	<description url="http://eclipse.org/webtools/jst/components/jsp/overview.html" />
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
deleted file mode 100644
index 2222c04..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <!-- Install Handler for web JSDT.. Pigybacks on wst.web facet-->
-   <extension point="org.eclipse.wst.common.project.facet.core.facets">
-   
-		<event-handler facet="wst.web" type="POST_INSTALL" version="[1.0">
-	   		<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureInstaller"/>
-		</event-handler>
-	
-		<event-handler facet="wst.web" type="POST_UNINSTALL" version="[1.0">
-			<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureUninstaller"/>
-		</event-handler>
-
-		<event-handler facet="jst.web" type="POST_INSTALL"  version="[2.4">
-	   		<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureInstaller"/>
-		</event-handler>
-	
-		<event-handler facet="jst.web" type="POST_UNINSTALL" version="[2.4">
-			<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureUninstaller"/>
-		</event-handler>
-
-	
-	</extension>
-	
-	   <extension id="embeded.jsNature" name="JavaScript Embeded" point="org.eclipse.core.resources.natures"> 
-		   <runtime>          
-		   	<run class="org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature"/>       
-		   </runtime>       
-	 	   <builder id="org.eclipse.wst.jsdt.web.core.embeded.javascript"/>    
-	   </extension> 
-	   
-
-	   	<!-- 
-	   	Not using this at the moment, but everythings in place if we need in the future. 
-	    -->  
-	   
-	   <extension id="embeded.javascript" name="Embeded JavaScript Builder" point="org.eclipse.core.resources.builders">       
-		   	<builder hasNature="true" callOnEmptyDelta="true">
-		   	      
-		   	<run class="org.eclipse.wst.jsdt.web.core.internal.IncrementalBuilder"/>      
-		   </builder>    
-	   </extension>
-	
-	
-	
-	
-	
-	<extension point="org.eclipse.wst.sse.core.taskscanner">
-		<scanner
-			id="org.eclipse.wst.jsdt.web.core.internal.tasks.JsFileTaskScanner"
-			class="org.eclipse.wst.jsdt.web.core.internal.tasks.JsFileTaskScanner"
-			contentTypeIds="org.eclipse.wst.html.core.htmlsource" />
-	</extension>
-	
-	
-	<extension point="org.eclipse.wst.sse.core.formatProcessors">
-		<processor
-			class="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl"
-			contentTypeId="org.eclipse.wst.html.core.htmlsource">
-		</processor>
-	</extension>
-	
-
-	<!--======================================================================================-->
-	<!-- JSP batch validation                                       						  -->
-	<!--======================================================================================-->
-	<extension
-		id="JsBatchValidator"
-		name="JavaScript Syntax Validation"
-		point="org.eclipse.wst.validation.validator">
-		<validator>
-			<projectNature id="org.eclipse.wst.jsdt.core.jsNature" />
-
-			<filter
-				objectClass="org.eclipse.core.resources.IFile"
-				nameFilter="*.html">
-			</filter>
-			<filter
-				objectClass="org.eclipse.core.resources.IFile"
-				nameFilter="*.htm">
-			</filter>
-			
-			<filter
-				objectClass="org.eclipse.core.resources.IFile"
-				nameFilter="*.jsp">
-			</filter>
-			 
-
-			<enablement/>
-
-			<helper
-				class="org.eclipse.wst.validation.internal.operations.WorkbenchContext">
-			</helper>
-
-			<run
-				enabled="true"
-				class="org.eclipse.wst.jsdt.web.core.internal.validation.JsBatchValidator">
-			</run>
-		</validator>
-	</extension>
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java
deleted file mode 100644
index f8e930e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author childsb
- * 
- * Project builder-- I thought having a builder would activate the plugin, but
- * it doesn't.
- * 
- * I'm leaving it here incase we need it later.
- * 
- */
-public class IncrementalBuilder extends IncrementalProjectBuilder {
-	public IncrementalBuilder() {
-		System.out.println("Unimplemented method:IncrementalProjectBuilder()");
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int,
-	 *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
-		// TODO Auto-generated method stub
-		System.out.println("Unimplemented method:IncrementalBuilder.build");
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties
deleted file mode 100644
index 9b58c0a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-JSPIndexManager_0=Updating JSP Index
-JSPIndexManager_2=JSP Indexer indexing {0} files
-JSP_Search=JSP Search - 
-JSPDocumentLoader_1=Program Error: structured model had no structuredDocument
-JSPEL_Syntax=EL Syntax Error 
-JSPEL_Token=Unable to analyse EL expression due to lexical analysis error
-MESSAGE_JSP_VALIDATING_MESSAGE_UI_=JSP Validator validating {0}
-JSPFContentPropertiesManager_Updating=Updating JSP Fragment Content Settings
-JSPFContentPropertiesManager_Problems_Updating=Problem saving JSP Fragment Content Settings for {0}
-JSPDirectiveValidator_0={0} is a reserved prefix.  Try another
-JSPDirectiveValidator_1=Cannot find the tag library descriptor for {0}
-JSPDirectiveValidator_2=The prefix {0} is used more than once
-JSPDirectiveValidator_3=A {0} value is required in this directive
-JSPBatchValidator_0=Gathering files in {0}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java
deleted file mode 100644
index b3f05e6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by JSP Core
- * 
- * @plannedfor 1.0
- */
-public class JsCoreMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.core.internal.JSPCorePluginResources"; //$NON-NLS-1$
-	public static String JSP_Search;
-	public static String JSPBatchValidator_0;
-	public static String JSPDirectiveValidator_0;
-	public static String JSPDirectiveValidator_1;
-	public static String JSPDirectiveValidator_2;
-	public static String JSPDirectiveValidator_3;
-	public static String JSPDocumentLoader_1;
-	public static String JSPEL_Syntax;
-	public static String JSPEL_Token;
-	public static String JSPFContentPropertiesManager_Problems_Updating;
-	public static String JSPFContentPropertiesManager_Updating;
-	public static String JSPIndexManager_0;
-	public static String JSPIndexManager_2;
-	/**
-	 * @deprecated
-	 */
-
-	public static String MESSAGE_JSP_VALIDATING_MESSAGE_UI_;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(JsCoreMessages.BUNDLE_NAME, JsCoreMessages.class);
-	}
-	
-	private JsCoreMessages() {}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java
deleted file mode 100644
index f3be6c6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsIndexManager;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JsCorePlugin extends Plugin {
-	// The shared instance.
-	private static JsCorePlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core";
-	
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @deprecated - will be removed. Currently used to get "model preferences",
-	 *             but there are other, better ways.
-	 */
-
-	public static JsCorePlugin getDefault() {
-		return JsCorePlugin.plugin;
-	}
-	
-	/**
-	 * The constructor.
-	 */
-	public JsCorePlugin() {
-		super();
-		JsCorePlugin.plugin = this;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		// JSPIndexManager depends on TaglibController, so TaglibController
-		// should be started first
-		// listen for classpath changes
-		JsIndexManager.getInstance().initialize();
-		// listen for resource changes to update content properties keys
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	
-	public void stop(BundleContext context) throws Exception {
-		// stop listenning for resource changes to update content properties
-		// keys
-		// stop any indexing
-		JsIndexManager.getInstance().shutdown();
-		super.stop(context);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java
deleted file mode 100644
index bb730e3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + Logger.ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + Logger.INFO;
-	public static final int OK = IStatus.OK; // 0
-	public static final int OK_DEBUG = 200 + Logger.OK;
-	private static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + Logger.WARNING;
-	
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == Logger.OK_DEBUG || level == Logger.INFO_DEBUG || level == Logger.WARNING_DEBUG || level == Logger.ERROR_DEBUG) {
-			if (!Logger.isDebugging()) {
-				return;
-			}
-		}
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG:
-			case INFO:
-				severity = IStatus.INFO;
-			break;
-			case WARNING_DEBUG:
-			case WARNING:
-				severity = IStatus.WARNING;
-			break;
-			case ERROR_DEBUG:
-			case ERROR:
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, Logger.PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-		if (bundle != null) {
-			Platform.getLog(bundle).log(statusObj);
-		}
-	}
-	
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (Logger.isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, Logger.PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-			if (bundle != null) {
-				Platform.getLog(bundle).log(statusObj);
-			}
-		}
-	}
-	
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!Logger.isDebugging()) {
-			return false;
-		}
-		String traceFilter = Platform.getDebugOption(Logger.PLUGIN_ID + Logger.TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void log(int level, String message) {
-		Logger._log(level, message, null);
-	}
-	
-	public static void log(int level, String message, Throwable exception) {
-		Logger._log(level, message, exception);
-	}
-	
-	public static void logException(String message, Throwable exception) {
-		Logger._log(Logger.ERROR, message, exception);
-	}
-	
-	public static void logException(Throwable exception) {
-		Logger._log(Logger.ERROR, exception.getMessage(), exception);
-	}
-	
-	public static void trace(String category, String message) {
-		Logger._trace(category, message, null);
-	}
-	
-	public static void traceException(String category, String message, Throwable exception) {
-		Logger._trace(category, message, exception);
-	}
-	
-	public static void traceException(String category, Throwable exception) {
-		Logger._trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/CompilationUnitHelper.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/CompilationUnitHelper.java
deleted file mode 100644
index 21d9964..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/CompilationUnitHelper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-
-/**
- * To ensure there is only one instance of ProblemRequestor and WorkingCopyOwner
- * for JSP plugins. These were removed from JSPTranslation to ensure that the
- * JSPTranslation was not held in memory by any type of JDT lists (caching
- * search results, etc...)
- * 
- * @author pavery
- */
-public class CompilationUnitHelper {
-	private static CompilationUnitHelper instance;
-	
-	public synchronized static final CompilationUnitHelper getInstance() {
-		if (CompilationUnitHelper.instance == null) {
-			CompilationUnitHelper.instance = new CompilationUnitHelper();
-		}
-		return CompilationUnitHelper.instance;
-	}
-	private JsProblemRequestor fProblemRequestor = null;
-	private WorkingCopyOwner fWorkingCopyOwner = null;
-	
-	private CompilationUnitHelper() {
-	// force use of instance
-	}
-	
-	public JsProblemRequestor getProblemRequestor() {
-		if (fProblemRequestor == null) {
-			fProblemRequestor = new JsProblemRequestor();
-		}
-		return fProblemRequestor;
-	}
-	
-	public WorkingCopyOwner getWorkingCopyOwner() {
-		if (fWorkingCopyOwner == null) {
-			fWorkingCopyOwner = new WorkingCopyOwner() {
-				
-				public String toString() {
-					return "JSP Working copy owner"; //$NON-NLS-1$
-				}
-			};
-		}
-		return fWorkingCopyOwner;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/DocumentChangeListenerToTextEdit.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/DocumentChangeListenerToTextEdit.java
deleted file mode 100644
index 5deade5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/DocumentChangeListenerToTextEdit.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- * @author childsb
- * 
- */
-public class DocumentChangeListenerToTextEdit implements IDocumentListener {
-	private MultiTextEdit textEdit;
-	
-	public DocumentChangeListenerToTextEdit() {
-		textEdit = new MultiTextEdit();
-	}
-	
-	public void documentAboutToBeChanged(DocumentEvent event) {
-	// System.out.println("Unimplemented
-	// method:DocumentChangeListenerToTextEdit.documentAboutToBeChanged");
-	}
-	
-	public void documentChanged(DocumentEvent event) {
-		int length = event.getLength();
-		int offset = event.getOffset();
-		String text = event.getText();
-		if (length < 0) {
-			return;
-		}
-		if (length == 0) {
-			/* inserting text operation */
-			InsertEdit edit = new InsertEdit(offset, text);
-			textEdit.addChild(edit);
-			System.out.println("-------------Insert Text Edit");
-		} else if (text == null || text.equals("")) {
-			/* delete operation */
-			DeleteEdit edit = new DeleteEdit(offset, length);
-			textEdit.addChild(edit);
-			System.out.println("-------------Delete Text Edit");
-		} else if (length > 0) {
-			/* replace text operation */
-			ReplaceEdit edit = new ReplaceEdit(offset, length, text);
-			textEdit.addChild(edit);
-			System.out.println("-------------Replace Text Edit");
-		}
-	}
-	
-	public MultiTextEdit getTextEdits() {
-		return textEdit;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/IJsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/IJsTranslation.java
deleted file mode 100644
index 2e7b215..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/IJsTranslation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import java.util.List;
-
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-
-/**
- * @author childsb
- * 
- */
-public interface IJsTranslation {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#fixupMangledName(java.lang.String)
-	 */
-	public abstract String fixupMangledName(String displayString);
-	
-	public abstract IJavaElement[] getAllElementsInJsRange(int jspStart, int jspEnd);
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getCompilationUnit()
-	 */
-	public abstract ICompilationUnit getCompilationUnit();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getElementsFromJspRange(int,
-	 *      int)
-	 */
-	public abstract IJavaElement[] getElementsFromJsRange(int jspStart, int jspEnd);
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getJspText()
-	 */
-	public abstract String getHtmlText();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#isUseBean(int)
-	 */
-	// public boolean isUseBean(int javaOffset) {
-	// System.out.println("REMOVE JSPTranslation.isUseBean(int javaOffset)");
-	// return false;
-	// }
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getJavaPath()
-	 */
-	public abstract String getJavaPath();
-	
-	public abstract IJavaElement getJsElementAtOffset(int htmlstart);
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJSPTranslation#getJavaText()
-	 */
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getJavaText()
-	 */
-	public abstract String getJsText();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getProblems()
-	 */
-	public abstract List getProblems();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#getWorkingCopyOwner()
-	 */
-	public abstract WorkingCopyOwner getWorkingCopyOwner();
-	
-	public abstract boolean ifOffsetInImportNode(int offset);
-	
-	//public abstract boolean isOffsetInScriptNode(int offset);
-	
-	public abstract void reconcileCompilationUnit();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#release()
-	 */
-	public abstract void release();
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.JSPTranslation_Interface#setProblemCollectingActive(boolean)
-	 */
-	public abstract void setProblemCollectingActive(boolean collect);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsDataTypes.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsDataTypes.java
deleted file mode 100644
index 7ab0b5d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsDataTypes.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-
-public interface JsDataTypes extends HTML40Namespace {
-	/*
-	 * remove when when we refactor (need to add this content type to many
-	 * project types in wst)
-	 */
-	public static final String BASE_FILE_EXTENSION = ".js";
-	public static String[] CONSTANTS = { "false", "null", "true" }; //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	public static final String[] EVENTS = { HTML40Namespace.ATTR_NAME_ONCLICK, HTML40Namespace.ATTR_NAME_ONDBLCLICK, HTML40Namespace.ATTR_NAME_ONMOUSEDOWN,
-			HTML40Namespace.ATTR_NAME_ONMOUSEUP, HTML40Namespace.ATTR_NAME_ONMOUSEOVER, HTML40Namespace.ATTR_NAME_ONMOUSEMOVE,
-			HTML40Namespace.ATTR_NAME_ONMOUSEOUT, HTML40Namespace.ATTR_NAME_ONKEYPRESS, HTML40Namespace.ATTR_NAME_ONKEYDOWN, HTML40Namespace.ATTR_NAME_ONKEYUP,
-			HTML40Namespace.ATTR_NAME_ONHELP };
-	public static final String[] HTMLATREVENTS = { "onload ", "onunload", "onclick", "onmousedown", "onmouseup", "onmouseover", "onmousemove", "onmouseout",
-			"onfocus", "onblur", "onkeypress", "onkeydown", "onkeyup", "onsubmit", "onreset", "onselect", "onchange", };
-	public static final String[] JSVALIDDATATYPES = { "JAVASCRIPT", "TEXT/JAVASCRIPT" }; //$NON-NLS-1$
-	public static String[] KEYWORDS = { "abstract", "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else",
-			"enum", "export", "extends", "final", "finally", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "interface",
-			"native", "new", "package", "private", "protected", "public", "return",
-			"static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "try", "typeof", "volatile", "while", "with" }; //$NON-NLS-1$
-	// public static final String
-	// NEW_PARTITION_TYPE="org.eclipse.wst.jsdt.StructuredJs";
-	// public static final String NEW_PARTITION_TYPE=IHTMLPartitions.SCRIPT;
-	public static final String NEW_PARTITION_TYPE = IHTMLPartitions.SCRIPT;
-	public static final String[] TAKEOVER_PARTITION_TYPES = { "none" };
-	public static String[] TYPES = { "boolean", "byte", "char", "double", "int", "long", "short", "float", "var", "void" }; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsNameManglerUtil.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsNameManglerUtil.java
deleted file mode 100644
index d953f82..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsNameManglerUtil.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java;
-
-import java.io.File;
-
-/**
- * @author pavery
- */
-public class JsNameManglerUtil {
-	/**
-	 * Determine if given string is a valid Hex representation of an ASCII
-	 * character (eg. 2F -> /)
-	 * 
-	 * @param possible
-	 * @return
-	 */
-	private static boolean isValid(String possible) {
-		boolean result = false;
-		if (possible.length() == 2) {
-			char c1 = possible.charAt(0);
-			char c2 = possible.charAt(1);
-			// 1st character must be a digit
-			if (Character.isDigit(c1)) {
-				// 2nd character must be digit or upper case letter A-F
-				if (Character.isDigit(c2)) {
-					result = true;
-				} else if (Character.isUpperCase(c2) && (c2 == 'A' || c2 == 'B' || c2 == 'C' || c2 == 'D' || c2 == 'E' || c2 == 'F')) {
-					result = true;
-				}
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Mangle string to WAS-like specifications
-	 * 
-	 */
-	public final static String mangle(String name) {
-		StringBuffer modifiedName = new StringBuffer();
-		// extension (.jsp, .jspf, .jspx, etc...) should already be encoded in
-		// name
-		int length = name.length();
-		// in case name is forbidden (a number, class, for, etc...)
-		modifiedName.append('_');
-		// ensure rest of characters are valid
-		for (int i = 0; i < length; i++) {
-			char currentChar = name.charAt(i);
-			if (Character.isJavaIdentifierPart(currentChar) == true) {
-				modifiedName.append(currentChar);
-			} else {
-				modifiedName.append(JsNameManglerUtil.mangleChar(currentChar));
-			}
-		}
-		return modifiedName.toString();
-	}
-	
-	/**
-	 * take a character and return its hex equivalent
-	 */
-	private final static String mangleChar(char ch) {
-		if (ch == File.separatorChar) {
-			ch = '/';
-		}
-		if (Character.isLetterOrDigit(ch) == true) {
-			return "" + ch; //$NON-NLS-1$
-		}
-		return "_" + Integer.toHexString(ch).toUpperCase() + "_"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * WAS mangles Tom&Jerry as: _Tom_26_Jerry; this takes in the mangled name
-	 * and returns the original name.
-	 * 
-	 * Unmangles the qualified type name. If an underscore is found it is
-	 * assumed to be a mangled representation of a non-alpha, non-digit
-	 * character of the form _NN_, where NN are hex digits representing the
-	 * encoded character. This routine converts it back to the original
-	 * character.
-	 */
-	public final static String unmangle(String qualifiedTypeName) {
-		if (qualifiedTypeName.charAt(0) != '_') {
-			return qualifiedTypeName;
-		}
-		StringBuffer buf = new StringBuffer();
-		String possible = ""; //$NON-NLS-1$
-		// remove the .java extension if there is one
-		if (qualifiedTypeName.endsWith(".js")) {
-			qualifiedTypeName = qualifiedTypeName.substring(0, qualifiedTypeName.length() - 3);
-		}
-		for (int i = 1; i < qualifiedTypeName.length(); i++) { // start at
-			// index 1 b/c
-			// 1st char is
-			// always '_'
-			char c = qualifiedTypeName.charAt(i);
-			if (c == '_') {
-				int endIndex = qualifiedTypeName.indexOf('_', i + 1);
-				if (endIndex == -1) {
-					buf.append(c);
-				} else {
-					char unmangled;
-					try {
-						possible = qualifiedTypeName.substring(i + 1, endIndex);
-						if (JsNameManglerUtil.isValid(possible)) {
-							unmangled = (char) Integer.decode("0x" + possible).intValue();//$NON-NLS-1$
-							i = endIndex;
-						} else {
-							unmangled = c;
-						}
-					} catch (NumberFormatException e) {
-						unmangled = c;
-					}
-					buf.append(unmangled);
-				}
-			} else {
-				buf.append(c);
-			}
-		}
-		return buf.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsProblemRequestor.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsProblemRequestor.java
deleted file mode 100644
index 6bb98b0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsProblemRequestor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-/**
- * @author pavery
- */
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.jsdt.core.IProblemRequestor;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-
-class JsProblemRequestor implements IProblemRequestor {
-	private List fCollectedProblems;
-	private boolean fIsActive = false;
-	private boolean fIsRunning = false;
-	
-	public void acceptProblem(IProblem problem) {
-		if (isActive()) {
-			fCollectedProblems.add(problem);
-		}
-	}
-	
-	public void beginReporting() {
-		fIsRunning = true;
-		fCollectedProblems = new ArrayList();
-	}
-	
-	public void endReporting() {
-		fIsRunning = false;
-	}
-	
-	/**
-	 * @return the list of collected problems
-	 */
-	public List getCollectedProblems() {
-		return fCollectedProblems;
-	}
-	
-	public boolean isActive() {
-		return fIsActive && fCollectedProblems != null;
-	}
-	
-	public boolean isRunning() {
-		return fIsRunning;
-	}
-	
-	/**
-	 * Sets the active state of this problem requestor.
-	 * 
-	 * @param isActive
-	 *            the state of this problem requestor
-	 */
-	public void setIsActive(boolean isActive) {
-		if (fIsActive != isActive) {
-			fIsActive = isActive;
-			if (fIsActive) {
-				startCollectingProblems();
-			} else {
-				stopCollectingProblems();
-			}
-		}
-	}
-	
-	/**
-	 * Tells this annotation model to collect temporary problems from now on.
-	 */
-	private void startCollectingProblems() {
-		fCollectedProblems = new ArrayList();
-	}
-	
-	/**
-	 * Tells this annotation model to no longer collect temporary problems.
-	 */
-	private void stopCollectingProblems() {
-	// do nothing
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java
deleted file mode 100644
index 82926a1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslation.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-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.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.IPackageDeclaration;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.core.LibrarySuperType;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-import org.eclipse.wst.jsdt.internal.core.DocumentContextFragmentRoot;
-import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * @author brad childs
- */
-public class JsTranslation implements IJsTranslation {
-	
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslation"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	private ICompilationUnit fCompilationUnit = null;
-	private DocumentContextFragmentRoot fDocumentScope;
-	private IJavaProject fJavaProject = null;
-	private byte[] fLock = null;
-	private IProgressMonitor fProgressMonitor = null;
-	private IStructuredDocument fHtmlDocument;
-	private String fModelBaseLocation;
-	
-	
-	private static final String SUPER_TYPE_NAME = "Window";
-	private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary";
-	
-	private JsTranslator translator;
-	
-	private String mangledName;
-	private boolean listenForChanges;
-	
-//	public JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj) {
-//		fLock = new byte[0];
-//		fJavaProject = javaProj;
-//		fHtmlDocument = htmlDocument;
-//		setBaseLocation();
-//		translator = new JsTranslator(htmlDocument, fModelBaseLocation);
-//		mangledName = createMangledName();
-//		listenForChanges = true;
-//	}	
-	
-	public JsTranslation(IStructuredDocument htmlDocument, IJavaProject javaProj, boolean listenForChanges) {
-		fLock = new byte[0];
-		fJavaProject = javaProj;
-		fHtmlDocument = htmlDocument;
-		setBaseLocation();
-		translator = new JsTranslator(htmlDocument, fModelBaseLocation,listenForChanges);
-		mangledName = createMangledName();	
-		this.listenForChanges=listenForChanges;
-	}
-	
-	public IJavaProject getJavaProject() {
-		return fJavaProject;
-	}
-
-	private IPackageFragmentRoot getDocScope(boolean reset) {
-		if(fDocumentScope==null) {
-			IProject project = getJavaProject().getProject();
-			IResource absoluteRoot = ((IContainer)getJavaProject().getResource()).findMember( WebRootFinder.getWebContentFolder(fJavaProject.getProject()));
-			fDocumentScope = new DocumentContextFragmentRoot(fJavaProject, getFile(), WebRootFinder.getWebContentFolder(fJavaProject.getProject()), WebRootFinder.getServerContextRoot(fJavaProject.getProject()), JsWebNature.VIRTUAL_SCOPE_ENTRY);			fDocumentScope.setIncludedFiles(translator.getRawImports());
-			return fDocumentScope;
-		}
-		
-		if(reset) fDocumentScope.setIncludedFiles(translator.getRawImports());
-		return fDocumentScope;
-	}
-	
-	private void setBaseLocation() {
-		IDOMModel xmlModel=null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(fHtmlDocument);
-			if(xmlModel==null) {
-				xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(fHtmlDocument);
-			}
-			fModelBaseLocation = xmlModel.getBaseLocation();
-		}finally {
-			if(xmlModel!=null) xmlModel.releaseFromRead();
-		}
-	//	return xmlModel;
-	}
-		
-	public IFile getFile() {
-			return FileBuffers.getWorkspaceFileAtLocation(new Path(fModelBaseLocation));
-	}
-		
-	
-	public IDocument getHtmlDocument() {
-		return fHtmlDocument;
-	}
-
-	public int getMissingTagStart() {
-		return translator.getMissingEndTagRegionStart();
-	}
-	
-	private String getWebRoot() {
-		return 	WebRootFinder.getWebContentFolder(fJavaProject.getProject()).toString();
-	}
-	
-	public String getDirectoryUnderRoot() {
-		String webRoot = getWebRoot() ;
-		IPath projectWebRootPath = getJavaProject().getPath().append(webRoot);
-		IPath filePath = new Path(fModelBaseLocation).removeLastSegments(1);
-		return filePath.removeFirstSegments(projectWebRootPath.matchingFirstSegments(filePath)).toString();
-	}
-	
-	/**
-	 * Originally from ReconcileStepForJava. Creates an ICompilationUnit from
-	 * the contents of the JSP document.
-	 * 
-	 * @return an ICompilationUnit from the contents of the JSP document
-	 */
-	private ICompilationUnit createCompilationUnit() throws JavaModelException {
-		//System.out.println("------------------------- CREATING CU ----------------------------");
-		LibrarySuperType superType = new LibrarySuperType(SUPER_TYPE_LIBRARY, fJavaProject, SUPER_TYPE_NAME);
-		
-		IPackageFragmentRoot root = getDocScope(true);
-		//String directoryUnderWebroot = getDirectoryUnderRoot();
-		ICompilationUnit cu = root.getPackageFragment("").getCompilationUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor());
-		//ICompilationUnit cu = fDocumentScope.getDefaultPackageFragment().getCompilationUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION,SUPER_TYPE_NAME).getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor());
-		
-		IBuffer buffer;
-		try {
-			buffer = cu.getBuffer();
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			buffer = null;
-		}
-		if (buffer != null) {
-			translator.setBuffer(buffer);
-		}
-		return cu;
-	}
-	
-	public String fixupMangledName(String displayString) {
-		if (displayString == null) {
-			return null;
-		}
-		return displayString.replaceAll(getMangledName() + ".js", getHtmlPageName());
-	}
-	
-	public IJavaElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd) {
-		IJavaElement[] EMTPY_RESULT_SET = new IJavaElement[0];
-		IJavaElement[] result = EMTPY_RESULT_SET;
-		IJavaElement[] allChildren = null;
-		try {
-			allChildren = getCompilationUnit().getChildren();
-		} catch (JavaModelException e) {
-		}
-		Vector validChildren = new Vector();
-		for (int i = 0; i < allChildren.length; i++) {
-			if (allChildren[i] instanceof IJavaElement && allChildren[i].getElementType() != IJavaElement.PACKAGE_DECLARATION) {
-				ISourceRange range = getJSSourceRangeOf(allChildren[i]);
-				if (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd)) {
-					validChildren.add(allChildren[i]);
-				} else if (allChildren[i].getElementType() == IJavaElement.TYPE) {
-					validChildren.add(allChildren[i]);
-				}
-			}
-		}
-		if (validChildren.size() > 0) {
-			result = (IJavaElement[]) validChildren.toArray(new IJavaElement[] {});
-		}
-		if (result == null || result.length == 0) {
-			return EMTPY_RESULT_SET;
-		}
-		return result;
-	}
-	
-	public ICompilationUnit getCompilationUnit() {
-		synchronized (fLock) {
-			try {
-				if (fCompilationUnit == null) {
-					fCompilationUnit = createCompilationUnit();
-					return fCompilationUnit;
-				}
-				
-			} catch (JavaModelException jme) {
-				if (JsTranslation.DEBUG) {
-					Logger.logException("error creating JSP working copy... ", jme); //$NON-NLS-1$
-				}
-			}
-			
-		}
-		getDocScope(true);
-		try {
-			fCompilationUnit = fCompilationUnit.getWorkingCopy(getWorkingCopyOwner(), getProblemRequestor(), getProgressMonitor());
-			//fCompilationUnit.makeConsistent(getProgressMonitor());
-		} catch (JavaModelException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-		return fCompilationUnit;
-	}
-	
-	public IJavaElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd) {
-		IJavaElement[] EMTPY_RESULT_SET = new IJavaElement[0];
-		IJavaElement[] result = EMTPY_RESULT_SET;
-		try {
-			ICompilationUnit cu = getCompilationUnit();
-			if (cu != null) {
-				synchronized (fLock) {
-					int cuDocLength = cu.getBuffer().getLength();
-					int javaLength = javaPositionEnd - javaPositionStart;
-					if (cuDocLength > 0 && javaPositionStart >= 0 && javaLength >= 0 && javaPositionEnd <= cuDocLength) {
-						result = cu.codeSelect(javaPositionStart, javaLength, getWorkingCopyOwner());
-					}
-				}
-			}
-			if (result == null || result.length == 0) {
-				return EMTPY_RESULT_SET;
-			}
-		} catch (JavaModelException x) {
-			Logger.logException(x);
-		}
-		return result;
-	}
-	
-	private String getHtmlPageName() {
-		IPath path = new Path(fModelBaseLocation);
-		return path.lastSegment();
-		
-	}
-
-	public String getHtmlText() {
-		return fHtmlDocument.get();
-	}
-	
-	public String getJavaPath() {
-		//String webRoot = getWebRoot() ;
-		//IPackageFragmentRoot root = getDocScope(false);
-		//String cuPath = root.getPath().append("/" + getMangledName() + JsDataTypes.BASE_FILE_EXTENSION ).toString();
-		//ICompilationUnit cu = getCompilationUnit();
-		//IPath realCuPath = cu.getPath();
-		IPath rootPath = new Path(fModelBaseLocation).removeLastSegments(1);
-		String cuPath = rootPath.append("/" + getMangledName() + JsDataTypes.BASE_FILE_EXTENSION ).toString();
-		return cuPath;
-	}
-	
-	public IJavaElement getJsElementAtOffset(int jsOffset) {
-		IJavaElement elements = null;
-		try {
-			elements = getCompilationUnit().getElementAt(jsOffset);
-		} catch (JavaModelException e) {
-			// TODO Auto-generated catch block
-			if (JsTranslation.DEBUG) {
-				Logger.logException("error retrieving java elemtnt from compilation unit... ", e); //$NON-NLS-1$
-			}
-			// }
-		}
-		return elements;
-	}
-	
-	private ISourceRange getJSSourceRangeOf(IJavaElement element) {
-		// returns the offset in html of given element
-		ISourceRange range = null;
-		if (element instanceof SourceRefElement) {
-			try {
-				range = ((SourceRefElement) element).getSourceRange();
-			} catch (JavaModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return range;
-	}
-	
-	public String getJsText() {
-		return translator.getJsText();
-	}
-	
-	public String getMangledName() {
-		return this.mangledName;
-	}
-	
-	private String createMangledName() {
-		return JsNameManglerUtil.mangle(fModelBaseLocation);
-	}
-	
-	/**
-	 * 
-	 * @return the problem requestor for the CompilationUnit in this
-	 *         JSPTranslation
-	 */
-	private JsProblemRequestor getProblemRequestor() {
-		return CompilationUnitHelper.getInstance().getProblemRequestor();
-	}
-	
-	public List getProblems() {
-		List problems = getProblemRequestor().getCollectedProblems();
-		getProblemRequestor().endReporting();
-		return problems != null ? problems : new ArrayList();
-	}
-	
-	private IProgressMonitor getProgressMonitor() {
-		if (fProgressMonitor == null) {
-			fProgressMonitor = new NullProgressMonitor();
-		}
-		return fProgressMonitor;
-	}
-	
-	public WorkingCopyOwner getWorkingCopyOwner() {
-		return CompilationUnitHelper.getInstance().getWorkingCopyOwner();
-	}
-	
-	public boolean ifOffsetInImportNode(int offset) {
-		Position[] importRanges = translator.getImportHtmlRanges();
-		for (int i = 0; i < importRanges.length; i++) {
-			if (importRanges[i].includes(offset)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void reconcileCompilationUnit() {
-		// if(true) return;
-		ICompilationUnit cu = getCompilationUnit();
-		if (fCompilationUnit == null) {
-			return;
-		}
-		if (cu != null) {
-			try {
-				synchronized (fLock) {
-					// if(false)
-					//cu.makeConsistent(getProgressMonitor());
-					cu.reconcile(ICompilationUnit.NO_AST, true, getWorkingCopyOwner(), getProgressMonitor());
-				}
-			} catch (JavaModelException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-	
-
-	public void release() {
-		if(translator!=null) translator.release();
-		synchronized (fLock) {
-			if (fCompilationUnit != null) {
-				try {
-					if (JsTranslation.DEBUG) {
-						System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$
-						System.out.println("(-) JSPTranslation [" + this + "] discarding CompilationUnit: " + fCompilationUnit); //$NON-NLS-1$ //$NON-NLS-2$
-						System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$
-					}
-					fCompilationUnit.discardWorkingCopy();
-				} catch (JavaModelException e) {
-					// we're done w/ it anyway
-				}
-			}
-		}
-	}
-	
-	public void setProblemCollectingActive(boolean collect) {
-		ICompilationUnit cu = getCompilationUnit();
-		if (cu != null) {
-			getProblemRequestor().setIsActive(collect);
-		}
-	}
-	
-	public void classpathChange() {
-		
-		if(fDocumentScope!=null){
-			fDocumentScope.classpathChange();
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java
deleted file mode 100644
index fe1f57b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * An adapter for getting a JSPTranslation of the document.
- * 
- * @author pavery
- */
-public class JsTranslationAdapter implements INodeAdapter, IResourceChangeListener {
-
-	private static final boolean DEBUG = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslation")); //$NON-NLS-1$  //$NON-NLS-2$
-	private IStructuredDocument fHtmlDocument = null;
-	private JsTranslation fJSPTranslation = null;
-	private NullProgressMonitor fTranslationMonitor = null;
-	private String baseLocation;
-	private boolean listenForChanges=false;
-	
-	public JsTranslationAdapter(IDOMModel xmlModel) {
-		fHtmlDocument = xmlModel.getStructuredDocument();
-		baseLocation = xmlModel.getBaseLocation();
-		initializeJavaPlugins();
-		
-		
-	}
-	public void shouldListenForChanges(boolean listenForProjectChanges) {
-		if(listenForProjectChanges) {
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-		}
-	}
-
-	public IJavaProject getJavaProject() {
-		IJavaProject javaProject = null;
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IPath filePath = new Path(baseLocation);
-		IProject project = null;
-		if (filePath.segmentCount() > 0) {
-			project = root.getProject(filePath.segment(0));
-		}
-		if (project != null) {
-			javaProject = JavaCore.create(project);
-		}
-		
-		return javaProject;
-	}
-	
-	/**
-	 * Returns the JSPTranslation for this adapter.
-	 * 
-	 * @return a JSPTranslationExtension
-	 */
-	public JsTranslation getJSPTranslation(boolean listenForChanges) {
-		if (fJSPTranslation == null || (!this.listenForChanges && listenForChanges)) {
-			
-			if(fJSPTranslation!=null) fJSPTranslation.release();
-			
-			fJSPTranslation = new JsTranslation(fHtmlDocument, getJavaProject(),listenForChanges);
-			this.listenForChanges=listenForChanges;
-		}
-		shouldListenForChanges(listenForChanges);
-		return fJSPTranslation;
-	}
-	
-	
-	private void initializeJavaPlugins() {
-		JavaCore.getPlugin();
-	}
-	
-	public boolean isAdapterForType(Object type) {
-		return type.equals(IJsTranslation.class);
-	}
-	
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {}
-	
-	public void release() {
-		if (fTranslationMonitor != null) {
-			fTranslationMonitor.setCanceled(true);
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		if (fJSPTranslation != null) {
-			if (JsTranslationAdapter.DEBUG) {
-				System.out.println("JSPTranslationAdapter releasing:" + fJSPTranslation); //$NON-NLS-1$
-			}
-			fJSPTranslation.release();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		IProject changedProject = (event==null || event.getResource()==null)?null:event.getResource().getProject();
-		if(changedProject!=null && getJavaProject().getProject().equals(changedProject) && fJSPTranslation!=null){
-			fJSPTranslation.classpathChange();
-		}	
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java
deleted file mode 100644
index fa1efb3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslationAdapterFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * Factory for JSPTranslationAdapters.
- * 
- * @author pavery
- * 
- */
-public class JsTranslationAdapterFactory extends AbstractAdapterFactory {
-	// for debugging
-	private static final boolean DEBUG;
-	private boolean listenForProjectChanges;
-	
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslation"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	private JsTranslationAdapter fAdapter = null;
-	
-	public JsTranslationAdapterFactory() {
-		super(IJsTranslation.class, true);
-		listenForProjectChanges = true;
-	}
-	
-	
-	public INodeAdapterFactory copy() {
-		return new JsTranslationAdapterFactory();
-	}
-	
-	
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		if (target instanceof IDOMNode && fAdapter == null) {
-			fAdapter = new JsTranslationAdapter(((IDOMNode) target).getModel());
-			if (JsTranslationAdapterFactory.DEBUG) {
-				System.out.println("(+) JSPTranslationAdapterFactory [" + this + "] created adapter: " + fAdapter); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		return fAdapter;
-	}
-	
-	
-	public void release() {
-		if (fAdapter != null) {
-			if (JsTranslationAdapterFactory.DEBUG) {
-				System.out.println("(-) JSPTranslationAdapterFactory [" + this + "] releasing adapter: " + fAdapter); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			fAdapter.release();
-		}
-		super.release();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java
deleted file mode 100644
index c6faff3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/JsTranslator.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * Translates a JSP document into a HttpServlet. Keeps two way mapping from java
- * translation to the original JSP source, which can be obtained through
- * getJava2JspRanges() and getJsp2JavaRanges().
- * 
- * @author pavery
- */
-public class JsTranslator extends Job implements IDocumentListener{
-	
-	private static final boolean DEBUG;
-	private static final boolean DEBUG_SAVE_OUTPUT = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslationstodisk")); //$NON-NLS-1$  //$NON-NLS-2$
-	public static final String ENDL = "\n"; //$NON-NLS-1$
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspjavamapping"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-
-	private IStructuredDocumentRegion fCurrentNode;
-	private StringBuffer fScriptText = new StringBuffer();
-	private IStructuredDocument fStructuredDocument = null;
-	private ArrayList importLocationsInHtml = new ArrayList();
-	/* use java script by default */
-	private boolean isGlobalJs = true;
-	private ArrayList rawImports = new ArrayList(); // traslated
-	private ArrayList scriptLocationInHtml = new ArrayList();
-	private int scriptOffset = 0;
-	private byte[] fLock = new byte[0];
-	private byte[] finished = new byte[0];
-	private IBuffer compUnitBuff;
-	private boolean cancelParse = false;
-	private int missingEndTagRegionStart = -1;
-	private static final boolean ADD_SEMICOLON_AT_INLINE=true;
-	
-	
-	
-	private void advanceNextNode() {
-		setCurrentNode(getCurrentNode().getNext());
-	}
-	
-	public JsTranslator(IStructuredDocument document, 	String fileName) {
-		super("JavaScript translation for : "  + fileName);
-		fStructuredDocument = document;
-		
-		fStructuredDocument.addDocumentListener(this);
-		setPriority(Job.LONG);
-		setSystem(true);
-		schedule();
-		reset();
-	}
-		
-	public JsTranslator(IStructuredDocument document, 	String fileName, boolean listenForChanges) {
-		super("JavaScript translation for : "  + fileName);
-		fStructuredDocument = document;
-		if(listenForChanges) {
-			fStructuredDocument.addDocumentListener(this);
-			setPriority(Job.LONG);
-			setSystem(true);
-			schedule();
-		}
-		reset();
-	}
-	
-	public String getJsText() {
-		synchronized(finished) {
-			return fScriptText.toString();
-		}
-	}
-	
-	final public IStructuredDocumentRegion getCurrentNode() {
-		return fCurrentNode;
-	}
-	
-	public void setBuffer(IBuffer buffer) {
-		compUnitBuff = buffer;
-		synchronized(finished) {
-			compUnitBuff.setContents(fScriptText.toString());
-		}
-	}
-
-	public Position[] getHtmlLocations() {
-		synchronized(finished) {
-			return (Position[]) scriptLocationInHtml.toArray(new Position[scriptLocationInHtml.size()]);
-		}
-	}
-
-	public int getMissingEndTagRegionStart() {
-		return missingEndTagRegionStart;
-	}
-	
-	public Position[] getImportHtmlRanges() {
-		synchronized(finished) {
-			return (Position[]) importLocationsInHtml.toArray(new Position[importLocationsInHtml.size()]);
-		}
-	}
-	
-	private char[] getPad(int numberOfChars) {
-		final char[] spaceArray = new char[numberOfChars];
-		Arrays.fill(spaceArray, ' ');
-		return spaceArray;
-	}
-	
-	public String[] getRawImports() {
-		synchronized(finished) {
-			return (String[]) this.rawImports.toArray(new String[rawImports.size()]);
-		}
-	}
-
-		
-	
-	/**
-	 * 
-	 * @return the status of the translator's progrss monitor, false if the
-	 *         monitor is null
-	 */
-	private boolean isCanceled() {
-		return cancelParse;
-	}
-	
-	/**
-	 * Reinitialize some fields
-	 */
-	private void reset() {
-		synchronized(fLock) {
-			scriptOffset = 0;
-			// reset progress monitor
-			cancelParse = false;
-			fScriptText = new StringBuffer();
-			fCurrentNode = fStructuredDocument.getFirstStructuredDocumentRegion();
-			rawImports.clear();
-			importLocationsInHtml.clear();
-			scriptLocationInHtml.clear();
-			missingEndTagRegionStart = -1;
-		}
-		translate();
-	}
-
-
-	
-	private IStructuredDocumentRegion setCurrentNode(IStructuredDocumentRegion currentNode) {
-		synchronized(fLock) {
-			return this.fCurrentNode = currentNode;
-		}
-	}
-	
-	public void translate() {
-		//setCurrentNode(fStructuredDocument.getFirstStructuredDocumentRegion());
-		synchronized(finished) {
-			while (getCurrentNode() != null && !isCanceled()) {
-				// System.out.println("Translator Looking at Node
-				// type:"+getCurrentNode().getType()+"---------------------------------:");
-				// System.out.println(new NodeHelper(getCurrentNode()));
-				// i.println("/---------------------------------------------------");
-				if (getCurrentNode().getType() == DOMRegionContext.XML_TAG_NAME) {
-					NodeHelper nh = new NodeHelper(getCurrentNode());
-					if ((!nh.isEndTag() || nh.isSelfClosingTag()) && nh.nameEquals("script")) {
-						/*
-						 * Handles the following cases: <script
-						 * type="javascriptype"> <script language="javascriptype>
-						 * <script src='' type=javascriptype> <script src=''
-						 * language=javascripttype <script src=''> global js type.
-						 * <script> (global js type)
-						 */
-						if (NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("type")) || NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("language")) || isGlobalJs) {
-							if (nh.containsAttribute(new String[] { "src" })) {
-								// Handle import
-								translateScriptImportNode(getCurrentNode());
-							}
-							// } else {
-							// handle script section
-							
-							if (getCurrentNode().getNext() != null /*&& getCurrentNode().getNext().getType() == DOMRegionContext.BLOCK_TEXT*/) {
-								translateJSNode(getCurrentNode().getNext());
-							}
-						} // End search for <script> sections
-					} else if (nh.containsAttribute(JsDataTypes.HTMLATREVENTS)) {
-						/* Check for embeded JS events in any tags */
-						translateInlineJSNode(getCurrentNode());
-					} else if (nh.nameEquals("META") && nh.attrEquals("http-equiv", "Content-Script-Type") && nh.containsAttribute(new String[] { "content" })) {
-						// <META http-equiv="Content-Script-Type" content="type">
-						isGlobalJs = NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("content"));
-					} // End big if of JS types
-				}
-				if (getCurrentNode() != null) {
-					advanceNextNode();
-				}
-			} // end while loop
-		}
-		finishedTranslation();
-	}
-	
-	private void finishedTranslation() {
-		if(compUnitBuff!=null) compUnitBuff.setContents(fScriptText.toString());
-	}
-	
-	public void translateInlineJSNode(IStructuredDocumentRegion container) {
-		// System.out
-		// .println("JSPTranslator.translateInlineJSNode Entered
-		// w/ScriptOffset:"
-		// + scriptOffset);
-		
-			NodeHelper nh = new NodeHelper(container);
-			// System.out.println("inline js node looking at:\n" + nh);
-			/* start a function header.. will amend later */
-			ITextRegionList t = container.getRegions();
-			ITextRegion r;
-			Iterator regionIterator = t.iterator();
-			while (regionIterator.hasNext() && !isCanceled() ) {
-				r = (ITextRegion) regionIterator.next();
-				if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-					int start = r.getStart();
-					int offset = r.getTextEnd();
-					String tagAttrname = container.getText().substring(start, offset).trim();
-					/*
-					 * Attribute values aren't case sensative, also make sure next
-					 * region is attrib value
-					 */
-					if (NodeHelper.isInArray(JsDataTypes.HTMLATREVENTS, tagAttrname)) {
-						if (regionIterator.hasNext()) {
-							regionIterator.next();
-						}
-						if (regionIterator.hasNext()) {
-							r = ((ITextRegion) regionIterator.next());
-						}
-						if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-							int valStartOffset = container.getStartOffset(r);
-							// int valEndOffset = r.getTextEnd();
-							String rawText = container.getText().substring(r.getStart(), r.getTextEnd());
-							if (rawText == null || rawText.length() == 0) {
-								return;
-							}
-							/* Strip quotes */
-							switch (rawText.charAt(0)) {
-								case '\'':
-								case '"':
-									rawText = rawText.substring(1);
-									valStartOffset++;
-							}
-							switch (rawText.charAt(rawText.length() - 1)) {
-								case '\'':
-								case '"':
-									rawText = rawText.substring(0, rawText.length() - 1);
-							}
-							// Position inScript = new Position(scriptOffset,
-							// rawText.length());
-							/* Quoted text starts +1 and ends -1 char */
-							if(ADD_SEMICOLON_AT_INLINE) rawText = rawText + ";";
-							Position inHtml = new Position(valStartOffset, rawText.length());
-							scriptLocationInHtml.add(inHtml);
-							/* need to pad the script text with spaces */
-							char[] spaces = getPad(valStartOffset - scriptOffset);
-							fScriptText.append(spaces);
-							fScriptText.append(rawText);
-							scriptOffset = fScriptText.length();
-						}
-					}
-				}
-			}
-		}
-	
-	
-	public void translateJSNode(IStructuredDocumentRegion container) {
-		ITextRegionCollection containerRegion = container;
-		Iterator regions = containerRegion.getRegions().iterator();
-		ITextRegion region = null;
-		
-		if(container==null) return;
-		
-		char[] spaces = getPad(container.getStartOffset() - scriptOffset);
-		fScriptText.append(spaces);
-		scriptOffset = container.getStartOffset();
-	
-		if(container.getType()!=DOMRegionContext.BLOCK_TEXT && container.getType()!= DOMRegionContext.XML_CDATA_TEXT) {
-			return;
-		}
-		
-		while (regions.hasNext() && !isCanceled()) {
-			region = (ITextRegion) regions.next();
-			String type = region.getType();
-			// content assist was not showing up in JSP inside a javascript
-			// region
-			if (type == DOMRegionContext.BLOCK_TEXT) {
-				int scriptStart = container.getStartOffset();
-				int scriptTextEnd = container.getEndOffset() - container.getStartOffset();
-				String regionText = container.getText().substring(region.getStart(), region.getEnd());
-				int regionLength = regionText.length();
-				// /Position inScript = new Position(scriptOffset,
-				// regionLength);
-				Position inHtml = new Position(scriptStart, scriptTextEnd);
-				scriptLocationInHtml.add(inHtml);
-				spaces = getPad(scriptStart - scriptOffset);
-				fScriptText.append(spaces); 	
-				// fJsToHTMLRanges.put(inScript, inHtml);
-				fScriptText.append(regionText);
-				scriptOffset = fScriptText.length();
-			}
-		}
-		
-		IStructuredDocumentRegion endTag = container.getNext();
-		
-		if(endTag==null) {
-			missingEndTagRegionStart = container.getStartOffset();
-		}else if(endTag!=null) {
-			NodeHelper nh = new NodeHelper(endTag);
-			String name = nh.getTagName();
-			
-			if(name==null || !name.trim().equalsIgnoreCase("script") || !nh.isEndTag()) {
-				missingEndTagRegionStart = container.getStartOffset();
-			}
-		}
-	}
-	
-	public void translateScriptImportNode(IStructuredDocumentRegion region) {
-		NodeHelper nh = new NodeHelper(region);
-		String importName = nh.getAttributeValue("src");
-		if (importName != null && !importName.equals("")) {
-			rawImports.add(importName);
-			Position inHtml = new Position(region.getStartOffset(), region.getEndOffset());
-			importLocationsInHtml.add(inHtml);
-		}
-	}
-
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent event) {
-		cancelParse = true;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-		reset();
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-	
-		return Status.OK_STATUS;
-	}
-	
-	public void release() {
-		fStructuredDocument.removeDocumentListener(this);
-	}
-	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/NodeHelper.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/NodeHelper.java
deleted file mode 100644
index 4046b22..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/NodeHelper.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class NodeHelper {
-	protected static final char DOUBLE_QUOTE_CHAR = '\"';
-	protected static final String DOUBLE_QUOTE_ENTITY = "&quot;"; //$NON-NLS-1$
-	protected static final char SINGLE_QUOTE_CHAR = '\'';
-	protected static final String SINGLE_QUOTE_ENTITY = "&#039;"; //$NON-NLS-1$
-	
-	public static boolean isInArray(String StringArray[], String text) {
-		if (StringArray == null || text == null) {
-			return false;
-		}
-		for (int i = 0; i < StringArray.length; i++) {
-			if (StringArray[i].equalsIgnoreCase(text.trim())) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public static boolean isQuoted(String string) {
-		if ((string == null) || (string.length() < 2)) {
-			return false;
-		}
-		int lastIndex = string.length() - 1;
-		char firstChar = string.charAt(0);
-		char lastChar = string.charAt(lastIndex);
-		return (((firstChar == NodeHelper.SINGLE_QUOTE_CHAR) && (lastChar == NodeHelper.SINGLE_QUOTE_CHAR)) || ((firstChar == NodeHelper.DOUBLE_QUOTE_CHAR) && (lastChar == NodeHelper.DOUBLE_QUOTE_CHAR)));
-	}
-	protected final IStructuredDocumentRegion region;
-	
-	public NodeHelper(IStructuredDocumentRegion region) {
-		this.region = region;
-	}
-	
-	public boolean attrEquals(String attribute, String value) {
-		String attValue = getAttributeValue(attribute);
-		if(attValue==null) return false;
-		return attValue.equalsIgnoreCase(value);
-	}
-	
-	public String AttrToString() {
-		if (region == null) {
-			return null;
-		}
-		// For debuging
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		String StructuredValue = "Tag name:" + getTagName() + "\tAttribute\tValue\n";
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				int start = r.getStart();
-				int offset = r.getTextEnd();
-				StructuredValue += "\t\t" + region.getText().substring(start, offset);
-				/*
-				 * Theres a XML_TAG_ATTRIBUTE_EQUALS after the
-				 * XML_TAG_ATTRIBUTE_NAME we have to get rid of
-				 */
-				if (regionIterator.hasNext()) {
-					regionIterator.next();
-				}
-				if (regionIterator.hasNext()) {
-					r = ((ITextRegion) regionIterator.next());
-				}
-				System.out.println("attrib type");
-				if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-					int valStart = r.getStart();
-					int valOffset = r.getTextEnd();
-					StructuredValue += "\t\t" + stripEndQuotes(region.getText().substring(valStart, valOffset)) + "\n";
-				}
-			}
-		}
-		return StructuredValue;
-	}
-	
-	public boolean containsAttribute(String name[]) {
-		if (name == null) {
-			return false;
-		}
-		if (region == null) {
-			return false;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				int start = r.getStart();
-				int offset = r.getTextEnd();
-				String tagname = region.getText().substring(start, offset).trim();
-				/* Attribute values aren't case sensative */
-				if (NodeHelper.isInArray(name, tagname)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public String getAttributeValue(String name) {
-		if (region == null) {
-			return null;
-		}
-		if (name == null) {
-			return null;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				int start = r.getStart();
-				int offset = r.getTextEnd();
-				String tagname = region.getText().substring(start, offset).trim();
-				/*
-				 * Attribute values aren't case sensative, also make sure next
-				 * region is attrib value
-				 */
-				if (tagname.equalsIgnoreCase(name)) {
-					if (regionIterator.hasNext()) {
-						regionIterator.next();
-					}
-					if (regionIterator.hasNext()) {
-						r = ((ITextRegion) regionIterator.next());
-					}
-					if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-						int valStart = r.getStart();
-						int valOffset = r.getTextEnd();
-						return stripEndQuotes(region.getText().substring(valStart, valOffset));
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	public String getElementAsFlatString() {
-		/*
-		 * Returns a full string of this element minus and 'illegal' characters
-		 * (usefull for identifying the HTML element in a generic JS function)
-		 */
-		if (region == null) {
-			return null;
-		}
-		String fullRegionText = region.getFullText();
-		if (fullRegionText == null) {
-			return null;
-		}
-		return fullRegionText.replaceAll("[^a-zA-Z0-9]", "");
-	}
-	
-	public String getTagName() {
-		if (region == null) {
-			return null;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-				int start = r.getStart();
-				int offset = r.getTextEnd();
-				return region.getText().substring(start, offset);
-			}
-		}
-		return null;
-	}
-	
-	public boolean isEndTag() {
-		if (region == null) {
-			return false;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_END_TAG_OPEN) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public boolean isSelfClosingTag() {
-		if (region == null) {
-			return false;
-		}
-		if (region == null) {
-			return false;
-		}
-		ITextRegionList regions = region.getRegions();
-		ITextRegion r = regions.get(regions.size() - 1);
-		return r.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE;
-	}
-	
-	public boolean nameEquals(String name) {
-		if (region == null) {
-			return false;
-		}
-		String tagName;
-		return ((tagName = getTagName()) != null && tagName.equalsIgnoreCase(name));
-	}
-	
-	public String stripEndQuotes(String text) {
-		if (text == null) {
-			return null;
-		}
-		if (NodeHelper.isQuoted(text)) {
-			return text.substring(1, text.length() - 1);
-		}
-		return text;
-	}
-	
-	
-	public String toString() {
-		ITextRegionList t = region.getRegions();
-		Iterator regionIterator = t.iterator();
-		String nodeText = new String();
-		while (regionIterator.hasNext()) {
-			ITextRegion r = (ITextRegion) regionIterator.next();
-			String nodeType = r.getType();
-			nodeText += ("\tNode Type:" + nodeType + " \t\tValue:" + region.getText().substring(r.getStart(), r.getTextEnd()) + "\n");
-		}
-		return nodeText;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/WebRootFinder.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/WebRootFinder.java
deleted file mode 100644
index d257227..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/WebRootFinder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.java;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-public class WebRootFinder {
-	public static IPath getServerContextRoot(IProject project) {
-		String contextRoot = ComponentUtilities.getServerContextRoot(project);
-		return new Path(contextRoot);
-	}
-	
-	public static IPath getWebContentFolder(IProject project) {
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp != null) {
-			IVirtualFolder rootFolder = comp.getRootFolder();
-			return rootFolder.getUnderlyingFolder().getProjectRelativePath();
-		}
-		return new Path("");
-	}
-	
-	public static String getWebContext(IProject project) {
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/IndexWorkspaceJob.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/IndexWorkspaceJob.java
deleted file mode 100644
index 90dbf67..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/IndexWorkspaceJob.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-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.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-
-/**
- * Re-indexes the entire workspace. Ensures the JSP Index is in a stable state
- * before performing a search. (like after a crash or if previous indexing was
- * canceled)
- * 
- * @author pavery
- */
-public class IndexWorkspaceJob extends Job {
-	// for debugging
-	static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspindexmanager"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	/**
-	 * Visitor that retrieves jsp project paths for all jsp files in the
-	 * workspace, and adds the files to be indexed as they are encountered
-	 */
-	private class JSPFileVisitor implements IResourceProxyVisitor {
-		private List files = new ArrayList();
-		// monitor from the Job
-		IProgressMonitor fInnerMonitor = null;
-		
-		public JSPFileVisitor(IProgressMonitor monitor) {
-			this.fInnerMonitor = monitor;
-		}
-		
-		public final IFile[] getFiles() {
-			return (IFile[]) this.files.toArray(new IFile[this.files.size()]);
-		}
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			// check job canceled
-			if (this.fInnerMonitor != null && this.fInnerMonitor.isCanceled()) {
-				setCanceledState();
-				return false;
-			}
-			// check search support canceled
-			if (JsSearchSupport.getInstance().isCanceled()) {
-				setCanceledState();
-				return false;
-			}
-			if (proxy.getType() == IResource.FILE) {
-				// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-				// check this before description
-				// check name before actually getting the file (less work)
-				if (Util.isJsType(proxy.getName())) {
-					IFile file = (IFile) proxy.requestResource();
-					if (file.exists()) {
-						if (IndexWorkspaceJob.DEBUG) {
-							System.out.println("(+) IndexWorkspaceJob adding file: " + file.getName()); //$NON-NLS-1$
-						}
-						// this call will check the ContentTypeDescription, so
-						// don't need to do it here.
-						// JSPSearchSupport.getInstance().addJspFile(file);
-						this.files.add(file);
-						this.fInnerMonitor.subTask(proxy.getName());
-						// don't search deeper for files
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-	}
-	private IContentType fContentTypeJSP = null;
-	
-	public IndexWorkspaceJob() {
-		// pa_TODO may want to say something like "Rebuilding JSP Index" to be
-		// more
-		// descriptive instead of "Updating JSP Index" since they are 2
-		// different things
-		super(JsCoreMessages.JSPIndexManager_0);
-		setPriority(Job.LONG);
-		setSystem(true);
-	}
-	
-
-	
-	protected IStatus run(IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		if (monitor.isCanceled()) {
-			setCanceledState();
-			return Status.CANCEL_STATUS;
-		}
-		if (IndexWorkspaceJob.DEBUG) {
-			System.out.println(" ^ IndexWorkspaceJob started: "); //$NON-NLS-1$
-		}
-		long start = System.currentTimeMillis();
-		try {
-			JSPFileVisitor visitor = new JSPFileVisitor(monitor);
-			// collect all jsp files
-			ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.DEPTH_INFINITE);
-			// request indexing
-			// this is pretty much like faking an entire workspace resource
-			// delta
-			JsIndexManager.getInstance().indexFiles(visitor.getFiles());
-		} catch (CoreException e) {
-			if (IndexWorkspaceJob.DEBUG) {
-				e.printStackTrace();
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-		long finish = System.currentTimeMillis();
-		if (IndexWorkspaceJob.DEBUG) {
-			System.out.println(" ^ IndexWorkspaceJob finished\n   total time running: " + (finish - start)); //$NON-NLS-1$
-		}
-		return status;
-	}
-	
-	void setCanceledState() {
-		JsIndexManager.getInstance().setIndexState(JsIndexManager.S_CANCELED);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JSDTSearchDocumentDelegate.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JSDTSearchDocumentDelegate.java
deleted file mode 100644
index 569bbac..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JSDTSearchDocumentDelegate.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.internal.core.search.JavaSearchDocument;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-
-/**
- * Wrapper method to set getPath() path to be the path of the compilation unit
- * for the jsp file. (since it's a final method, it needs to be set via
- * constructor)
- * 
- * @author pavery
- */
-/* Used to extend SearchDocument */
-public class JSDTSearchDocumentDelegate extends JavaSearchDocument {
-	private JsSearchDocument fJSPSearchDoc = null;
-	
-	public JSDTSearchDocumentDelegate(JsSearchDocument jspSearchDoc) {
-		super(jspSearchDoc.getPath(), jspSearchDoc.getParticipant());
-		this.fJSPSearchDoc = jspSearchDoc;
-	}
-	
-	
-	public byte[] getByteContents() {
-		return this.fJSPSearchDoc.getByteContents();
-	}
-	
-	
-	public char[] getCharContents() {
-		return this.fJSPSearchDoc.getCharContents();
-	}
-	
-	
-	public String getEncoding() {
-		return this.fJSPSearchDoc.getEncoding();
-	}
-	
-	public IFile getFile() {
-		return this.fJSPSearchDoc.getFile();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchDocument#getJavaElement()
-	 */
-	
-	public IJavaElement getJavaElement() {
-		return getJspTranslation().getCompilationUnit();
-	}
-	
-	public String getJavaText() {
-		return this.fJSPSearchDoc.getJavaText();
-	}
-	
-	public JsTranslation getJspTranslation() {
-		return this.fJSPSearchDoc.getJSPTranslation();
-	}
-	
-	
-	public boolean isVirtual() {
-		return true;
-	}
-	
-	public void release() {
-		this.fJSPSearchDoc.release();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsIndexManager.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsIndexManager.java
deleted file mode 100644
index 162bb2c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsIndexManager.java
+++ /dev/null
@@ -1,665 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-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.ResourcesPlugin;
-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.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.internal.core.search.indexing.IndexManager;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-import org.osgi.framework.Bundle;
-
-/**
- * Responsible for keeping the JSP index up to date.
- * 
- * @author pavery
- */
-public class JsIndexManager {
-	// for debugging
-	// TODO move this to Logger, as we have in SSE
-	static final boolean DEBUG;
-	private static JsIndexManager fSingleton = null;
-	static long fTotalTime = 0;
-	private static final String PKEY_INDEX_STATE = "jspIndexState"; //$NON-NLS-1$
-	// TODO: consider enumeration for these int constants
-	// set to S_UPDATING once a resource change comes in
-	// set to S_STABLE if:
-	// - we know we aren't interested in the resource change
-	// - or the ProcessFilesJob completes
-	// set to S_CANCELED if an indexing job is canceled
-	// set to S_REBUILDING if re-indexing the entire workspace
-	/**
-	 * indexing job was canceled in the middle of it, index needs to be rebuilt
-	 */
-	public static final int S_CANCELED = 4;
-	/** entire index is being rebuilt */
-	public static final int S_REBUILDING = 3;
-	// the int '0' is reserved for the default value if a preference is not
-	// there
-	/** index is reliable to use */
-	public static final int S_STABLE = 1;
-	/** index is being updated (from a resource delta) */
-	public static final int S_UPDATING = 2;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspindexmanager"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	public synchronized static JsIndexManager getInstance() {
-		if (JsIndexManager.fSingleton == null) {
-			JsIndexManager.fSingleton = new JsIndexManager();
-		}
-		return JsIndexManager.fSingleton;
-	}
-	// end class JSPResourceVisitor
-	private class IndexJobCoordinator extends JobChangeAdapter {
-		
-		public void aboutToRun(IJobChangeEvent event) {
-			Job jobToCoordinate = event.getJob();
-			if (isJobToAvoid(jobToCoordinate)) {
-				// job will be rescheduled when the job we
-				// are avoiding (eg. build) is done
-				getProcessFilesJob().cancel();
-				// System.out.println("cancel:" + jobToCoordinate.getName());
-			}
-		}
-		
-		
-		public void done(IJobChangeEvent event) {
-			Job jobToCoordinate = event.getJob();
-			if (isJobToAvoid(jobToCoordinate)) {
-				if (getProcessFilesJob().getFiles().length > 0) {
-					getProcessFilesJob().schedule(500);
-					// System.out.println("schedule:" +
-					// jobToCoordinate.getName());
-				}
-			}
-		}
-		
-		private boolean isJobToAvoid(Job jobToCoordinate) {
-			boolean result = false;
-			if (jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) || jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD) || jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_AUTO_REFRESH)) {
-				result = true;
-			}
-			return result;
-		}
-	}
-	// end class ProcessFilesJob
-	private class JSPResourceChangeListener implements IResourceChangeListener {
-		/**
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (isInitializing()) {
-				return;
-			}
-			// ignore resource changes if already rebuilding
-			if (getIndexState() == JsIndexManager.S_REBUILDING) {
-				return;
-			}
-			// previously canceled, needs entire index rebuild
-			if (getIndexState() == JsIndexManager.S_CANCELED) {
-				// rebuildIndex();
-				// just resume indexing
-				getProcessFilesJob().schedule(500);
-				// System.out.println("schedule: resource changed, previously
-				// canceled");
-				return;
-			}
-			IResourceDelta delta = event.getDelta();
-			if (delta != null) {
-				// only care about adds or changes right now...
-				int kind = delta.getKind();
-				boolean added = (kind & IResourceDelta.ADDED) == IResourceDelta.ADDED;
-				boolean changed = (kind & IResourceDelta.CHANGED) == IResourceDelta.CHANGED;
-				if (added || changed) {
-					// only analyze the full (starting at root) delta
-					// hierarchy
-					if (delta.getFullPath().toString().equals("/")) { //$NON-NLS-1$
-						try {
-							JSPResourceVisitor v = getVisitor();
-							// clear from last run
-							v.reset();
-							// count files, possibly do this in a job too...
-							// don't include PHANTOM resources
-							delta.accept(v, false);
-							// process files from this delta
-							IFile[] files = v.getFiles();
-							if (files.length > 0) {
-								/*
-								 * Job change listener should set back to stable
-								 * when finished
-								 */
-								setUpdatingState();
-								// processFiles(files);
-								indexFiles(files);
-							}
-						} catch (CoreException e) {
-							// need to set state here somehow, and reindex
-							// otherwise index will be unreliable
-							if (JsIndexManager.DEBUG) {
-								Logger.logException(e);
-							}
-						} catch (Exception e) {
-							// need to set state here somehow, and reindex
-							// otherwise index will be unreliable
-							if (JsIndexManager.DEBUG) {
-								Logger.logException(e);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	/**
-	 * Collects JSP files from a resource delta.
-	 */
-	private class JSPResourceVisitor implements IResourceDeltaVisitor {
-		// using hash map ensures only one of each file
-		// must be reset before every use
-		private HashMap jspFiles = null;
-		
-		public JSPResourceVisitor() {
-			this.jspFiles = new HashMap();
-		}
-		
-		private void deleteIndex(IFile folder) {
-			// cleanup index
-			IndexManager im = JavaModelManager.getJavaModelManager().getIndexManager();
-			IPath folderPath = folder.getFullPath();
-			IPath indexLocation = JsSearchSupport.getInstance().computeIndexLocation(folderPath);
-			im.removeIndex(indexLocation);
-			// im.indexLocations.removeKey(folderPath);
-			// im.indexLocations.removeValue(indexLocation);
-			File f = indexLocation.toFile();
-			f.delete();
-		}
-		
-		public IFile[] getFiles() {
-			return (IFile[]) this.jspFiles.values().toArray(new IFile[this.jspFiles.size()]);
-		}
-		
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=93463
-		private boolean isHiddenResource(IPath p) {
-			String[] segments = p.segments();
-			for (int i = 0; i < segments.length; i++) {
-				if (segments[i].startsWith(".")) {
-					return true;
-				}
-			}
-			return false;
-		}
-		
-		public void reset() {
-			this.jspFiles.clear();
-		}
-		
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			// in case JSP search was canceled (eg. when closing the editor)
-			if (JsSearchSupport.getInstance().isCanceled() || frameworkIsShuttingDown()) {
-				setCanceledState();
-				return false;
-			}
-			try {
-				if (!isHiddenResource(delta.getFullPath())) {
-					int kind = delta.getKind();
-					boolean added = (kind & IResourceDelta.ADDED) == IResourceDelta.ADDED;
-					boolean isInterestingChange = false;
-					if ((kind & IResourceDelta.CHANGED) == IResourceDelta.CHANGED) {
-						int flags = delta.getFlags();
-						// ignore things like marker changes
-						isInterestingChange = (flags & IResourceDelta.CONTENT) == IResourceDelta.CONTENT || (flags & IResourceDelta.REPLACED) == IResourceDelta.REPLACED;
-					}
-					boolean removed = (kind & IResourceDelta.REMOVED) == IResourceDelta.REMOVED;
-					if (added || isInterestingChange) {
-						visitAdded(delta);
-					} else if (removed) {
-						visitRemoved(delta);
-					}
-				}
-			} catch (Exception e) {
-				// need to set state here somehow, and reindex
-				// otherwise index will be unreliable
-				if (JsIndexManager.DEBUG) {
-					Logger.logException("Delta analysis may not be complete", e); //$NON-NLS-1$
-				}
-			}
-			// if the delta has children, continue to add/remove files
-			return true;
-		}
-		
-		private void visitAdded(IResourceDelta delta) {
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-			// quick check if it's even JSP related to improve
-			// performance
-			// checking name from the delta before getting
-			// resource because it's lighter
-			int numSegments = delta.getFullPath().segmentCount();
-			String filename = delta.getFullPath().segment(numSegments - 1);
-			if (Util.isJsType(filename)) {
-				IResource r = delta.getResource();
-				if (r != null && r.exists() && r.getType() == IResource.FILE) {
-					this.jspFiles.put(r.getFullPath(), r);
-				}
-			}
-		}
-		
-		private void visitRemoved(IResourceDelta delta) {
-			// handle cleanup
-			if (delta.getResource() != null) {
-				IResource r = delta.getResource();
-				if (r.getType() == IResource.FOLDER && r.exists()) {
-					deleteIndex((IFile) r);
-				}
-			}
-		}
-	}
-	/**
-	 * schedules JSP files for indexing by Java core
-	 */
-	private class ProcessFilesJob extends Job {
-		List fileList = null;
-		// keep track of how many files we've indexed
-		int lastFileCursor = 0;
-		
-		ProcessFilesJob(String taskName) {
-			super(taskName);
-			fileList = new ArrayList();
-		}
-		
-		synchronized void clearFiles() {
-			fileList.clear();
-			lastFileCursor = 0;
-			// System.out.println("cleared files");
-		}
-		
-		synchronized IFile[] getFiles() {
-			return (IFile[]) fileList.toArray(new IFile[fileList.size()]);
-		}
-		
-		private boolean isCanceled(IProgressMonitor runMonitor) {
-			boolean canceled = false;
-			// check specific monitor passed into run method (the progress
-			// group in this case)
-			// check main search support canceled
-			if (runMonitor != null && runMonitor.isCanceled()) {
-				canceled = true;
-			} else if (JsSearchSupport.getInstance().isCanceled()) {
-				canceled = true;
-				if (runMonitor != null) {
-					runMonitor.setCanceled(true);
-				}
-			}
-			return canceled;
-		}
-		
-		synchronized void process(IFile[] files) {
-			for (int i = 0; i < files.length; i++) {
-				fileList.add(files[i]);
-			}
-			if (JsIndexManager.DEBUG) {
-				System.out.println("JSPIndexManager queuing " + files.length + " files"); //$NON-NLS-2$ //$NON-NLS-1$
-			}
-		}
-		
-		
-		protected IStatus run(IProgressMonitor monitor) {
-			// System.out.println("indexer monitor" + monitor);
-			if (isCanceled(monitor) || frameworkIsShuttingDown()) {
-				setCanceledState();
-				return Status.CANCEL_STATUS;
-			}
-			long start = System.currentTimeMillis();
-			try {
-				IFile[] filesToBeProcessed = getFiles();
-				if (JsIndexManager.DEBUG) {
-					System.out.println("JSPIndexManager indexing " + filesToBeProcessed.length + " files"); //$NON-NLS-2$ //$NON-NLS-1$
-				}
-				// API indicates that monitor is never null
-				monitor.beginTask("", filesToBeProcessed.length); //$NON-NLS-1$
-				JsSearchSupport ss = JsSearchSupport.getInstance();
-				String processingNFiles = ""; //$NON-NLS-1$
-				for (; lastFileCursor < filesToBeProcessed.length; lastFileCursor++) {
-					if (isCanceled(monitor) || frameworkIsShuttingDown()) {
-						setCanceledState();
-						return Status.CANCEL_STATUS;
-					}
-					try {
-						ss.addJspFile(filesToBeProcessed[lastFileCursor]);
-						// JSP Indexer processing n files
-						processingNFiles = NLS.bind(JsCoreMessages.JSPIndexManager_2, new String[] { Integer.toString((filesToBeProcessed.length - lastFileCursor)) });
-						monitor.subTask(processingNFiles + " - " + filesToBeProcessed[lastFileCursor].getName()); //$NON-NLS-1$
-						monitor.worked(1);
-						if (JsIndexManager.DEBUG) {
-							System.out.println("JSPIndexManager Job added file: " + filesToBeProcessed[lastFileCursor].getName()); //$NON-NLS-1$
-						}
-					} catch (Exception e) {
-						// RATLC00284776
-						// ISSUE: we probably shouldn't be catching EVERY
-						// exception, but
-						// the framework only allows to return IStatus in
-						// order to communicate
-						// that something went wrong, which means the loop
-						// won't complete, and we would hit the same problem
-						// the next time.
-						// 
-						// a possible solution is to keep track of the
-						// exceptions logged
-						// and only log a certain amt of the same one,
-						// otherwise skip it.
-						if (!frameworkIsShuttingDown()) {
-							String filename = filesToBeProcessed[lastFileCursor] != null ? filesToBeProcessed[lastFileCursor].getFullPath().toString() : ""; //$NON-NLS-1$
-							Logger.logException("JSPIndexer problem indexing:" + filename, e); //$NON-NLS-1$
-						}
-					}
-				} // end for
-			} finally {
-				// just in case something didn't follow API (monitor is null)
-				if (monitor != null) {
-					monitor.done();
-				}
-			}
-			// successfully finished, clear files list
-			clearFiles();
-			long finish = System.currentTimeMillis();
-			long diff = finish - start;
-			if (JsIndexManager.DEBUG) {
-				JsIndexManager.fTotalTime += diff;
-				System.out.println("============================================================================"); //$NON-NLS-1$
-				System.out.println("this time: " + diff + " cumulative time for resource changed: " + JsIndexManager.fTotalTime); //$NON-NLS-1$ //$NON-NLS-2$
-				System.out.println("============================================================================"); //$NON-NLS-1$
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	private IContentType fContentTypeJSP = null;
-	private JSPResourceVisitor fVisitor = null;
-	private IndexWorkspaceJob indexingJob = new IndexWorkspaceJob();
-	private IndexJobCoordinator indexJobCoordinator;
-	private boolean initialized;
-	private boolean initializing = true;
-	private IResourceChangeListener jspResourceChangeListener;
-	/** symbolic name for OSGI framework */
-	private final String OSGI_FRAMEWORK_ID = "org.eclipse.osgi"; //$NON-NLS-1$
-	// Job for processing resource delta
-	private ProcessFilesJob processFilesJob = null;
-	
-	private JsIndexManager() {
-		processFilesJob = new ProcessFilesJob(JsCoreMessages.JSPIndexManager_0);
-		// only show in verbose mode
-		processFilesJob.setSystem(true);
-		processFilesJob.setPriority(Job.LONG);
-		processFilesJob.addJobChangeListener(new JobChangeAdapter() {
-			
-			public void done(IJobChangeEvent event) {
-				super.done(event);
-				setStableState();
-			}
-		});
-	}
-	
-	/**
-	 * A check to see if the OSGI framework is shutting down.
-	 * 
-	 * @return true if the System Bundle is stopped (ie. the framework is
-	 *         shutting down)
-	 */
-	boolean frameworkIsShuttingDown() {
-		// in the Framework class there's a note:
-		// set the state of the System Bundle to STOPPING.
-		// this must be done first according to section 4.19.2 from the OSGi
-		// R3 spec.
-		boolean shuttingDown = Platform.getBundle(OSGI_FRAMEWORK_ID).getState() == Bundle.STOPPING;
-		if (JsIndexManager.DEBUG && shuttingDown) {
-			System.out.println("JSPIndexManager: system is shutting down!"); //$NON-NLS-1$
-		}
-		return shuttingDown;
-	}
-	
-	IndexWorkspaceJob getIndexingJob() {
-		return indexingJob;
-	}
-	
-	int getIndexState() {
-		return JsCorePlugin.getDefault().getPluginPreferences().getInt(JsIndexManager.PKEY_INDEX_STATE);
-	}
-	
-
-	
-	ProcessFilesJob getProcessFilesJob() {
-		return processFilesJob;
-	}
-	
-	/**
-	 * Package protected for access by inner Job class in resourceChanged(...)
-	 * 
-	 * @return
-	 */
-	JSPResourceVisitor getVisitor() {
-		if (this.fVisitor == null) {
-			this.fVisitor = new JSPResourceVisitor();
-		}
-		return this.fVisitor;
-	}
-	
-	/**
-	 * Creates and schedules a Job to process collected files. All JSP indexing
-	 * should be done through this method or processFiles(IFile file)
-	 * 
-	 * @param files
-	 */
-	final void indexFiles(IFile[] files) {
-		// don't use this rule
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=4931
-		// processFiles.setRule(new IndexFileRule());
-		processFilesJob.process(files);
-	}
-	
-	public void initialize() {
-		JsIndexManager singleInstance = JsIndexManager.getInstance();
-		if (!singleInstance.initialized) {
-			singleInstance.initialized = true;
-			singleInstance.indexJobCoordinator = new IndexJobCoordinator();
-			singleInstance.jspResourceChangeListener = new JSPResourceChangeListener();
-			// added as JobChange listener so JSPIndexManager can be smarter
-			// about when it runs
-			Platform.getJobManager().addJobChangeListener(singleInstance.indexJobCoordinator);
-			// add JSPIndexManager to keep JSP Index up to date
-			// listening for IResourceChangeEvent.PRE_DELETE and
-			// IResourceChangeEvent.POST_CHANGE
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(jspResourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5091
-			// makes sure IndexManager is aware of our indexes
-			saveIndexes();
-			rebuildIndexIfNeeded();
-			singleInstance.initializing = false;
-		}
-	}
-	
-	boolean isInitializing() {
-		return initializing;
-	}
-	
-	void rebuildIndex() {
-		if (JsIndexManager.DEBUG) {
-			System.out.println("*** JSP Index unstable, requesting re-indexing"); //$NON-NLS-1$
-		}
-		getIndexingJob().addJobChangeListener(new JobChangeAdapter() {
-			
-			public void aboutToRun(IJobChangeEvent event) {
-				super.aboutToRun(event);
-				setRebuildingState();
-			}
-			
-			
-			public void done(IJobChangeEvent event) {
-				super.done(event);
-				setStableState();
-				getIndexingJob().removeJobChangeListener(this);
-			}
-		});
-		// we're about to reindex everything anyway
-		getProcessFilesJob().clearFiles();
-		getIndexingJob().schedule();
-	}
-	
-	synchronized void rebuildIndexIfNeeded() {
-		if (getIndexState() != JsIndexManager.S_STABLE) {
-			rebuildIndex();
-		}
-	}
-	
-	// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5091
-	// makes sure IndexManager is aware of our indexes
-	void saveIndexes() {
-		IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
-		IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int j = 0; j < allProjects.length; j++) {
-			if (!JsWebNature.hasNature(allProjects[j]) || !allProjects[j].isOpen()) {
-				continue;
-			}
-			IPath jspModelWorkingLocation = JsSearchSupport.getInstance().getModelJspPluginWorkingLocation(allProjects[j]);
-			File folder = new File(jspModelWorkingLocation.toOSString());
-			String[] files = folder.list();
-			String locay = ""; //$NON-NLS-1$
-			try {
-				for (int i = 0; i < files.length; i++) {
-					if (files[i].toLowerCase().endsWith(".index")) { //$NON-NLS-1$
-						locay = jspModelWorkingLocation.toString() + "/" + files[i]; //$NON-NLS-1$
-						// reuse index file
-// index = new Index(locay, allProjects[j].getFullPath().toOSString(), true);
-// //$NON-NLS-1$
-// index.save();
-						indexManager.getIndex(allProjects[j].getFullPath(), new Path(locay), true, false);
-						// indexManager.saveIndex(index);
-					}
-				}
-			} catch (Exception e) {
-				// we should be shutting down, want to shut down quietly
-				if (JsIndexManager.DEBUG) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	void setCanceledState() {
-		setIndexState(JsIndexManager.S_CANCELED);
-	}
-	
-	synchronized void setIndexState(int state) {
-		if (JsIndexManager.DEBUG) {
-			System.out.println("JSPIndexManager setting index state to: " + state2String(state)); //$NON-NLS-1$
-		}
-		Plugin jspModelPlugin = JsCorePlugin.getDefault();
-		jspModelPlugin.getPluginPreferences().setValue(JsIndexManager.PKEY_INDEX_STATE, state);
-		jspModelPlugin.savePluginPreferences();
-	}
-	
-	void setRebuildingState() {
-		setIndexState(JsIndexManager.S_REBUILDING);
-	}
-	
-	void setStableState() {
-		// if (getIndexState() != S_CANCELED)
-		setIndexState(JsIndexManager.S_STABLE);
-	}
-	
-	void setUpdatingState() {
-		// if (getIndexState() != S_CANCELED)
-		setIndexState(JsIndexManager.S_UPDATING);
-	}
-	
-	public void shutdown() {
-		// stop listening
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(jspResourceChangeListener);
-		// saveIndexes();
-		// stop any searching
-		JsSearchSupport.getInstance().setCanceled(true);
-		// stop listening to jobs
-		Platform.getJobManager().removeJobChangeListener(indexJobCoordinator);
-		int maxwait = 5000;
-		if (processFilesJob != null) {
-			processFilesJob.cancel();
-		}
-		// attempt to make sure this indexing job is litterally
-		// done before continuing, since we are shutting down
-		waitTillNotRunning(maxwait, processFilesJob);
-		if (indexingJob != null) {
-			indexingJob.cancel();
-		}
-		waitTillNotRunning(maxwait, processFilesJob);
-	}
-	
-	private String state2String(int state) {
-		String s = "UNKNOWN"; //$NON-NLS-1$
-		switch (state) {
-			case (JsIndexManager.S_STABLE):
-				s = "S_STABLE"; //$NON-NLS-1$
-			break;
-			case (JsIndexManager.S_UPDATING):
-				s = "S_UPDATING"; //$NON-NLS-1$
-			break;
-			case (JsIndexManager.S_CANCELED):
-				s = "S_CANCELED"; //$NON-NLS-1$
-			break;
-			case (JsIndexManager.S_REBUILDING):
-				s = "S_REBUILDING"; //$NON-NLS-1$
-			break;
-		}
-		return s;
-	}
-	
-	private void waitTillNotRunning(int maxSeconds, Job job) {
-		int pauseTime = 10;
-		int maxtries = maxSeconds / pauseTime;
-		int count = 0;
-		while (count++ < maxtries && job.getState() == Job.RUNNING) {
-			try {
-				Thread.sleep(pauseTime);
-				// System.out.println("count: " + count + " max: " +
-				// maxtries);
-			} catch (InterruptedException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsPathIndexer.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsPathIndexer.java
deleted file mode 100644
index 3f451a6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsPathIndexer.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.jsdt.core.search.IJavaSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-
-/**
- * pa_TODO Still need to take into consideration: - focus in workspace - search
- * pattern
- * 
- * @author pavery
- */
-public class JsPathIndexer {
-	// for debugging
-	static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	// visitor that retrieves jsp project paths for all jsp files in the
-	// workspace
-	class JSPFileVisitor implements IResourceProxyVisitor {
-		// hash map forces only one of each file
-		private HashMap fPaths = new HashMap();
-		SearchPattern fPattern = null;
-		IJavaSearchScope fScope = null;
-		
-		public JSPFileVisitor(SearchPattern pattern, IJavaSearchScope scope) {
-			this.fPattern = pattern;
-			this.fScope = scope;
-		}
-		
-		public IPath[] getPaths() {
-			return (IPath[]) fPaths.values().toArray(new IPath[fPaths.size()]);
-		}
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			if (JsSearchSupport.getInstance().isCanceled()) {
-				return false;
-			}
-			if (proxy.getType() == IResource.FILE) {
-				//IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeIdHtml);
-				// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-				// check this before description
-				// check name before actually getting the file (less work)
-				if (Util.isJsType(proxy.getName())) {
-					IFile file = (IFile) proxy.requestResource();
-					IContentDescription contentDescription = file.getContentDescription();
-					String ctId = null;
-					if (contentDescription != null) {
-						ctId = contentDescription.getContentType().getId();
-					}
-					//if (ContentTypeIdForJSP.ContentTypeIdHtml.equals(ctId)) {
-						if (this.fScope.encloses(proxy.requestFullPath().toString())) {
-							if (JsPathIndexer.DEBUG) {
-								System.out.println("adding selected index path:" + file.getParent().getFullPath()); //$NON-NLS-1$
-							}
-							fPaths.put(file.getParent().getFullPath(), JsSearchSupport.getInstance().computeIndexLocation(file.getParent().getFullPath()));
-						}
-					//}
-				}
-				// don't search deeper for files
-				return false;
-			}
-			return true;
-		}
-	}
-	
-	public IPath[] getVisibleJspPaths(SearchPattern pattern, IJavaSearchScope scope) {
-		JSPFileVisitor jspFileVisitor = new JSPFileVisitor(pattern, scope);
-		try {
-			ResourcesPlugin.getWorkspace().getRoot().accept(jspFileVisitor, 0);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return jspFileVisitor.getPaths();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
deleted file mode 100644
index 3ffdd78..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-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.Path;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapterFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * Created with a .jsp file, but should appear to be a .java file for indexing
- * and searching purposes. There are purposely few fields in this class, and
- * those fields are lightweight since it's possible for many JSP search
- * documents to exist in memory at one time (eg. after importing a project with
- * a large number of JSP files)
- * 
- * @author pavery
- */
-public class JsSearchDocument {
-	private String UNKNOWN_PATH = "**path unknown**"; //$NON-NLS-1$
-	private char[] fCachedCharContents;
-	private String fCUPath = UNKNOWN_PATH;
-	private String fJSPPathString = UNKNOWN_PATH;
-	private long fLastModifiedStamp;
-	private SearchParticipant fParticipant = null;
-	
-	
-	/**
-	 * @param file
-	 * @param participant
-	 * @throws CoreException
-	 */
-	public JsSearchDocument(String filePath, SearchParticipant participant) {
-		this.fJSPPathString = filePath;
-		this.fParticipant = participant;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchDocument#getByteContents()
-	 */
-	public byte[] getByteContents() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchDocument#getCharContents()
-	 */
-	public char[] getCharContents() {
-		if (fCachedCharContents == null || isDirty()) {
-			JsTranslation trans = getJSPTranslation();
-			fCachedCharContents = trans != null ? trans.getJsText().toCharArray() : new char[0];
-			fCUPath = trans.getJavaPath();
-		}
-		return fCachedCharContents;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchDocument#getEncoding()
-	 */
-	public String getEncoding() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public IFile getFile() {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IPath jspPath = new Path(this.fJSPPathString);
-		IFile jspFile = root.getFile(jspPath);
-		if (!jspFile.exists()) {
-			// possibly outside workspace
-			jspFile = root.getFileForLocation(jspPath);
-		}
-		return jspFile;
-	}
-	
-	public String getJavaText() {
-		return new String(getCharContents());
-	}
-	
-	/**
-	 * It's not recommended for clients to hold on to this JSPTranslation since
-	 * it's kind of large. If possible, hold on to the JSPSearchDocument, which
-	 * is more of a lightweight proxy.
-	 * 
-	 * @return the JSPTranslation for the jsp file, or null if it's an
-	 *         unsupported file.
-	 */
-	public final JsTranslation getJSPTranslation() {
-		JsTranslation translation = null;
-		IFile jspFile = getFile();
-		if (!JsSearchSupport.isJsp(jspFile)) {
-			return translation;
-		}
-		IStructuredModel model = null;
-		try {
-			// get existing model for read, then get document from it
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			if (modelManager != null) {
-				model = modelManager.getExistingModelForRead(jspFile);
-				if(model==null)
-					model = modelManager.getModelForRead(jspFile);
-			}
-			// handle unsupported
-			if (model instanceof IDOMModel) {
-				IDOMModel xmlModel = (IDOMModel) model;
-				JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
-				xmlModel.getFactoryRegistry().addFactory(factory);
-				IDOMDocument doc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) doc.getAdapterFor(IJsTranslation.class);
-				translation = adapter.getJSPTranslation(false);
-			}
-		} catch (IOException e) {
-			Logger.logException(e);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		} catch (UnsupportedCharsetExceptionWithDetail e) {
-			// no need to log this. Just consider it an invalid file for our
-			// purposes.
-			// Logger.logException(e);
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return translation;
-	}
-	
-	public SearchParticipant getParticipant() {
-		return this.fParticipant;
-	}
-	
-	/**
-	 * the path to the Java compilation unit
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchDocument#getPath()
-	 */
-	public String getPath() {
-		// caching the path since it's expensive to get translation
-		// important that isDirty() check is second to cache modification stamp
-		if (this.fCUPath == null || isDirty() || this.fCUPath == UNKNOWN_PATH) {
-			JsTranslation trans = getJSPTranslation();
-			if (trans != null) {
-				try {
-					this.fCUPath = trans.getJavaPath();
-				} catch (RuntimeException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-				// save since it's expensive to calculate again later
-				fCachedCharContents = trans.getJsText().toCharArray();
-			}
-		}
-		return fCUPath != null ? fCUPath : UNKNOWN_PATH;
-	}
-	
-	private boolean isDirty() {
-		boolean modified = false;
-		IFile f = getFile();
-		if (f != null) {
-			long currentStamp = f.getModificationStamp();
-			if (currentStamp != fLastModifiedStamp) {
-				modified = true;
-			}
-			fLastModifiedStamp = currentStamp;
-		}
-		return modified;
-	}
-	
-	public void release() {
-	// nothing to do now since JSPTranslation is created on the fly
-	}
-	
-	/**
-	 * for debugging
-	 */
-	
-	public String toString() {
-		return "[JSPSearchDocument:" + this.fJSPPathString + "]"; //$NON-NLS-1$ //$NON-NLS-2$ 
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchParticipant.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchParticipant.java
deleted file mode 100644
index a120dbb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchParticipant.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.search.IJavaSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-
-/**
- * Integration of JSP w/ java search.
- * 
- * @author pavery
- */
-public class JsSearchParticipant extends SearchParticipant {
-	// for debugging
-	private static final boolean DEBUG = JsSearchParticipant.calculateValue();
-	
-	private static boolean calculateValue() {
-		String value = Platform.getDebugOption("org.eclipse.jstd.jsp.core/debug/jspsearch"); //$NON-NLS-1$
-		boolean debug = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-		return debug;
-	}
-	
-	
-	public String getDescription() {
-		return "Embeded JavaScript"; //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchParticipant#getDocument(org.eclipse.core.resources.IFile)
-	 */
-	public SearchDocument getDocument(IFile file) {
-		// never gets called?
-		return null;
-	}
-	
-	/**
-	 * Important to never return null here or else Java search participation
-	 * will break.
-	 */
-	
-	public SearchDocument getDocument(String documentPath) {
-		SearchDocument sDoc = JsSearchSupport.getInstance().getSearchDocument(documentPath);
-		if (sDoc == null) {
-			// return a dummy doc here so search participation doesn't break
-			return new NullSearchDocument(documentPath);
-		}
-		return sDoc;
-	}
-	
-	
-	public void indexDocument(SearchDocument document, IPath indexPath) {
-		if (!(document instanceof JSDTSearchDocumentDelegate)) {
-			return;
-		}
-		// use Java search indexing
-		SearchEngine.getDefaultSearchParticipant().indexDocument(document, indexPath);
-	}
-	
-	
-	public void locateMatches(SearchDocument[] indexMatches, SearchPattern pattern, IJavaSearchScope scope, SearchRequestor requestor, IProgressMonitor monitor)
-			throws CoreException {
-		if (monitor != null && monitor.isCanceled()) {
-			return;
-		}
-		// filter out null matches
-		List filtered = new ArrayList();
-		SearchDocument match = null;
-		for (int i = 0; i < indexMatches.length; i++) {
-			if (JsSearchParticipant.DEBUG) {
-				System.out.println("found possible matching JavaSearchDocumentDelegate: " + indexMatches[i]); //$NON-NLS-1$
-			}
-			match = indexMatches[i];
-			if (match != null) {
-				// some matches may be null, or if the index is out of date,
-				// the file may not even exist
-				if (match instanceof JSDTSearchDocumentDelegate && ((JSDTSearchDocumentDelegate) match).getFile().exists()) {
-					filtered.add(match);
-				}
-			}
-		}
-		indexMatches = (SearchDocument[]) filtered.toArray(new SearchDocument[filtered.size()]);
-		SearchEngine.getDefaultSearchParticipant().locateMatches(indexMatches, pattern, scope, requestor, monitor);
-	}
-	
-	
-	public IPath[] selectIndexes(SearchPattern pattern, IJavaSearchScope scope) {
-		JsPathIndexer indexer = new JsPathIndexer();
-		return indexer.getVisibleJspPaths(pattern, scope);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchScope.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchScope.java
deleted file mode 100644
index f96077b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchScope.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.IJavaSearchScope;
-
-/**
- * Used to constrain JSP/java search to certain paths and elements.
- * 
- * @author pavery
- */
-public class JsSearchScope implements IJavaSearchScope {
-	private boolean fEnclosesAll = false;
-	private List fJavaElements = null;
-	private List fResourcePaths = null;
-	
-	public JsSearchScope() {
-		// empty constructor just returns true for everything
-		// everything is in scope
-		this.fEnclosesAll = true;
-		init();
-	}
-	
-	public JsSearchScope(IJavaElement[] javaElement) {
-		init();
-		fJavaElements.addAll(Arrays.asList(javaElement));
-	}
-	
-	public JsSearchScope(String[] resourceStringPath) {
-		init();
-		fResourcePaths.addAll(Arrays.asList(resourceStringPath));
-	}
-	
-	public void addElement(IJavaElement element) {
-		this.fJavaElements.add(element);
-	}
-	
-	public void addPath(String path) {
-		this.fResourcePaths.add(path);
-	}
-	
-	public boolean encloses(IJavaElement element) {
-		// pa_TOD implement
-		if (this.fEnclosesAll) {
-			return true;
-		}
-		return true;
-	}
-	
-	public boolean encloses(IResourceProxy element) {
-		if (this.fEnclosesAll) {
-			return true;
-		} else if (enclosesPath(element.requestFullPath().toOSString())) {
-			return true;
-		}
-		return true;
-	}
-	
-	public boolean encloses(String resourcePathString) {
-		if (this.fEnclosesAll) {
-			return true;
-		} else if (enclosesPath(resourcePathString)) {
-			return true;
-		}
-		return false;
-	}
-	
-	private boolean enclosesPath(String possible) {
-		String[] paths = (String[]) fResourcePaths.toArray(new String[fResourcePaths.size()]);
-		for (int i = 0; i < paths.length; i++) {
-			if (possible.equals(paths[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public IPath[] enclosingProjectsAndJars() {
-		// pa_TODO
-		return null;
-	}
-	
-	public String getDescription() {
-		return "JSPSearchScope"; //$NON-NLS-1$
-	}
-	
-	public boolean includesBinaries() {
-		/* TEMP CHANGE BC may 30 */
-		return false;
-	}
-	
-	public boolean includesClasspaths() {
-		/* TEMP CHANGE BC may 30 */
-		return false;
-	}
-	
-	private void init() {
-		this.fResourcePaths = new ArrayList();
-		this.fJavaElements = new ArrayList();
-	}
-	
-	public void setIncludesBinaries(boolean includesBinaries) {
-	// do nothing
-	}
-	
-	public void setIncludesClasspaths(boolean includesClasspaths) {
-	// do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.search.IJavaSearchScope#shouldExclude(java.lang.String, java.lang.String)
-	 */
-	public boolean shouldExclude(String container, String resourceName) {
-		// TODO Auto-generated method stub
-		System.out.println("Unimplemented method:JsSearchScope.shouldExclude");
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchSupport.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchSupport.java
deleted file mode 100644
index 568ead1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchSupport.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import java.io.File;
-import java.util.zip.CRC32;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.IJavaSearchConstants;
-import org.eclipse.wst.jsdt.core.search.IJavaSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsNameManglerUtil;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-
-/**
- * Central access to java indexing and search. All contact between JDT indexing
- * and Searching should be done through here.
- * 
- * Clients should access the methods of this class via the single instance via
- * <code>getInstance()</code>.
- * 
- * @author pavery
- */
-public class JsSearchSupport {
-	// for debugging
-	static final boolean DEBUG;
-	private static JsSearchSupport singleton = null;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Clients should access the methods of this class via the single instance
-	 * via getInstance()
-	 * 
-	 * @return
-	 */
-	public synchronized static JsSearchSupport getInstance() {
-		if (JsSearchSupport.singleton == null) {
-			JsSearchSupport.singleton = new JsSearchSupport();
-		}
-		return JsSearchSupport.singleton;
-	}
-	
-	// private IPath fJspPluginLocation = null;
-	/**
-	 * Utility method to check if a file is a jsp file (since this is done
-	 * frequently)
-	 */
-	public static boolean isJsp(IFile file) {
-		
-		if (file != null && file.exists()) {
-			return Util.isJsType(file.getName());
-		}
-		return false;
-	}
-	/**
-	 * This operation ensures that the live resource's search markers show up in
-	 * the open editor. It also allows the ability to pass in a ProgressMonitor
-	 */
-	private class SearchJob extends Job implements IJavaSearchConstants {
-		IJavaElement fElement = null;
-		boolean fIsCaseSensitive = false;
-		int fLimitTo = IJavaSearchConstants.ALL_OCCURRENCES;
-		int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-		SearchRequestor fRequestor = null;
-		IJavaSearchScope fScope = null;
-		int fSearchFor = IJavaSearchConstants.FIELD;
-		String fSearchText = ""; //$NON-NLS-1$
-		
-		// constructor w/ java element
-		public SearchJob(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-			super(JsCoreMessages.JSP_Search + element.getElementName());
-			this.fElement = element;
-			this.fScope = scope;
-			this.fRequestor = requestor;
-		}
-		
-		// constructor w/ search text
-		public SearchJob(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive,
-				SearchRequestor requestor) {
-			super(JsCoreMessages.JSP_Search + searchText);
-			this.fSearchText = searchText;
-			this.fScope = scope;
-			this.fSearchFor = searchFor;
-			this.fLimitTo = limitTo;
-			this.fMatchMode = matchMode;
-			this.fIsCaseSensitive = isCaseSensitive;
-			this.fRequestor = requestor;
-		}
-		
-		
-		public IStatus run(IProgressMonitor jobMonitor) {
-			if (jobMonitor != null && jobMonitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			if (JsSearchSupport.getInstance().isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			SearchPattern javaSearchPattern = null;
-			// if an element is available, use that to create search pattern
-			// (eg. LocalVariable)
-			// otherwise use the text and other paramters
-			if (this.fElement != null) {
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, this.fLimitTo);
-			} else {
-				javaSearchPattern = SearchPattern.createPattern(this.fSearchText, this.fSearchFor, this.fLimitTo, this.fMatchMode);
-			}
-			if (javaSearchPattern != null) {
-				JsSearchParticipant[] participants = { getSearchParticipant() };
-				SearchEngine engine = new SearchEngine();
-				try {
-					if (jobMonitor != null) {
-						jobMonitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-					}
-					engine.search(javaSearchPattern, participants, this.fScope, this.fRequestor, jobMonitor);
-				} catch (CoreException e) {
-					if (JsSearchSupport.DEBUG) {
-						Logger.logException(e);
-					}
-				}
-				// non-CoreExceptions will permanently stall the Worker thread
-				catch (Exception e) {
-					if (JsSearchSupport.DEBUG) {
-						Logger.logException(e);
-					}
-				} finally {
-					if (jobMonitor != null) {
-						jobMonitor.done();
-					}
-				}
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	// end SearchJob
-	/**
-	 * Runnable forces caller to wait until finished (as opposed to using a Job)
-	 */
-	private class SearchRunnable implements IWorkspaceRunnable, IJavaSearchConstants {
-		IJavaElement fElement = null;
-		boolean fIsCaseSensitive = false;
-		int fLimitTo = IJavaSearchConstants.ALL_OCCURRENCES;
-		int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-		SearchRequestor fRequestor = null;
-		IJavaSearchScope fScope = null;
-		int fSearchFor = IJavaSearchConstants.FIELD;
-		String fSearchText = ""; //$NON-NLS-1$
-		
-		// constructor w/ java element
-		public SearchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-			this.fElement = element;
-			this.fScope = scope;
-			this.fRequestor = requestor;
-		}
-		
-		// constructor w/ search text
-		public SearchRunnable(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive,
-				SearchRequestor requestor) {
-			this.fSearchText = searchText;
-			this.fScope = scope;
-			this.fSearchFor = searchFor;
-			this.fLimitTo = limitTo;
-			this.fMatchMode = matchMode;
-			this.fIsCaseSensitive = isCaseSensitive;
-			this.fRequestor = requestor;
-		}
-		
-		public void run(IProgressMonitor monitor) throws CoreException {
-			if (monitor != null && monitor.isCanceled()) {
-				return;
-			}
-			if (JsSearchSupport.getInstance().isCanceled()) {
-				return;
-			}
-			SearchPattern javaSearchPattern = null;
-			// if an element is available, use that to create search pattern
-			// (eg. LocalVariable)
-			// otherwise use the text and other paramters
-			if (this.fElement != null) {
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, fLimitTo);
-			} else {
-				javaSearchPattern = SearchPattern.createPattern(fSearchText, fSearchFor, fLimitTo, fMatchMode);
-			}
-			if (javaSearchPattern != null) {
-				JsSearchParticipant[] participants = { getSearchParticipant() };
-				SearchEngine engine = new SearchEngine();
-				try {
-					if (monitor != null) {
-						monitor.beginTask("", 0); //$NON-NLS-1$
-					}
-					engine.search(javaSearchPattern, participants, fScope, fRequestor, monitor);
-				} catch (CoreException e) {
-					Logger.logException(e);
-					// throw e;
-				}
-				// non-CoreExceptions will permanently stall the Worker thread
-				catch (Exception e) {
-					Logger.logException(e);
-				} finally {
-					if (monitor != null) {
-						monitor.done();
-					}
-				}
-			}
-		}
-	}
-	// pa_TODO may be slow (esp for indexing entire workspace)
-	private final CRC32 fChecksumCalculator = new CRC32();
-	/** main cancel montior for all search support */
-	private final IProgressMonitor fMonitor = new NullProgressMonitor();
-	// end SearchRunnable
-	private JsSearchParticipant fParticipant = null;
-	
-	private JsSearchSupport() {
-	// force use of single instance
-	}
-	
-	/**
-	 * schedules a search document representing this JSP file for indexing (by
-	 * the java indexer)
-	 * 
-	 * @param file
-	 *            the JSP file
-	 * @return true if indexing was successful, false otherwise
-	 * @throws CoreException
-	 */
-	public SearchDocument addJspFile(IFile file) {
-		if (JsSearchSupport.getInstance().isCanceled() || !file.isAccessible()) {
-			return null;
-		}
-		if (JsSearchSupport.DEBUG) {
-			System.out.println("adding JSP file:" + file.getFullPath()); //$NON-NLS-1$
-		}
-		// create
-		SearchDocument delegate = createSearchDocument(file);
-		// null if not a jsp file
-		if (delegate != null) {
-			try {
-				getSearchParticipant().scheduleDocumentIndexing(delegate, computeIndexLocation(file.getParent().getFullPath()));
-			} catch (Exception e) {
-				// ensure that failure here doesn't keep other documents from
-				// being indexed
-				// if peformed in a batch call (like JSPIndexManager)
-				if (JsSearchSupport.DEBUG) {
-					e.printStackTrace();
-				}
-			}
-		}
-		if (JsSearchSupport.DEBUG) {
-			System.out.println("scheduled" + delegate + "for indexing"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return delegate;
-	}
-	
-	public final IPath computeContainerLocation(IPath indexLocation) {
-		return null;
-	}
-	
-	// This is called from JSPPathIndexer
-	// pa_TODO
-	// how can we make sure participant indexLocations are updated at startup?
-	public final IPath computeIndexLocation(IPath containerPath) {
-		String indexLocation = null;
-		// we don't want to inadvertently use a JDT Index
-		// we want to be sure to use the Index from the JSP location
-		// Object obj = indexLocations.get(containerPath);
-		// if (obj != null) {
-		// indexLocation = (String) obj;
-		// } else {
-		// create index entry
-		String pathString = containerPath.toOSString();
-		this.fChecksumCalculator.reset();
-		this.fChecksumCalculator.update(pathString.getBytes());
-		String fileName = Long.toString(this.fChecksumCalculator.getValue()) + ".index"; //$NON-NLS-1$
-		// this is the only difference from
-		// IndexManager#computeIndexLocation(...)
-		indexLocation = getModelJspPluginWorkingLocation(getProject(containerPath)).append(fileName).toOSString();
-		// pa_TODO need to add to java path too, so JDT search support knows
-		// there should be a non internal way to do this.
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=77564
-		JavaModelManager.getJavaModelManager().getIndexManager().indexLocations.put(containerPath, new Path(indexLocation));
-		// }
-		return new Path(indexLocation);
-	}
-	
-	/**
-	 * @param jspFile
-	 * @return SearchDocument if the file is not null, exists, and is a JSP
-	 *         file, otherwise null.
-	 */
-	private SearchDocument createSearchDocument(IFile jspFile) {
-		JSDTSearchDocumentDelegate delegate = null;
-		if (jspFile != null && jspFile.exists() && JsSearchSupport.isJsp(jspFile)) {
-			delegate = new JSDTSearchDocumentDelegate(new JsSearchDocument(jspFile.getFullPath().toString(), getSearchParticipant()));
-		}
-		return delegate;
-	}
-	
-	/**
-	 * Unmangles the searchDocPath and returns the corresponding JSP file.
-	 * 
-	 * @param searchDocPath
-	 */
-	private IFile fileForCUPath(String searchDocPath) {
-		String[] split = searchDocPath.split("/"); //$NON-NLS-1$
-		String classname = split[split.length - 1];
-		// ignore anything but .java matches (like .class binary matches)
-		if (!searchDocPath.endsWith(".js")) { //$NON-NLS-1$
-			return null;
-		}
-		String filePath = JsNameManglerUtil.unmangle(classname);
-		// try absolute path
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(filePath));
-		// workspace relative then
-		if (f == null) {
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=86009
-			// must have a project name as well
-			// which would mean >= 2 path segments
-			IPath path = new Path(filePath);
-			if (path.segmentCount() >= 2) {
-				f = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			}
-		}
-		return f;
-	}
-	
-	// copied from JDT IndexManager
-	public IPath getModelJspPluginWorkingLocation(IProject project) {
-		if (project == null) {
-			System.out.println("Null project");
-		}
-		IPath workingLocationFile = project.getWorkingLocation(JsCorePlugin.PLUGIN_ID).append("jspsearch");
-		// ensure that it exists on disk
-		File folder = new File(workingLocationFile.toOSString());
-		if (!folder.isDirectory()) {
-			try {
-				folder.mkdir();
-			} catch (SecurityException e) {
-			}
-		}
-		return workingLocationFile;
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * 
-	 * @return
-	 */
-	public final IProgressMonitor getProgressMonitor() {
-		return this.fMonitor;
-	}
-	
-	private IProject getProject(IPath path) {
-		// Return the project containing the given path
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IResource resource = workspace.getRoot().findMember(path.toString());
-		if (resource == null) {
-			return null;
-		}
-		IProject project = resource.getProject();
-		return project;
-	}
-	
-	/**
-	 * Centralized place to access JSPSearchDocuments (used by
-	 * JSPSearchParticipant and JSPSearchRequestor)
-	 * 
-	 * @param searchDocPath
-	 * @param doc
-	 * @return the JSPSearchDocument or null if one is not found
-	 */
-	public SearchDocument getSearchDocument(String searchDocPath) {
-		SearchDocument delegate = null;
-		IFile f = fileForCUPath(searchDocPath);
-		if (f != null) {
-			delegate = createSearchDocument(f);
-		} else {
-			// handle failure case... (file deleted maybe?)
-		}
-		return delegate;
-	}
-	
-	JsSearchParticipant getSearchParticipant() {
-		if (this.fParticipant == null) {
-			this.fParticipant = new JsSearchParticipant();
-		}
-		return this.fParticipant;
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * 
-	 * @return
-	 */
-	public synchronized final boolean isCanceled() {
-		return fMonitor.isCanceled();
-	}
-	
-	/**
-	 * Search for an IJavaElement, constrained by the given parameters. Runs in
-	 * a background Job (results may still come in after this method call)
-	 * 
-	 * @param element
-	 * @param scope
-	 * @param requestor
-	 */
-	public void search(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-		JsIndexManager.getInstance().rebuildIndexIfNeeded();
-		SearchJob job = new SearchJob(element, scope, requestor);
-		setCanceled(false);
-		job.setUser(true);
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-		// job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-	
-	/**
-	 * Perform a java search w/ the given parameters. Runs in a background Job
-	 * (results may still come in after this method call)
-	 * 
-	 * @param searchText
-	 *            the string of text to search on
-	 * @param searchFor
-	 *            IJavaSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc...
-	 * @param limitTo
-	 *            IJavaSearchConstants.DECLARATIONS,
-	 *            IJavaSearchConstants.REFERENCES,
-	 *            IJavaSearchConstants.IMPLEMENTORS, or
-	 *            IJavaSearchConstants.ALL_OCCURRENCES
-	 * @param matchMode
-	 *            allow * wildcards or not
-	 * @param isCaseSensitive
-	 * @param requestor
-	 *            passed in to accept search matches (and do "something" with
-	 *            them)
-	 */
-	public void search(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-		JsIndexManager.getInstance().rebuildIndexIfNeeded();
-		SearchJob job = new SearchJob(searchText, scope, searchFor, limitTo, matchMode, isCaseSensitive, requestor);
-		setCanceled(false);
-		job.setUser(true);
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-		// pops up user operation blocked dialog if you perform a long search,
-		// then open a file because it locks the workspace
-		// job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-	
-	/**
-	 * Search for an IJavaElement, constrained by the given parameters. Runs in
-	 * an IWorkspace runnable (results will be reported by the end of this
-	 * method)
-	 * 
-	 * @param element
-	 * @param scope
-	 * @param requestor
-	 */
-	public void searchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-		JsIndexManager.getInstance().rebuildIndexIfNeeded();
-		SearchRunnable searchRunnable = new SearchRunnable(element, scope, requestor);
-		try {
-			setCanceled(false);
-			ResourcesPlugin.getWorkspace().run(searchRunnable, JsSearchSupport.getInstance().getProgressMonitor());
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * 
-	 * @return
-	 */
-	public synchronized final void setCanceled(boolean cancel) {
-		// System.out.println("search support monitor" + fMonitor);
-		fMonitor.setCanceled(cancel);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/NullSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/NullSearchDocument.java
deleted file mode 100644
index 04c4cec..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/NullSearchDocument.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.java.search;
-
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslator;
-
-/**
- * An empty servlet, safe for Java search participation
- * 
- * @author pavery
- */
-public class NullSearchDocument extends SearchDocument {
-	StringBuffer fEmptyServletBuffer = null;
-	
-	public NullSearchDocument(String documentPath) {
-		super(documentPath, new JsSearchParticipant());
-		this.fEmptyServletBuffer = new StringBuffer();
-	}
-	
-	
-	public byte[] getByteContents() {
-		return this.fEmptyServletBuffer.toString().getBytes();
-	}
-	
-	
-	public char[] getCharContents() {
-		return this.fEmptyServletBuffer.toString().toCharArray();
-	}
-	
-	
-	public String getEncoding() {
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java
deleted file mode 100644
index 3a66250..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-/**
- * @author childsb
- * 
- */
-public interface IWebDocumentChangeListener extends IWebResourceChangedListener {
-	public static final int BORING = 0;
-	public static final int DIRTY_DOC = 1;
-	public static final int DIRTY_MODEL = 2;
-	
-	public int getIntrestLevelAtOffset(int documentOffset);
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java
deleted file mode 100644
index 1fbbfa9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-/**
- * @author childsb
- * 
- */
-public interface IWebResourceChangedListener {
-	public void resourceChanged();
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
deleted file mode 100644
index add1f69..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.modelhandler;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.model.ModelLifecycleEvent;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLifecycleListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-import java.util.Hashtable;
-
-/**
- * Copyright IBM 2007. All rights reserved. This class maintains resource change
- * events for web document moedels. Author Bradley Childs. (childsb@us.ibm.com)
- */
-public class WebResourceChangeHandler implements IResourceChangeListener, IDocumentListener, IModelLifecycleListener {
-	/*
-	 * Check the level of dirty regions when signaling for document events.
-	 * 
-	 * sometimes the SSE editor doesn't re-validate regions when text is
-	 * inserted, so setting this to false causes every document change event to
-	 * trigger a revalidation.
-	 * 
-	 * setting to true may speed things up.
-	 * 
-	 */
-	private static final boolean CHECK_INTREST_LEVEL = false;
-	private static Hashtable instances = new Hashtable();
-	private static final boolean SIGNAL_MODEL = false;
-	
-	public static WebResourceChangeHandler getInstance(IStructuredModel xmlModel, IWebResourceChangedListener changeListener) {
-		WebResourceChangeHandler handler = null;
-		synchronized (WebResourceChangeHandler.instances) {
-			Enumeration values = WebResourceChangeHandler.instances.elements();
-			while (values.hasMoreElements()) {
-				Object model = values.nextElement();
-				if (model == xmlModel) {
-					handler = (WebResourceChangeHandler) WebResourceChangeHandler.instances.get(model);
-				}
-			}
-			if (handler == null) {
-				handler = new WebResourceChangeHandler();
-				WebResourceChangeHandler.instances.put(handler, xmlModel);
-			}
-		}
-		handler.initialize();
-		handler.fchangeListener.add(changeListener);
-		return handler;
-	}
-	private class ModelIrritantThread implements Runnable {
-		public void run() {
-			signalAllDirtyModel();
-		}
-		
-		public void signalAllDirtyModel() {
-			for (int i = 0; i < fchangeListener.size(); i++) {
-				((IWebResourceChangedListener) fchangeListener.get(i)).resourceChanged();
-			}
-			if (!WebResourceChangeHandler.SIGNAL_MODEL) {
-				return;
-			}
-			IDOMModel xmlModel = null;
-			Object modelRef = getModel();
-			if (modelRef == null) {
-				return;
-			}
-			try {
-// for(int i =0;i<fchangeListener.size();i++) {
-// ((IWebResourceChangedListener)fchangeListener.get(i)).resourceChanged();
-// }
-				xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForEdit(((IStructuredModel) modelRef).getBaseLocation());
-				if (xmlModel != null) {
-					IStructuredDocument doc = xmlModel.getStructuredDocument();
-					xmlModel.aboutToChangeModel();
-					// xmlModel.setReinitializeNeeded(true);
-					// (doc).replace(0, doc.getLength(),doc.get());
-					xmlModel.changedModel();
-				}
-			} catch (Exception e) {
-				System.out.println("Error when trying to agitate the model..");
-			} finally {
-				if (xmlModel != null) {
-					xmlModel.releaseFromEdit();
-				}
-			}
-		}
-	}
-	private ArrayList fchangeListener = new ArrayList();
-	private ModelIrritantThread irritator;
-	
-	private WebResourceChangeHandler() {}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent event) {}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-//		if (WebResourceChangeHandler.CHECK_INTREST_LEVEL) {
-//			for (int i = 0; i < fchangeListener.size(); i++) {
-//				Object o = fchangeListener.get(i);
-//				if (o instanceof IWebDocumentChangeListener) {
-//					int intrest = ((IWebDocumentChangeListener) o).getIntrestLevelAtOffset(event.fOffset);
-//					switch (intrest) {
-//						case IWebDocumentChangeListener.DIRTY_MODEL:
-//							irritator.signalAllDirtyModel();
-//							return;
-//						case IWebDocumentChangeListener.DIRTY_DOC:
-//							((IWebDocumentChangeListener) o).resourceChanged();
-//						break;
-//					}
-//					return;
-//				}
-//			}
-//		} else {
-			irritator.signalAllDirtyModel();
-		//}
-	}
-	
-	
-	public boolean equals(Object o) {
-		return (o instanceof WebResourceChangeHandler && ((WebResourceChangeHandler) o).fchangeListener == this.fchangeListener);
-	}
-	
-	
-	public void finalize() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		if (WebResourceChangeHandler.instances == null) {
-			return;
-		}
-		Object o = null;
-		synchronized (WebResourceChangeHandler.instances) {
-			o = WebResourceChangeHandler.instances.get(this);
-			WebResourceChangeHandler.instances.remove(this);
-		}
-		if (o != null) {
-			IStructuredModel fXMLModel = (IStructuredModel) o;
-			IStructuredDocument fJspDocument = fXMLModel.getStructuredDocument();
-			if (fJspDocument != null) {
-				fJspDocument.removeDocumentListener(this);
-			}
-		}
-	}
-	
-	private IStructuredModel getModel() {
-		if (WebResourceChangeHandler.instances == null) {
-			return null;
-		}
-		return (IStructuredModel) WebResourceChangeHandler.instances.get(this);
-	}
-	
-	private void initialize() {
-		IStructuredModel xmlModel = getModel();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-		xmlModel.addModelLifecycleListener(this);
-		IStructuredDocument fJspDocument = xmlModel.getStructuredDocument();
-		if (fJspDocument != null) {
-			fJspDocument.addDocumentListener(this);
-		}
-		irritator = new ModelIrritantThread();
-	}
-	
-	public void processPostModelEvent(ModelLifecycleEvent event) {
-		if (irritator != null) {
-			irritator.signalAllDirtyModel();
-		}
-		if (WebResourceChangeHandler.instances == null) {
-			return;
-		}
-		if (event.getType() == ModelLifecycleEvent.MODEL_RELEASED) {
-			synchronized (WebResourceChangeHandler.instances) {
-				WebResourceChangeHandler.instances.remove(this);
-			}
-		}
-	}
-	
-	public void processPreModelEvent(ModelLifecycleEvent event) {}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		Display.getDefault().asyncExec(irritator);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java
deleted file mode 100644
index f6b5984..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-
-public class JsNatureInstaller implements IDelegate {
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("Installing Facet for JavaScript Development Tools" + ".", 100); //$NON-NLS-1$
-		try {
-			installNature(project, monitor);
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	public void installNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask("Installing JavaScript Development Tools...", 100);
-		monitor.subTask("Adding JavaScript Development Toolkit Nature...");
-		SubProgressMonitor sub = new SubProgressMonitor(monitor, 25);
-		try {
-			monitor.worked(20);
-			JsWebNature jsNature = new JsWebNature(project, monitor);
-			monitor.worked(20);
-			jsNature.configure();
-			monitor.worked(40);
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR, JsCorePlugin.PLUGIN_ID, IStatus.OK, "Error installing runtime! JavaScript Development Tools could not be added..", e));
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java
deleted file mode 100644
index e8e2c44..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-
-public class JsNatureUninstaller implements IDelegate {
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("Uninstalling Facet for JavaScript Development Tools" + ".", 100); //$NON-NLS-1$
-		try {
-			uninstallNature(project, monitor);
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	public void uninstallNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask("Uninstalling JavaScript Development Tools...", 100);
-		// by using natures we can leverage the precondition support
-		monitor.subTask("Removing JavaScript Development Toolking Nature...");
-		SubProgressMonitor sub = new SubProgressMonitor(monitor, 25);
-		if (!JsWebNature.hasNature(project)) {
-			return;
-		}
-		try {
-			IProjectNature jsNature = new JsWebNature(project, monitor);
-			monitor.worked(20);
-			monitor.worked(50);
-			jsNature.deconfigure();
-			monitor.worked(20);
-		} catch (CoreException e) {
-			throw new CoreException(new Status(IStatus.ERROR, JsCorePlugin.PLUGIN_ID, IStatus.OK, "Error installing runtime! JavaScript Development Tools could not be removed, or is not present in target project..", e));
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
deleted file mode 100644
index b0bd92b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import java.util.Arrays;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IClasspathEntry;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.core.LibrarySuperType;
-import org.eclipse.wst.jsdt.internal.core.JavaProject;
-import org.eclipse.wst.jsdt.ui.PreferenceConstants;
-import org.eclipse.wst.jsdt.web.core.internal.java.WebRootFinder;
-
-public class JsWebNature implements IProjectNature {
-	//private static final String FILENAME_CLASSPATH = ".classpath"; //$NON-NLS-1$
-	// private static final String NATURE_IDS[] =
-	// {"org.eclipse.wst.jsdt.web.core.embeded.jsNature",JavaCore.NATURE_ID};
-	// //$NON-NLS-1$
-	private static final String NATURE_IDS[] = { JavaCore.NATURE_ID };
-
-	public static final IPath VIRTUAL_BROWSER_CLASSPATH = new Path("org.eclipse.wst.jsdt.launching.baseBrowserLibrary");
-	public static final String VIRTUAL_CONTAINER = "org.eclipse.wst.jsdt.launching.WebProject";
-	public static final IClasspathEntry VIRTUAL_SCOPE_ENTRY = JavaCore.newContainerEntry(new Path(VIRTUAL_CONTAINER));
-	private static final String SUPER_TYPE_NAME = "Window";
-	private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary";
-	
-	public static void addJsNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-		if (!JsWebNature.hasNature(project)) {
-			IProjectDescription description = project.getDescription();
-			String[] prevNatures = description.getNatureIds();
-			String[] newNatures = new String[prevNatures.length + JsWebNature.NATURE_IDS.length];
-			System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-			// newNatures[prevNatures.length] = JavaCore.NATURE_ID;
-			for (int i = 0; i < JsWebNature.NATURE_IDS.length; i++) {
-				newNatures[prevNatures.length + i] = JsWebNature.NATURE_IDS[i];
-			}
-			description.setNatureIds(newNatures);
-			project.setDescription(description, monitor);
-		} else {
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-	}
-	
-	public static boolean hasNature(IProject project) {
-		try {
-			for (int i = 0; i < JsWebNature.NATURE_IDS.length; i++) {
-				if (!project.hasNature(JsWebNature.NATURE_IDS[i])) {
-					return false;
-				}
-			}
-		} catch (CoreException ex) {
-			return false;
-		}
-		return true;
-	}
-	
-	public static void removeJsNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-		if (JsWebNature.hasNature(project)) {
-			IProjectDescription description = project.getDescription();
-			String[] prevNatures = description.getNatureIds();
-			String[] newNatures = new String[prevNatures.length - JsWebNature.NATURE_IDS.length];
-			int k = 0;
-			head: for (int i = 0; i < prevNatures.length; i++) {
-				for (int j = 0; j < JsWebNature.NATURE_IDS.length; j++) {
-					if (prevNatures[i] == JsWebNature.NATURE_IDS[j]) {
-						continue head;
-					}
-				}
-				newNatures[k++] = prevNatures[i];
-			}
-			description.setNatureIds(newNatures);
-			project.setDescription(description, monitor);
-		} else {
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-	}
-	private Vector classPathEntries = new Vector();
-	private boolean DEBUG = false;
-	private IProject fCurrProject;
-	private JavaProject fJavaProject;
-	private IPath fOutputLocation;
-	private IProgressMonitor monitor;
-	
-	public JsWebNature() {
-		monitor = new NullProgressMonitor();
-	}
-	
-	public JsWebNature(IProject project, IProgressMonitor monitor) {
-		fCurrProject = project;
-		if (monitor != null) {
-			this.monitor = monitor;
-		} else {
-			monitor = new NullProgressMonitor();
-		}
-	}
-	
-	public void configure() throws CoreException {
-		if (hasProjectClassPathFile()) {
-			IClasspathEntry[] entries = getRawClassPath();
-			if (entries != null && entries.length > 0) {
-				classPathEntries.addAll(Arrays.asList(entries));
-			}
-		}
-		initOutputPath();
-		createSourceClassPath();
-		initJREEntry();
-		initLocalClassPath();
-		JsWebNature.addJsNature(fCurrProject, monitor);
-		fJavaProject = (JavaProject) JavaCore.create(fCurrProject);
-		fJavaProject.setProject(fCurrProject);
-		try {
-			// , fOutputLocation
-			if (!hasProjectClassPathFile()) {
-				fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), fOutputLocation, monitor);
-			}
-			if (hasProjectClassPathFile()) {
-				fJavaProject.setRawClasspath((IClasspathEntry[]) classPathEntries.toArray(new IClasspathEntry[] {}), monitor);
-			}
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-		LibrarySuperType superType = new LibrarySuperType(new Path( SUPER_TYPE_LIBRARY),  getJavaProject(), SUPER_TYPE_NAME);
-		getJavaProject().setCommonSuperType(superType);
-		// getJavaProject().addToBuildSpec(BUILDER_ID);
-		fCurrProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-	}
-	
-	private void createSourceClassPath() {
-		if (hasAValidSourcePath()) {
-			return;
-		}
-		// IPath projectPath = fCurrProject.getFullPath();
-		// classPathEntries.add(JavaCore.newSourceEntry(projectPath));
-	}
-	
-	public void deconfigure() throws CoreException {
-		Vector badEntries = new Vector();
-		IClasspathEntry[] defaultJRELibrary = PreferenceConstants.getDefaultJRELibrary();
-		IClasspathEntry[] localEntries = initLocalClassPath();
-		badEntries.addAll(Arrays.asList(defaultJRELibrary));
-		badEntries.addAll(Arrays.asList(localEntries));
-		IClasspathEntry[] entries = getRawClassPath();
-		Vector goodEntries = new Vector();
-		for (int i = 0; i < entries.length; i++) {
-			if (!badEntries.contains(entries[i])) {
-				goodEntries.add(entries[i]);
-			}
-		}
-		// getJavaProject().removeFromBuildSpec(BUILDER_ID);
-		IPath outputLocation = getJavaProject().getOutputLocation();
-		getJavaProject().setRawClasspath((IClasspathEntry[]) goodEntries.toArray(new IClasspathEntry[] {}), outputLocation, monitor);
-		getJavaProject().deconfigure();
-		JsWebNature.removeJsNature(fCurrProject, monitor);
-		fCurrProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-	}
-	
-	private IPath getCurrentOutputPath() {
-		IPath outputLocation = null;
-		if (hasProjectClassPathFile()) {
-			try {
-				System.out.println("Project Scope already configured!!!!!!  please validate nature installer");
-			} catch (Exception e) {
-				if (DEBUG) {
-					System.out.println("Error checking sourcepath:" + e);
-				}
-			}
-		}
-		return outputLocation;
-	}
-	
-	public JavaProject getJavaProject() {
-		if (fJavaProject == null) {
-			fJavaProject = (JavaProject) JavaCore.create(fCurrProject);
-			fJavaProject.setProject(fCurrProject);
-		}
-		return fJavaProject;
-	}
-	
-	public IProject getProject() {
-		return this.fCurrProject;
-	}
-	
-	private IClasspathEntry[] getRawClassPath() {
-		JavaProject proj = new JavaProject();
-		proj.setProject(fCurrProject);
-		return proj.readRawClasspath();
-	}
-	
-	private boolean hasAValidSourcePath() {
-		if (hasProjectClassPathFile()) {
-			try {
-				IClasspathEntry[] entries = getRawClassPath();
-				for (int i = 0; i < entries.length; i++) {
-					if (entries[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-						return true;
-					}
-				}
-			} catch (Exception e) {
-				if (DEBUG) {
-					System.out.println("Error checking sourcepath:" + e);
-				}
-			}
-		}
-		return false;
-	}
-	
-	private boolean hasProjectClassPathFile() {
-		if (fCurrProject == null) {
-			return false;
-		}
-		return fCurrProject.getFile(JavaProject.CLASSPATH_FILENAME).exists();
-	}
-	
-	private void initJREEntry() {
-		IClasspathEntry[] defaultJRELibrary = PreferenceConstants.getDefaultJRELibrary();
-		try {
-			IClasspathEntry[] entries = getRawClassPath();
-			for (int i = 0; i < entries.length; i++) {
-				if (entries[i] == defaultJRELibrary[0]) {
-					return;
-				}
-			}
-			classPathEntries.add(defaultJRELibrary[0]);
-		} catch (Exception e) {
-			if (DEBUG) {
-				System.out.println("Error checking sourcepath:" + e);
-			}
-		}
-	}
-	
-	private IClasspathEntry[] initLocalClassPath() {
-		
-		classPathEntries.add(JsWebNature.VIRTUAL_SCOPE_ENTRY);
-		IClasspathEntry browserLibrary = JavaCore.newContainerEntry( VIRTUAL_BROWSER_CLASSPATH);
-		classPathEntries.add(browserLibrary);
-		//IPath webRoot = WebRootFinder.getWebContentFolder(fCurrProject);
-	//	IClasspathEntry source = JavaCore.newSourceEntry(fCurrProject.getFullPath().append(webRoot).append("/"));
-	//	classPathEntries.add(source);
-		return new IClasspathEntry[] { JsWebNature.VIRTUAL_SCOPE_ENTRY , browserLibrary/*,source*/};
-	}
-	
-	private void initOutputPath() {
-		if (fOutputLocation == null) {
-			fOutputLocation = getCurrentOutputPath();
-		}
-		if (fOutputLocation == null) {
-			fOutputLocation = fCurrProject.getFullPath();
-		}
-	}
-	
-	public void setProject(IProject project) {
-		this.fCurrProject = project;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java
deleted file mode 100644
index febd657..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.provisional.contenttype;
-
-/**
- * This class, with its one field, is a convience to provide compile-time safety
- * when refering to a contentType ID. The value of the contenttype id field must
- * match what is specified in plugin.xml file.
- */
-public class ContentTypeIdForEmbededJs {
-	/**
-	 * The value of the contenttype id field must match what is specified in
-	 * plugin.xml file. Note: this value is intentially set with default
-	 * protected method so it will not be inlined.
-	 */
-	public final static String[] ContentTypeIds = ContentTypeIdForEmbededJs. getJsConstantString();
-
-	static String[] getJsConstantString() {
-		return new String[] {"org.eclipse.wst.html.core.htmlsource","org.eclipse.jst.jsp.core.jspsource"}; //$NON-NLS-1$
-	}
-	
-	private ContentTypeIdForEmbededJs() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java
deleted file mode 100644
index 85bc972..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.provisional.contenttype;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.sse.core.internal.encoding.ICodedResourcePlugin;
-
-public interface IContentDescriptionForJSP {
-	public final static QualifiedName CONTENT_FAMILY_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "contentFamilyAttribute"); //$NON-NLS-1$;
-	/**
-	 * Extra properties as part of ContentDescription, if the content is JSP.
-	 */
-	public final static QualifiedName CONTENT_TYPE_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "contentTypeAttribute"); //$NON-NLS-1$
-	public final static QualifiedName LANGUAGE_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "languageAttribute"); //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/text/IJSPPartitionTypes.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/text/IJSPPartitionTypes.java
deleted file mode 100644
index 9ced77a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/text/IJSPPartitionTypes.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.internal.provisional.text;
-
-/**
- * This interface is not intended to be implemented. It defines the partition
- * types for JSP. Clients should reference the partition type Strings defined
- * here directly.
- * 
- * @deprecated use
- *             org.eclipse.wst.jsdt.web.core.internal.provisional.text.IJSPPartitions
- */
-
-public interface IJSPPartitionTypes {
-	String JSP_COMMENT = "org.eclipse.wst.jsdt.web.JSP_COMMENT"; //$NON-NLS-1$
-	String JSP_CONTENT_DELIMITER = IJSPPartitionTypes.JSP_SCRIPT_PREFIX + "DELIMITER"; //$NON-NLS-1$
-	String JSP_CONTENT_JAVA = IJSPPartitionTypes.JSP_SCRIPT_PREFIX + "JAVA"; //$NON-NLS-1$
-	String JSP_CONTENT_JAVASCRIPT = IJSPPartitionTypes.JSP_SCRIPT_PREFIX + "JAVASCRIPT"; //$NON-NLS-1$
-	String JSP_DEFAULT = "org.eclipse.wst.jsdt.web.DEFAULT_JSP"; //$NON-NLS-1$
-	String JSP_DEFAULT_EL = IJSPPartitionTypes.JSP_SCRIPT_PREFIX + "JSP_EL"; //$NON-NLS-1$
-	String JSP_DEFAULT_EL2 = IJSPPartitionTypes.JSP_SCRIPT_PREFIX + "JSP_EL2"; //$NON-NLS-1$
-	String JSP_DIRECTIVE = "org.eclipse.wst.jsdt.web.JSP_DIRECTIVE"; //$NON-NLS-1$
-	String JSP_SCRIPT_PREFIX = "org.eclipse.wst.jsdt.web.SCRIPT."; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/tasks/JsFileTaskScanner.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/tasks/JsFileTaskScanner.java
deleted file mode 100644
index f42afa6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/tasks/JsFileTaskScanner.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.core.internal.tasks;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.tasks.XMLFileTaskScanner;
-
-public class JsFileTaskScanner extends XMLFileTaskScanner {
-	
-	protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) {
-		return super.isCommentRegion(region, textRegion);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java
deleted file mode 100644
index c1ade19..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsBatchValidator.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * 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.jsdt.web.core.internal.validation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-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.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.core.IClasspathAttribute;
-import org.eclipse.wst.jsdt.core.IClasspathEntry;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-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.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-
-/**
- * Performs JSP validation tasks for batch validation. The individual validator
- * classes will still be used for source validation.
- */
-public final class JsBatchValidator implements IValidatorJob, IExecutableExtension {
-	// for debugging
-	static final boolean DEBUG = Boolean.valueOf(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspvalidator")).booleanValue(); //$NON-NLS-1$
-	private static final String PLUGIN_ID_JSP_CORE = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
-	private IPath[] excludeLibPaths;
-	
-	private final static String [] rhinoValidator = {"org.eclipse.atf.javascript.internal.validation.JSSyntaxValidator"};
-      static { 
-              // Temp code to clear Rhino Syntax validation markers.
-              IWorkspace workspace = ResourcesPlugin.getWorkspace();
-              IProject[] projects = workspace.getRoot().getProjects();
-              for (int j = 0; j < projects.length; j++) {
-                      IProject project = projects[j];
-                      //try {
-                              if (project.isOpen()) {
-                                      try {
-                                              if (project.hasNature(JavaCore.NATURE_ID)) {
-                                                    WorkbenchReporter.removeAllMessages(project, rhinoValidator, null);
-                                              }
-                                      } catch (CoreException e) {
-                                              // Do nothing
-                                      }
-                              }
-              }
-              
-      } 
-      
-	/**
-	 * Gets current validation project configuration based on current project
-	 * (which is based on current document)
-	 * 
-	 * @return ProjectConfiguration
-	 */
-	static private ProjectConfiguration getProjectConfiguration(IFile file) {
-		ProjectConfiguration projectConfiguration = null;
-		if (file != null) {
-			IProject project = file.getProject();
-			if (project != null) {
-				try {
-					projectConfiguration = ConfigurationManager.getManager().getProjectConfiguration(project);
-				} catch (InvocationTargetException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-			}
-		}
-		return projectConfiguration;
-	}
-	
-	/**
-	 * Checks if validator is enabled according in Validation preferences
-	 * 
-	 * @param vmd
-	 * @return
-	 */
-	static boolean isBatchValidatorPreferenceEnabled(IFile file) {
-		if (file == null) {
-			return true;
-		}
-		boolean enabled = true;
-		ProjectConfiguration configuration = JsBatchValidator.getProjectConfiguration(file);
-		if (configuration != null) {
-			org.eclipse.wst.validation.internal.ValidatorMetaData metadata = ValidationRegistryReader.getReader().getValidatorMetaData(JsBatchValidator.class.getName());
-			if (configuration != null && metadata != null) {
-				if (!configuration.isBuildEnabled(metadata) && !configuration.isManualEnabled(metadata)) {
-					enabled = false;
-				}
-			}
-		}
-		return enabled;
-	}
-	class JSPFileVisitor implements IResourceProxyVisitor {
-		private List fFiles = new ArrayList();
-		private IReporter fReporter = null;
-		
-		public JSPFileVisitor(IReporter reporter) {
-			fReporter = reporter;
-		}
-		
-		final IFile[] getFiles() {
-			return (IFile[]) fFiles.toArray(new IFile[fFiles.size()]);
-		}
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			// check validation
-			if (fReporter.isCancelled()) {
-				return false;
-			}
-			if (proxy.getType() == IResource.FILE) {
-				if (Util.isJsType(proxy.getName()) && proxy.isAccessible()) {
-					IFile file = (IFile) proxy.requestResource();
-					if (JsBatchValidator.DEBUG) {
-						System.out.println("(+) JSPValidator adding file: " + file.getName()); //$NON-NLS-1$
-					}
-					fFiles.add(file);
-					// don't search deeper for files
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-	class LocalizedMessage extends Message {
-		private String _message = null;
-		
-		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);
-		}
-		
-		private String getLocalizedText() {
-			return _message;
-		}
-		
-		
-		public String getText() {
-			return getLocalizedText();
-		}
-		
-		
-		public String getText(ClassLoader cl) {
-			return getLocalizedText();
-		}
-		
-		
-		public String getText(Locale l) {
-			return getLocalizedText();
-		}
-		
-		
-		public String getText(Locale l, ClassLoader cl) {
-			return getLocalizedText();
-		}
-		
-		public void setLocalizedMessage(String message) {
-			_message = message;
-		}
-	}
-	//String fAdditionalContentTypesIDs[] = null;
-	private IContentType[] fContentTypes = null;
-	private IContentType fJSPFContentType = null;
-	private JsValidator fJSPJavaValidator = new JsValidator(this);
-	
-	public void cleanup(IReporter reporter) {
-		fJSPJavaValidator.cleanup(reporter);
-	}
-	private IPath[] getLibraryPaths(IFile file) {
-		
-		if(excludeLibPaths!=null) return excludeLibPaths;
-		
-		IProject project = file.getProject();
-		IJavaProject javaProject= JavaCore.create(project);
-		
-		if(javaProject==null) return new IPath[0];
-		
-		IClasspathEntry[] entries = new IClasspathEntry[0];
-		try {
-			entries = javaProject.getResolvedClasspath(true);
-		} catch (JavaModelException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-		ArrayList ignorePaths = new ArrayList();
-		nextEntry: for(int i = 0;i<entries.length;i++) {
-			if(entries[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-				IClasspathAttribute[] attribs = entries[i].getExtraAttributes();
-				for(int k=0; attribs!=null && k<attribs.length;k++) {
-					if(attribs[k].getName().equalsIgnoreCase("validate") && attribs[k].getValue().equalsIgnoreCase("false")) {
-						ignorePaths.add(entries[i].getPath());
-						continue nextEntry;
-					}
-				}
-			}
-		}
-		
-		excludeLibPaths =  (Path[])ignorePaths.toArray(new Path[ignorePaths.size()]);
-		return excludeLibPaths;
-	}
-	
-	
-	void doValidate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		
-		String[] uris = helper.getURIs();
-		if (uris.length > 0) {
-			IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-			IFile currentFile = null;
-			
-			for (int i = 0; i < uris.length && !reporter.isCancelled(); i++) {
-				currentFile = wsRoot.getFile(new Path(uris[i]));
-				if (currentFile != null && currentFile.exists()) {
-					if (shouldValidate(currentFile) ) {
-						Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, "" + (i + 1) + "/" + uris.length + " - " + currentFile.getFullPath().toString().substring(1));
-						reporter.displaySubtask(this, message);
-						reporter.removeAllMessages(this, currentFile);
-						validateFile(currentFile, reporter);
-					}
-					if (JsBatchValidator.DEBUG) {
-						System.out.println("validating: [" + uris[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		} else {
-			// if uris[] length 0 -> validate() gets called for each project
-			if (helper instanceof IWorkbenchContext) {
-				IProject project = ((IWorkbenchContext) helper).getProject();
-				Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, NLS.bind(JsCoreMessages.JSPBatchValidator_0, project.getFullPath()));
-				reporter.displaySubtask(this, message);
-				JSPFileVisitor visitor = new JSPFileVisitor(reporter);
-				try {
-					// collect all jsp files for the project
-					project.accept(visitor, IResource.DEPTH_INFINITE);
-				} catch (CoreException e) {
-					if (JsBatchValidator.DEBUG) {
-						e.printStackTrace();
-					}
-				}
-				IFile[] files = visitor.getFiles();
-				for (int i = 0; i < files.length && !reporter.isCancelled(); i++) {
-					if (shouldValidate(files[i]) ) {
-						message = new LocalizedMessage(IMessage.LOW_SEVERITY, "" + (i + 1) + "/" + files.length + " - " + files[i].getFullPath().toString().substring(1));
-						reporter.displaySubtask(this, message);
-						validateFile(files[i], reporter);
-					}
-					if (JsBatchValidator.DEBUG) {
-						System.out.println("validating: [" + files[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-	}
-	
-//	/**
-//	 * Checks if file is a jsp fragment or not. If so, check if the fragment
-//	 * should be validated or not.
-//	 * 
-//	 * @param file
-//	 *            Assumes shouldValidate was already called on file so it should
-//	 *            not be null and does exist
-//	 * @return false if file is a fragment and it should not be validated, true
-//	 *         otherwise
-//	 */
-//	private boolean fragmentCheck(IFile file) {
-//		return isFragment(file);
-//	}
-	
-	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-		if (helper instanceof IWorkbenchContext) {
-			/*
-			 * Use a single build rule when running batch validation.
-			 */
-			return ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-		}
-		/*
-		 * For other kinds of validation, use no specific rule
-		 */
-		return null;
-	}
-	
-
-
-
-	
-	private void performValidation(IFile f, IReporter reporter, IStructuredModel model) {
-		if (!reporter.isCancelled()) {
-			fJSPJavaValidator.performValidation(f, reporter, model,true);
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-		
-	}
-	
-	private boolean shouldValidate(IFile file) {
-		//if(true) return true;
-		IResource resource = file;
-		IPath[] libPaths = getLibraryPaths(file);
-		IPath filePath = file.getFullPath().removeLastSegments(1);
-		for(int i = 0;i<libPaths.length;i++) {
-			if(libPaths[i].isPrefixOf(filePath)){
-				return false;
-			}
-		}
-		
-		do {
-			if (resource.isDerived() || resource.isTeamPrivateMember() || !resource.isAccessible() || resource.getName().charAt(0) == '.') {
-				return false;
-			}
-			resource = resource.getParent();
-		} while ((resource.getType() & IResource.PROJECT) == 0);
-		return true;
-	}
-	
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		doValidate(helper, reporter);
-	}
-	
-	/**
-	 * Validate one file. It's assumed that the file has JSP content type.
-	 * 
-	 * @param f
-	 * @param reporter
-	 */
-	void validateFile(IFile f, IReporter reporter) {
-		IStructuredModel model = null;
-		try {
-			// get JSP model on behalf of all JSP validators
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(f);
-			if(model==null) {
-				model = model = StructuredModelManager.getModelManager().getModelForRead(f);
-			}
-			if (!reporter.isCancelled() && model != null) {
-				reporter.removeAllMessages(this, f);
-				performValidation(f, reporter, model);
-			}
-		} catch (IOException e) {
-			Logger.logException(e);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-	}
-	
-	public IStatus validateInJob(final IValidationContext helper, final IReporter reporter) throws ValidationException {
-		Job currentJob = Platform.getJobManager().currentJob();
-		ISchedulingRule rule = null;
-		if (currentJob != null) {
-			rule = currentJob.getRule();
-		}
-		IWorkspaceRunnable validationRunnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				try {
-					doValidate(helper, reporter);
-				} catch (ValidationException e) {
-					throw new CoreException(new Status(IStatus.ERROR, JsBatchValidator.PLUGIN_ID_JSP_CORE, 0, JsBatchValidator.PLUGIN_ID_JSP_CORE, e));
-				}
-			}
-		};
-		try {
-			JavaCore.run(validationRunnable, rule, new NullProgressMonitor());
-		} catch (CoreException e) {
-			if (e.getCause() instanceof ValidationException) {
-				throw (ValidationException) e.getCause();
-			}
-			throw new ValidationException(new LocalizedMessage(IMessage.ERROR_AND_WARNING, e.getMessage()), e);
-		}
-		return Status.OK_STATUS;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
deleted file mode 100644
index d0ae9e5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.jsdt.web.core.internal.validation;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapterFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-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.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class JsValidator implements IValidator{
-	private static final boolean DEBUG = Boolean.valueOf(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspvalidator")).booleanValue(); //$NON-NLS-1$
-	private IValidator fMessageOriginator;
-	
-	private static String [] jsdtValidator = {"org.eclipse.wst.jsdt.web.core.internal.validation.JsBatchValidator"};
-
-	
-	protected class LocalizedMessage extends Message {
-		private String _message = null;
-		
-		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 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();
-		}
-		
-		public void setLocalizedMessage(String message) {
-			_message = message;
-		}
-	}
-	public JsValidator() {
-		this.fMessageOriginator = this;
-	}
-	
-	public JsValidator(IValidator validator) {
-		this.fMessageOriginator = validator;
-	}
-	
-	/**
-	 * Creates an IMessage from an IProblem
-	 * 
-	 * @param problem
-	 * @param f
-	 * @param translation
-	 * @param structuredDoc
-	 * @return message representation of the problem, or null if it could not
-	 *         create one
-	 */
-	private IMessage createMessageFromProblem(IProblem problem, IFile f, JsTranslation translation, IStructuredDocument structuredDoc) {
-		int sourceStart = problem.getSourceStart();
-		int sourceEnd = problem.getSourceEnd();
-		if (sourceStart == -1) {
-			return null;
-		}
-		// line number for marker starts @ 1
-		// line number from document starts @ 0
-		int lineNo = structuredDoc.getLineOfOffset(sourceStart) + 1;
-		int sev = problem.isError() ? IMessage.HIGH_SEVERITY : IMessage.NORMAL_SEVERITY;
-		IMessage m = new LocalizedMessage(sev, problem.getMessage(), f);
-		m.setLineNo(lineNo);
-		m.setOffset(sourceStart);
-		m.setLength(sourceEnd - sourceStart + 1);
-		return m;
-	}
-	
-	void performValidation(IFile f, IReporter reporter, IStructuredModel model, boolean inBatch) {
-		if (model instanceof IDOMModel) {
-			IDOMModel domModel = (IDOMModel) model;
-			setupAdapterFactory(domModel);
-			IDOMDocument xmlDoc = domModel.getDocument();
-			JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			//translationAdapter.resourceChanged();
-			JsTranslation translation = translationAdapter.getJSPTranslation(false);
-			if (!reporter.isCancelled()) {
-				translation.setProblemCollectingActive(true);
-				translation.reconcileCompilationUnit();
-				List problems = translation.getProblems();
-				// add new messages
-				if(!inBatch) reporter.removeAllMessages(this, f);
-				for (int i = 0; i < problems.size() && !reporter.isCancelled(); i++) {
-					IMessage m = createMessageFromProblem((IProblem) problems.get(i), f, translation, domModel.getStructuredDocument());
-					if (m != null) {
-						reporter.addMessage(fMessageOriginator, m);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * When loading model from a file, you need to explicitly add adapter
-	 * factory.
-	 * 
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-		if (sm.getFactoryRegistry().getFactoryFor(IJsTranslation.class) == null) {
-			JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
-			sm.getFactoryRegistry().addFactory(factory);
-		}
-	}
-	private boolean shouldValidate(IFile file) {
-		IResource resource = file;
-		do {
-			if (resource.isDerived() || resource.isTeamPrivateMember() || !resource.isAccessible() || resource.getName().charAt(0) == '.') {
-				return false;
-			}
-			resource = resource.getParent();
-		} while ((resource.getType() & IResource.PROJECT) == 0);
-		return true;
-	}
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		/* Added by BC ---- */
-		// if(true) return;
-		/* end Added by BC ---- */
-		
-		String[] uris = helper.getURIs();
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		if (uris.length > 0) {
-			IFile currentFile = null;
-			for (int i = 0; i < uris.length && !reporter.isCancelled(); i++) {
-				currentFile = wsRoot.getFile(new Path(uris[i]));
-				reporter.removeAllMessages(this, currentFile);
-				if (currentFile != null && currentFile.exists()) {
-					if (shouldValidate(currentFile) ){ //&& fragmentCheck(currentFile)) {
-						int percent = (i * 100) / uris.length + 1;
-						Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, percent + "% " + uris[i]);
-						reporter.displaySubtask(this, message);
-						validateFile(currentFile, reporter);
-					}
-					if (DEBUG) {
-						System.out.println("validating: [" + uris[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		} else {
-			// if uris[] length 0 -> validate() gets called for each project
-			if (helper instanceof IWorkbenchContext) {
-				IProject project = ((IWorkbenchContext) helper).getProject();
-				JSPFileVisitor visitor = new JSPFileVisitor(reporter);
-				try {
-					// collect all jsp files for the project
-					project.accept(visitor, IResource.DEPTH_INFINITE);
-				} catch (CoreException e) {
-					if (DEBUG) {
-						e.printStackTrace();
-					}
-				}
-				IFile[] files = visitor.getFiles();
-				for (int i = 0; i < files.length && !reporter.isCancelled(); i++) {
-					if (shouldValidate(files[i])) {
-						int percent = (i * 100) / files.length + 1;
-						Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, percent + "% " + files[i].getFullPath().toString());
-						reporter.displaySubtask(this, message);
-						validateFile(files[i], reporter);
-					}
-					if (DEBUG) {
-						System.out.println("validating: [" + files[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-	}
-
-	protected class JSPFileVisitor implements IResourceProxyVisitor {
-		private IContentType[] fContentTypes = null;
-		private List fFiles = new ArrayList();
-		private IReporter fReporter = null;
-		
-		public JSPFileVisitor(IReporter reporter) {
-			fReporter = reporter;
-		}
-		
-		public final IFile[] getFiles() {
-			return (IFile[]) fFiles.toArray(new IFile[fFiles.size()]);
-		}
-		
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			// check validation
-			if (fReporter.isCancelled()) {
-				return false;
-			}
-			if (proxy.getType() == IResource.FILE) {
-				if (Util.isJsType(proxy.getName())) {
-					IFile file = (IFile) proxy.requestResource();
-					if (file.exists()) {
-						if (DEBUG) {
-							System.out.println("(+) JSPValidator adding file: " + file.getName()); //$NON-NLS-1$
-						}
-						fFiles.add(file);
-						// don't search deeper for files
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-	}
-	public void cleanup(IReporter reporter) {
-		// nothing to do
-	}
-	/**
-	 * Validate one file. It's assumed that the file has JSP content type.
-	 * 
-	 * @param f
-	 * @param reporter
-	 */
-	
-	protected void validateFile(IFile f, IReporter reporter) {
-		if (JsValidator.DEBUG) {
-			Logger.log(Logger.INFO, getClass().getName() + " validating: " + f); //$NON-NLS-1$
-		}
-		IStructuredModel model = null;
-		try {
-			// get jsp model, get tranlsation
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(f);
-			if(model==null) {
-				model = StructuredModelManager.getModelManager().getModelForRead(f);
-			}
-			if (!reporter.isCancelled() && model != null) {
-				// get jsp model, get translation
-				if (model instanceof IDOMModel) {
-					//WorkbenchReporter.removeAllMessages(f.getProject(), jsdtValidator, f.toString());
-					//reporter.removeAllMessages(fMessageOriginator, f);
-					performValidation(f, reporter, model, false);
-				}
-			}
-		} catch (IOException e) {
-			Logger.logException(e);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
deleted file mode 100644
index a1ca656..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.validation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-
-/**
- * @author childsb
- *
- */
-public class Util {
-	
-	public static boolean isJsType(String fileName) {
-		boolean valid = false;
-		IContentType[] types =getJavascriptContentTypes();
-		int i = 0;
-		while (types!=null && i < types.length && !valid) {
-			valid = types[i]!=null && types[i].isAssociatedWith(fileName);
-			++i;
-		}
-		return valid;
-		
-	}
-	
-	public static IContentType[] getJavascriptContentTypes() {
-
-		String[] contentTypeIds = ContentTypeIdForEmbededJs.ContentTypeIds;
-		ArrayList fContentTypes = new ArrayList();
-		
-		
-		for(int i = 0;i<contentTypeIds.length;i++) {
-			IContentType ct =  Platform.getContentTypeManager().getContentType(contentTypeIds[i]);
-			if(ct!=null) fContentTypes.add(ct);
-		}
-		
-		return (IContentType[])fContentTypes.toArray(new IContentType[fContentTypes.size()]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java
deleted file mode 100644
index 92068a2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.text;
-
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-
-/**
- * This interface is not intended to be implemented. It defines the partition
- * types for JSP. Clients should reference the partition type Strings defined
- * here directly.
- * 
- * @since 1.1
- */
-public interface IJsPartitions {
-	String HtmlJsPartition = IHTMLPartitions.SCRIPT;
-	//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project
deleted file mode 100644
index f9e0796..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.support.jsp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
deleted file mode 100644
index 3853032..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JSDT support for JSP Plug-in
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.support.jsp;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.wst.jsdt.web.support.jsp.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.jsdt.web.ui,
- org.eclipse.jst.jsp.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.jface.text,
- org.eclipse.jface,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.html.core,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.css.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.jsdt.web.core
-Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties b/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml
deleted file mode 100644
index 8a748e0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.jsdt.web.support.jsp.JSDTStructuredTextViewerConfigurationJSP"
-			target="org.eclipse.jst.jsp.core.jspsource.source" />
-		
-		<!--
-		<contentOutlineConfiguration
-			class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration"
-			target="org.eclipse.jst.jsp.core.jspsource" />
-		-->
-		
-	</extension>
-	
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.jsdt.web.support.jsp.JSDTAdapterFactoryProviderForJSP">
-			<contentType id="org.eclipse.jst.jsp.core.jspsource" />
-		</adapterFactoryDescription>
-	</extension>
-	
-	
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.jsdt.web.core.internal.validation.JsValidator"
-			id="org.eclipse.wst.jsdt.web.support.jsp.jssourcevalidator">
-			<contentTypeIdentifier id="org.eclipse.jst.jsp.core.jspsource">
-				<partitionType id="org.eclipse.wst.html.SCRIPT"></partitionType>
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENT"></partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java b/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java
deleted file mode 100644
index 0eb9dc7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.jsdt.web.support.jsp;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.support.jsp";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTAdapterFactoryProviderForJSP.java b/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTAdapterFactoryProviderForJSP.java
deleted file mode 100644
index da995c1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTAdapterFactoryProviderForJSP.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.wst.jsdt.web.support.jsp;
-
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
-import org.eclipse.wst.jsdt.web.ui.internal.registry.AdapterFactoryProviderForJSDT;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-
-public class JSDTAdapterFactoryProviderForJSP extends
-		AdapterFactoryProviderForJSDT {
-
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		return (contentTypeDescription instanceof ModelHandlerForJSP);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java b/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java
deleted file mode 100644
index 900dae0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.eclipse.wst.jsdt.web.support.jsp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.IFormattingStrategy;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.information.IInformationProvider;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.internal.autoedit.StructuredAutoEditStrategyJSP;
-import org.eclipse.jst.jsp.ui.internal.format.FormattingStrategyJSPJava;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT;
-import org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT.externalTypeExtension;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-public class JSDTStructuredTextViewerConfigurationJSP extends StructuredTextViewerConfigurationJSP{
-
-	private String[] fConfiguredContentTypes;
-	
-	private StructuredTextViewerConfiguration fHTMLSourceViewerConfiguration;
-
-	private StructuredTextViewerConfiguration getHTMLSourceViewerConfiguration() {
-		if (fHTMLSourceViewerConfiguration == null) {
-			fHTMLSourceViewerConfiguration = new StructuredTextViewerConfigurationJSDT();
-		}
-		return fHTMLSourceViewerConfiguration;
-	}
-	
-	/*
-	 * From here down, had to copy code from the JSP because the class decided to make the two members above private
-	 */
-	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
-		IAutoEditStrategy[] strategies = null;
-
-		if (contentType == IHTMLPartitions.HTML_DEFAULT || contentType == IHTMLPartitions.HTML_DECLARATION) {
-			// html and jsp autoedit strategies
-			List allStrategies = new ArrayList(0);
-
-			// add the jsp autoedit strategy first then add all html's
-			allStrategies.add(new StructuredAutoEditStrategyJSP());
-
-			IAutoEditStrategy[] htmlStrategies = getHTMLSourceViewerConfiguration().getAutoEditStrategies(sourceViewer, contentType);
-			for (int i = 0; i < htmlStrategies.length; i++) {
-				allStrategies.add(htmlStrategies[i]);
-			}
-
-			strategies = (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[allStrategies.size()]);
-		}
-		else {
-			strategies = super.getAutoEditStrategies(sourceViewer, contentType);
-		}
-
-		return strategies;
-	}
-	
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		if (fConfiguredContentTypes == null) {
-			/*
-			 * A little bit of cheating because assuming html's configured
-			 * content types will add default, unknown, and all xml configured
-			 * content types
-			 */
-			String[] htmlTypes = getHTMLSourceViewerConfiguration().getConfiguredContentTypes(sourceViewer);
-			String[] jspTypes = StructuredTextPartitionerForJSP.getConfiguredContentTypes();
-			fConfiguredContentTypes = new String[htmlTypes.length + jspTypes.length];
-
-			int index = 0;
-			System.arraycopy(htmlTypes, 0, fConfiguredContentTypes, index, htmlTypes.length);
-			System.arraycopy(jspTypes, 0, fConfiguredContentTypes, index += htmlTypes.length, jspTypes.length);
-		}
-
-		return fConfiguredContentTypes;
-	}
-	
-	protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
-		IContentAssistProcessor[] processors = null;
-
-		if (partitionType == IHTMLPartitions.SCRIPT) {
-			// HTML JavaScript
-			IContentAssistant htmlContentAssistant = getHTMLSourceViewerConfiguration().getContentAssistant(sourceViewer);
-			IContentAssistProcessor processor = htmlContentAssistant.getContentAssistProcessor(IHTMLPartitions.SCRIPT);
-			processors = new IContentAssistProcessor[]{processor};
-		}
-		else if (partitionType == ICSSPartitions.STYLE) {
-			// HTML CSS
-			IContentAssistant htmlContentAssistant = getHTMLSourceViewerConfiguration().getContentAssistant(sourceViewer);
-			IContentAssistProcessor processor = htmlContentAssistant.getContentAssistProcessor(ICSSPartitions.STYLE);
-			processors = new IContentAssistProcessor[]{processor};
-		}
-		else{
-			processors = super.getContentAssistProcessors(sourceViewer, partitionType);
-		}
-
-		return processors;
-	}
-	
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		final IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		/*
-		 * Check for any externally supported auto edit strategies from EP.
-		 * [Bradley Childs - childsb@us.ibm.com]
-		 */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			IFormattingStrategy cf = (IFormattingStrategy) ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.CONTENT_FORMATER, contentTypes[i]);
-			if (cf != null && formatter instanceof MultiPassContentFormatter) {
-				((MultiPassContentFormatter) formatter).setSlaveStrategy(cf, contentTypes[i]);
-			}
-		}
-		return formatter;
-	}
-	
-	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
-		ITextDoubleClickStrategy strategy = null;
-
-		// html or javascript
-		if (contentType == IHTMLPartitions.HTML_DEFAULT || contentType == IHTMLPartitions.SCRIPT)
-			strategy = getHTMLSourceViewerConfiguration().getDoubleClickStrategy(sourceViewer, contentType);
-		else if (contentType == IJSPPartitions.JSP_DEFAULT)
-			// JSP (just treat like html)
-			strategy = getHTMLSourceViewerConfiguration().getDoubleClickStrategy(sourceViewer, IHTMLPartitions.HTML_DEFAULT);
-		else
-			strategy = super.getDoubleClickStrategy(sourceViewer, contentType);
-
-		return strategy;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)) {
-			return null;
-		}
-		List allDetectors = new ArrayList(0);
-		IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
-		for (int m = 0; m < superDetectors.length; m++) {
-			IHyperlinkDetector detector = superDetectors[m];
-			if (!allDetectors.contains(detector)) {
-				allDetectors.add(detector);
-			}
-		}
-		/* Check for external HyperLink Detectors */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			IHyperlinkDetector hl = (IHyperlinkDetector) ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.HYPERLINK_DETECTOR, contentTypes[i]);
-			if (hl != null) {
-				allDetectors.add(hl);
-			}
-		}
-		return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
-	}
-	
-	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-		String[] indentations = null;
-
-		if (contentType == IXMLPartitions.XML_DEFAULT)
-			indentations = super.getIndentPrefixes(sourceViewer, contentType);
-		else
-			indentations = getHTMLSourceViewerConfiguration().getIndentPrefixes(sourceViewer, contentType);
-
-		return indentations;
-	}
-	
-	protected IInformationProvider getInformationProvider(ISourceViewer sourceViewer, String partitionType) {
-		IInformationProvider provider = null;
-		if (partitionType == IHTMLPartitions.HTML_DEFAULT) {
-			// HTML
-			IInformationPresenter htmlPresenter = getHTMLSourceViewerConfiguration().getInformationPresenter(sourceViewer);
-			provider = htmlPresenter.getInformationProvider(IHTMLPartitions.HTML_DEFAULT);
-		}
-		else if (partitionType == IHTMLPartitions.SCRIPT) {
-			// HTML JavaScript
-			IInformationPresenter htmlPresenter = getHTMLSourceViewerConfiguration().getInformationPresenter(sourceViewer);
-			provider = htmlPresenter.getInformationProvider(IHTMLPartitions.SCRIPT);
-		}
-		else{
-			provider = super.getInformationProvider(sourceViewer, partitionType);
-		}
-		return provider;
-	}
-	
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = null;
-
-		if (partitionType == IHTMLPartitions.HTML_DEFAULT || partitionType == IHTMLPartitions.HTML_COMMENT || partitionType == IHTMLPartitions.HTML_DECLARATION) {
-			providers = getHTMLSourceViewerConfiguration().getLineStyleProviders(sourceViewer, IHTMLPartitions.HTML_DEFAULT);
-		}
-		else if (partitionType == IHTMLPartitions.SCRIPT || partitionType == IJSPPartitions.JSP_CONTENT_JAVASCRIPT) {
-			providers = getHTMLSourceViewerConfiguration().getLineStyleProviders(sourceViewer, IHTMLPartitions.SCRIPT);
-		}
-		else if (partitionType == ICSSPartitions.STYLE) {
-			providers = getHTMLSourceViewerConfiguration().getLineStyleProviders(sourceViewer, ICSSPartitions.STYLE);
-		}
-		else{
-			providers = super.getLineStyleProviders(sourceViewer, partitionType);
-		}
-
-		return providers;
-	}
-	
-	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) {
-		ITextHover hover = null;
-
-		if (contentType == IHTMLPartitions.HTML_DEFAULT || contentType == IHTMLPartitions.SCRIPT) {
-			// html and javascript regions
-			hover = getHTMLSourceViewerConfiguration().getTextHover(sourceViewer, contentType, stateMask);
-		}
-		else {
-			hover = super.getTextHover(sourceViewer, contentType);
-		}
-	
-		return hover;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.classpath b/bundles/org.eclipse.wst.jsdt.web.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.project b/bundles/org.eclipse.wst.jsdt.web.ui/.project
deleted file mode 100644
index 4917858..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a3d37b6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JSDT Web Support UI (Incubation)
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.ui; singleton:=true
-Bundle-Version: 0.0.1.qualifier
-Bundle-Activator: org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.jsdt.web.ui,
- org.eclipse.wst.jsdt.web.ui.internal;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.autoedit;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.contentassist;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.derived;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.format;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.hyperlink;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.search;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.search.ui;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.registry;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.style;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.style.java;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.taginfo;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.text;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.views.contentoutline
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.jsdt.web.core,
- org.eclipse.wst.css.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.jsdt.core,
- org.eclipse.wst.jsdt.ui,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.html.core
-Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/eclipse.inf b/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Processed using Jarprocessor
-pack200.conditioned = true
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/build.properties b/bundles/org.eclipse.wst.jsdt.web.ui/build.properties
deleted file mode 100644
index d6eb746..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml
-src.includes = build.properties
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
deleted file mode 100644
index 4979c55..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
+++ /dev/null
@@ -1,678 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- 	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
- 	
- 		<sourceViewerConfiguration
-			class="org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT"
-			target="org.eclipse.wst.html.core.htmlsource.source" />
-			
-		
- 		<contentOutlineConfiguration
-			class="org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JsContentOutlineConfig"
-			target="org.eclipse.wst.html.core.htmlsource.source" />		
-		
-		<!--
-		<provisionalConfiguration
-			type="contentassistprocessor"
-			class="org.eclipse.wst.jsdt.web.ui.internal.contentassist.JSDTContentAssistant"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		-->
-		
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.jsdt.web.ui.internal.style.java.LineStyleProviderForJSDT"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		<provisionalConfiguration
-			type="texthover"
-			class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTHoverProcessor"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		<provisionalConfiguration
-			type="informationpresenter"
-			class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTInformationProvider"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		<provisionalConfiguration
-			type="characterpairmatcher"
-			class="org.eclipse.wst.jsdt.web.ui.internal.text.JsDocumentRegionEdgeMatcher"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		<provisionalConfiguration
-			type="autoeditstrategy"
-			class="org.eclipse.wst.jsdt.web.ui.internal.autoedit.AutoEditStrategyForJs"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENT" />
-		<provisionalConfiguration
-			type="contentformater"
-			class="org.eclipse.wst.jsdt.web.ui.internal.format.FormattingStrategyJSDT"
-			target="org.eclipse.wst.html.SCRIPT" />
-		<provisionalConfiguration
-			type="hyperlinkdetector"
-			class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-			target="org.eclipse.wst.html.SCRIPT" />
-	</extension>
-	<extension point = "org.eclipse.wst.sse.ui.extendedEditorActions">
-		<editorContribution 
-            targetID="com.ibm.sse.editor.StructuredTextEditor" 
-            id="com.ibm.sse.editor.extendedActions2"> 
-         <action 
-               popupmenuPath="group.add" 
-               label="Preferences2" 
-               class="com.ibm.sse.editor.preferences.ui.EditStructuredTextEditorPreferencesAction" 
-               id="com.ibm.sse.editor.preferences.ui.EditStructuredTextEditorPreferencesAction2"> 
-         </action> 
-      </editorContribution> 
-		
-	
-	</extension>
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
-		<target
-			id="org.eclipse.wst.html.SCRIPT"
-			name="JavaScirpt Source">
-		</target>
-	</extension>
-	
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
-		<target
-			id="org.eclipse.wst.html.SCRIPT.EVENT"
-			name="JavaScirpt Event Source">
-		</target>
-	</extension>
-	
-	 <extension
-         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-      <hyperlinkDetector
-            class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.script.JSPJavaHyperlinkDetector"
-            name="Java Element HyperLink Detector"
-            targetId="org.eclipse.wst.html.SCRIPT">
-      </hyperlinkDetector>
-      <hyperlinkDetector
-            class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.script.event.JSPJavaHyperlinkDetector"
-            name="Java Element HyperLink Detector"
-            targetId="org.eclipse.wst.html.SCRIPT.EVENT">
-      </hyperlinkDetector>  
-   </extension>
-  
-  
-    <extension
-         point="org.eclipse.ui.popupMenus">
-	<!-- content outline contributions for Open Type and Open Hierarchy menu.  Menus show up in reverse order of decliration (google it). -->
-      <objectContribution
-            objectClass="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode"
-            id="org.eclipse.wst.jsdt.web.ui.JavaActions">
-            <!-- Declerations Search Menu -->
-            <menu
-                id="org.eclipse.wst.jsdt.web.declerations"
-         		label="Declerations"
-         		path="group.search">
-     		 	<separator name="declerations"/>
-         </menu>
-         <action
-               label="Working Set"          
-               tooltip="Working Set"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesInWorkingSetAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInWorkingSetAction">
-         </action>  
-         <action
-               label="Hierarchy"          
-               tooltip="Hierarchy"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInHierarchyAction">
-         </action> 
-          <action
-               label="Project"          
-               tooltip="Project"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInProjectAction">
-         </action>
-         
-         <action
-               label="Workspace"
-               tooltip=""
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsAction">
-         </action>   
-            
-            <!-- Refrences Search menu -->
-          <menu
-                id="org.eclipse.wst.jsdt.web.references"
-         		label="References"
-         		path="group.search">
-     		 	<separator name="references"/>
-         </menu>
-         <action
-               label="Working Set"          
-               tooltip="Working Set"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesInWorkingSetAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInWorkingSetAction">
-         </action>  
-         <action
-               label="Hierarchy"          
-               tooltip="Hierarchy"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInHierarchyAction">
-         </action> 
-          <action
-               label="Project"          
-               tooltip="Project"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInProjectAction">
-         </action>
-         
-         <action
-               label="Workspace"
-               tooltip=""
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesAction">
-         </action>   
-         <!-- Source and Refactoring Menu's -->
-          <menu
-                id="org.eclipse.wst.jsdt.web.refactor"
-         		label="Refactor"
-         		path="group.generate">
-     		 	<separator name="refactor"/>
-         </menu>
-
-         <menu
-                id="org.eclipse.wst.jsdt.web.source"
-         		label="Source"
-         		path="group.generate">
-     		 	<separator name="source"/>
-         </menu>
-         <!-- Source Actions -->
-		 <action
-               label="Generate Element Comment"          
-               tooltip="Generate Element Comment"
-               menubarPath="org.eclipse.wst.jsdt.web.source/source"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.AddJavaDocStubAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.generate.element.comment">
-         </action>
-         <!-- Refactor Actions -->
-         <action
-               label="Change Function Signature"          
-               tooltip="Change Function Signature"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.change.function.signature">
-         </action>
-         <action
-               label="Move"          
-               tooltip="Move"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.Move">
-         </action>
-         <action
-               label="Rename"          
-               tooltip="Rename"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.rename">
-         </action>
-         
-         
-         <!-- Edit  (cut copy paste etc.. -->
-          <action
-               label="Delete"          
-               tooltip="Delete"
-               menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.delete">
-         </action>
-        
-         <action
-               label="Paste After"          
-               tooltip="Paste"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.web.ui.paste.after">
-         </action>
-          <action
-               label="Paste Before"          
-               tooltip="Paste"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.web.ui.paste.before">
-         </action>
-         <action
-               label="Copy"          
-               tooltip="Copy"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.copy">
-         </action>
-
-         <action
-               label="Cut"          
-               tooltip="Cut"
-               menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.cut">
-         </action>         
-         
-         <!-- Show in Script Explorer, History and Navigator -->       
-         <menu
-                id="org.eclipse.wst.jsdt.web.showin"
-         		label="Show In"
-         		path="group.show">
-     		 	<separator name="showin"/>
-         </menu>  
-         <action
-               label="Navigator"          
-               tooltip="Show In Navigator"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowInNavigatorAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.ShowInNavigatorViewAction">
-         </action>
-         <!-- History not working well -->
-         <!--
-         <action
-               label="History"          
-               tooltip="Show In History"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowHistoryAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.internal.ui.callhierarchy.OpenCallHierarchyAction">
-         </action> 
-         -->
-          <action
-               label="Script Explorer"          
-               tooltip="Show In Script Explorer"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowInScriptExplorerAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.ShowInScriptExplorer">
-         </action>
-         
-         <!-- Open Call and Type Hierarchies -->
-          <action
-               label="Open Call Hierarchy"          
-               tooltip="Open Call Hierarchy"
-             menubarPath="group.show"
-             style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.OpenCallHierarchyAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.internal.ui.callhierarchy.OpenCallHierarchyAction">
-         </action>
-         <action
-               label="Open Type Hierarchy"
-               tooltip="Open Type Hierarchy"
-   			menubarPath="group.show"
-   			style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.OpenTypeHierarchy"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenTypeHierarchyAction">
-         </action>
-       </objectContribution> 
-		
-	</extension>
-	
-  
-	<!-- ====================================================================================== -->
-	<!-- source validation for JSP															  -->
-	<!--======================================================================================-->
-	
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.jsdt.web.core.internal.validation.JsValidator"
-			id="org.eclipse.wst.jsdt.web.jspsourcevalidator">
-			<contentTypeIdentifier id="org.eclipse.wst.html.core.htmlsource">
-				<partitionType id="org.eclipse.wst.html.SCRIPT"></partitionType>
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENT"></partitionType>
-			</contentTypeIdentifier>
-		</validator>
-
-		
-	</extension>
-	
-	<!--======================================================================================-->
-	<!-- JSP UI Adapter factories					   						  				  -->
-	<!--======================================================================================-->
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.jsdt.web.ui.internal.registry.AdapterFactoryProviderForJSDT">
-			<contentType id="org.eclipse.wst.html.core.htmlsource" />
-		</adapterFactoryDescription>
-	</extension>
-
-	
-
-
-	<!--======================================================================================-->
-	<!-- for breakpoint                                                                       -->
-	<!--======================================================================================-->
-	<!-- removed for now -->
-	<!--
-	<extension point="org.eclipse.wst.sse.ui.breakpoint">
-		<breakpointContribution id="org.eclipse.wst.jsdt.web.ui.providers">
-			<provider
-				contentTypes="org.eclipse.wst.html.core.htmlsource"
-				class="org.eclipse.wst.jsdt.web.ui.internal.breakpointproviders.JavaStratumBreakpointProvider:*html,js,htm*"
-				id="org.eclipse.wst.jsdt.web.ui.internal.breakpointproviders.JavaStratumBreakpointProvider" />
-		</breakpointContribution>
-	</extension>
-	-->
-	
-	
-	<!-- Editor actionsets -->
-	<!--
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.wst.jsdt.web.core.jspsource.source" />
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.wst.jsdt.web.core.jspsource.source" />
-		</actionSetPartAssociation>
-	</extension>
-	-->
-
-	
-	
-	
-	<!-- Keybindings for jsp source editor -->
-	<!--
-	<extension point="org.eclipse.ui.bindings"> -->
-	    <!--  win32:  M1=CTRL, M2=SHIFT, M3=ALT -->
-		<!-- rename refactor -->
-		<!--
-		<key
-			sequence="M2+M3+R"
-			contextId="org.eclipse.wst.jsdt.web.ui.structured.text.editor.jsp.scope"
-			commandId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		</key>
-		-->
-		<!-- move refactor -->
-		<!--
-		<key
-			sequence="M2+M3+V"
-			contextId="org.eclipse.wst.jsdt.web.ui.structured.text.editor.jsp.scope"
-			commandId="org.eclipse.wst.jsdt.web.ui.refactor.move"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		</key>
-	</extension>
-	-->
-	
-	
-	<!--======================================================================================-->
-	<!-- queryParticipant to participate in java seraches                                     -->
-	<!--======================================================================================-->
-	<extension point="org.eclipse.wst.jsdt.ui.queryParticipants">
-		<queryParticipant
-			name="JavaScript Query Participant"
-			nature="org.eclipse.wst.jsdt.core.jsNature"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.search.ui.JsQueryParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.java.search.ui.JsQueryParticipant" />
-
-	</extension>
-	
-	
-	<!--======================================================================================-->
-	<!-- Document provider for ExternalFileEditorInput                                        -->
-	<!--======================================================================================-->
-	<!--
-	<extension point="org.eclipse.ui.editors.documentProviders">
-		<provider
-			inputTypes="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.ExternalFileEditorInput"
-			class="org.eclipse.ui.editors.text.TextFileDocumentProvider"
-			id="org.eclipse.wst.jsdt.web.ui.internal.ExternalFileDocumentProvider" />
-
-	</extension>
-	-->
-	
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.wst.jsdt.web.core.jspsource.source.RulerContext"
-			id="org.eclipse.ui.texteditor.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction" />
-
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction" />
-
-		</viewerContribution>
-	</extension>
-
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.wst.jsdt.web.core.jspsource.source.editorActions"
-			contributorClass="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor"
-			targetID="org.eclipse.wst.html.core.htmlsource">
-			<action
-				id="CleanupDocument"
-				label="%CleanupDocument_label"
-				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
-				tooltip="%CleanupDocument_tooltip"
-				class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupActionHTMLDelegate"
-				actionID="CleanupDocument">
-			</action>
-			<action
-				id="ToggleComment"
-				label="%ToggleComment_label"
-				definitionId="org.eclipse.wst.sse.ui.toggle.comment"
-				tooltip="%ToggleComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
-				actionID="ToggleComment">
-			</action>
-			<action
-				id="AddBlockComment"
-				label="%AddBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.add.block.comment"
-				tooltip="%AddBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
-				actionID="AddBlockComment">
-			</action>
-			<action
-				id="RemoveBlockComment"
-				label="%RemoveBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
-				tooltip="%RemoveBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
-				actionID="RemoveBlockComment">
-			</action>
-			<action
-				id="RenameElement"
-				label="%RenameElement_label"
-				definitionId="org.eclipse.wst.jsdt.web.ui.refactor.rename"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
-				actionID="RenameElement">
-			</action>
-			<action
-				id="MoveElement"
-				label="%MoveElement_label"
-				definitionId="org.eclipse.wst.jsdt.web.ui.refactor.move"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
-				actionID="MoveElement">
-			</action>
-			<action
-				id="FindOccurrences"
-				label="%FindOccurrences_label"
-				definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.search.JsFindOccurrencesActionDelegate"
-				actionID="FindOccurrences">
-			</action>
-			<action
-				id="StructureSelectEnclosing"
-				label="%StructureSelectEnclosing_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-				tooltip="%StructureSelectEnclosing_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
-				actionID="StructureSelectEnclosing">
-			</action>
-			<action
-				id="StructureSelectNext"
-				label="%StructureSelectNext_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
-				tooltip="%StructureSelectNext_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
-				actionID="StructureSelectNext">
-			</action>
-			<action
-				id="StructureSelectPrevious"
-				label="%StructureSelectPrevious_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
-				tooltip="%StructureSelectPrevious_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
-				actionID="StructureSelectPrevious">
-			</action>
-			<action
-				id="StructureSelectHistory"
-				label="%StructureSelectHistory_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
-				tooltip="%StructureSelectHistory_tooltip"
-				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
-				actionID="StructureSelectHistory">
-			</action>
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.wst.html.core.htmlsource"
-            id="org.eclipse.wst.jsdt.web.core.jspsource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-		<!--======================================================================================-->
-	<!-- FOR JSP/JAVA RENAME PARTICIPATION                                                    -->
-	<!--======================================================================================-->
-	<extension
-		point="org.eclipse.ltk.core.refactoring.renameParticipants">
-		<renameParticipant
-			name="JSDT Web Rename Participant"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.core.IType" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="JSDT Web Rename Participant"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="JSDT Web Rename Participant"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.core.IMethod" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="JSDT Web Rename Participant"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-
-	   
-	</extension>
-			  <extension  point="org.eclipse.wst.jsdt.core.classpathContainerInitializer">
-	      <classpathContainerInitializer
-	            class="org.eclipse.wst.jsdt.web.ui.WebProjectClassPathContainerInitializer"
-	            id="org.eclipse.wst.jsdt.launching.WebProject">
-	      </classpathContainerInitializer>
-  	 </extension>
-  	 
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java
deleted file mode 100644
index 7b0288d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.jsdt.web.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.IFormattingStrategy;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationProvider;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.jsdt.web.ui.internal.autoedit.AutoEditStrategyForTabs;
-import org.eclipse.wst.jsdt.web.ui.internal.contentassist.JSDTContentAssistant;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-
-/**
- * Configuration for a source viewer which shows Html and supports JSDT.
- * <p>
- * Clients can subclass and override just those methods which must be specific
- * to their needs.
- * </p>
- * 
- * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration
- * @since 1.0
- */
-public class StructuredTextViewerConfigurationJSDT extends StructuredTextViewerConfigurationHTML {
-	/*
-	 * Extension point identifications for externalalized content providers
-	 * [Bradley Childs - childsb@us.ibm.com]
-	 */
-	public static final class externalTypeExtension {
-		public static final String AUTOEDIT_ID = "autoeditstrategy";
-		public static final String CONTENT_ASSIST = "contentassistprocessor";
-		public static final String CONTENT_FORMATER = "contentformater";
-		public static final String HOVER_ID = "texthover";
-		public static final String HYPERLINK_DETECTOR = "hyperlinkdetector";
-		public static final String HYPERLINK_DETECTOR_TARGETS = "hyperlinkdetector";
-		public static final String INFORMATIONPROVIDER_ID = "informationpresenter";
-	}
-	/*
-	 * One instance per configuration because not sourceviewer-specific and it's
-	 * a String array
-	 */
-	private String[] fConfiguredContentTypes;
-	private ILabelProvider fStatusLineLabelProvider;
-	
-	/**
-	 * Create new instance of StructuredTextViewerConfigurationHTML
-	 */
-	public StructuredTextViewerConfigurationJSDT() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-	
-	
-	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
-		List allStrategies = new ArrayList(0);
-		Object externalAutoEditProvider = ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.AUTOEDIT_ID, contentType);
-		if (externalAutoEditProvider != null) {
-			allStrategies.add(externalAutoEditProvider);
-		} else {
-			IAutoEditStrategy[] superStrategies = super.getAutoEditStrategies(sourceViewer, contentType);
-			for (int i = 0; i < superStrategies.length; i++) {
-				allStrategies.add(superStrategies[i]);
-			}
-		}
-		// be sure this is added last in list, so it has a change to modify
-		// previous results.
-		// add auto edit strategy that handles when tab key is pressed
-		allStrategies.add(new AutoEditStrategyForTabs());
-		return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[allStrategies.size()]);
-	}
-	
-	
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		if (fConfiguredContentTypes == null) {
-			fConfiguredContentTypes = super.getConfiguredContentTypes(sourceViewer);
-		}
-		return fConfiguredContentTypes;
-	}
-	
-	/* Content assist procesors are contributed by extension for SSE now */
-	
-	protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
-		
-		IContentAssistProcessor[] processors = null;
-
-		if (partitionType == IHTMLPartitions.SCRIPT) {
-			processors = new IContentAssistProcessor[]{new JSDTContentAssistant()};
-		}
-		else{
-			processors = super.getContentAssistProcessors(sourceViewer, partitionType);
-		}
-		
-		return processors;
-	}
-	
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		final IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		/*
-		 * Check for any externally supported auto edit strategies from EP.
-		 * [Bradley Childs - childsb@us.ibm.com]
-		 */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			IFormattingStrategy cf = (IFormattingStrategy) ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.CONTENT_FORMATER, contentTypes[i]);
-			if (cf != null && formatter instanceof MultiPassContentFormatter) {
-				((MultiPassContentFormatter) formatter).setSlaveStrategy(cf, contentTypes[i]);
-			}
-		}
-		return formatter;
-	}
-	
-	
-	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
-		return super.getDoubleClickStrategy(sourceViewer, contentType);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED)) {
-			return null;
-		}
-		List allDetectors = new ArrayList(0);
-		IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
-		for (int m = 0; m < superDetectors.length; m++) {
-			IHyperlinkDetector detector = superDetectors[m];
-			if (!allDetectors.contains(detector)) {
-				allDetectors.add(detector);
-			}
-		}
-		/* Check for external HyperLink Detectors */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			IHyperlinkDetector hl = (IHyperlinkDetector) ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.HYPERLINK_DETECTOR, contentTypes[i]);
-			if (hl != null) {
-				allDetectors.add(hl);
-			}
-		}
-		return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
-	}
-	
-	
-	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-		return super.getIndentPrefixes(sourceViewer, contentType);
-	}
-	
-	
-	protected IInformationProvider getInformationProvider(ISourceViewer sourceViewer, String partitionType) {
-		IInformationProvider provider = null;
-		/*
-		 * IInformationProvider now provided by extension point [Bradley Childs -
-		 * childsb@us.ibm.com]
-		 */
-		Object externalInfoProvider = ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.INFORMATIONPROVIDER_ID, partitionType);
-		if (externalInfoProvider != null) {
-			provider = (IInformationProvider) externalInfoProvider;
-		} else {
-			provider = super.getInformationProvider(sourceViewer, partitionType);
-		}
-		return provider;
-	}
-	
-	
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = super.getLineStyleProviders(sourceViewer, partitionType);
-		return providers;
-	}
-	
-	
-	public ILabelProvider getStatusLineLabelProvider(ISourceViewer sourceViewer) {
-		if (fStatusLineLabelProvider == null) {
-			fStatusLineLabelProvider = super.getStatusLineLabelProvider(sourceViewer);
-		}
-		return fStatusLineLabelProvider;
-	}
-	
-	
-	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) {
-		ITextHover textHover = null;
-		// look for appropriate text hover processor to return based on
-		// content type and state mask
-		TextHoverManager manager = SSEUIPlugin.getDefault().getTextHoverManager();
-		TextHoverManager.TextHoverDescriptor[] hoverDescs = manager.getTextHovers();
-		int i = 0;
-		while (i < hoverDescs.length && textHover == null) {
-			if (hoverDescs[i].isEnabled() && EditorUtility.computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {
-				String hoverType = hoverDescs[i].getId();
-				if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)) {
-					/*
-					 * Check extension for TextHover providers [Bradley Childs -
-					 * childsb@us.ibm.com]
-					 */
-					Object externalHover = ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.HOVER_ID, contentType);
-					if (externalHover != null) {
-						textHover = manager.createBestMatchHover((ITextHover) externalHover);
-					} else {
-						textHover = super.getTextHover(sourceViewer, contentType, stateMask);
-					}
-				} else if (TextHoverManager.DOCUMENTATION_HOVER.equalsIgnoreCase(hoverType)) {
-					/*
-					 * Check extension for TextHover providers [Bradley Childs -
-					 * childsb@us.ibm.com]
-					 */
-					Object externalHover = ExtendedConfigurationBuilder.getInstance().getConfiguration(externalTypeExtension.HOVER_ID, contentType);
-					if (externalHover != null) {
-						textHover = manager.createBestMatchHover((ITextHover) externalHover);
-					} else {
-						textHover = super.getTextHover(sourceViewer, contentType, stateMask);
-					}
-				}
-			}
-			i++;
-		}
-		// no appropriate text hovers found, try super
-		if (textHover == null) {
-			textHover = super.getTextHover(sourceViewer, contentType, stateMask);
-		}
-		return textHover;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java
deleted file mode 100644
index 83d28fc..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectClassPathContainerInitializer.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.jsdt.core.ClasspathContainerInitializer;
-import org.eclipse.wst.jsdt.core.IAccessRule;
-import org.eclipse.wst.jsdt.core.IClasspathAttribute;
-import org.eclipse.wst.jsdt.core.IClasspathContainer;
-import org.eclipse.wst.jsdt.core.IClasspathEntry;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation;
-import org.eclipse.wst.jsdt.core.compiler.libraries.SystemLibraryLocation;
-import org.eclipse.wst.jsdt.internal.core.ClasspathAttribute;
-import org.eclipse.wst.jsdt.internal.core.ClasspathEntry;
-import org.eclipse.wst.jsdt.internal.ui.IClasspathContainerInitialzerExtension;
-
-
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsNameManglerUtil;
-import org.eclipse.wst.jsdt.web.core.internal.java.WebRootFinder;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-
-/**
- * @author childsb
- * 
- */
-public class WebProjectClassPathContainerInitializer extends ClasspathContainerInitializer implements IClasspathContainerInitialzerExtension {
-	private static final String CONTAINER_DESCRIPTION = "Web Project support for JSDT";
-	
-	public static final char[] LIB_NAME = {'b','r','o','w','s','e','r','W','i','n','d','o','w','.','j','s'};
-	/* Some tokens for us to identify mangled paths */
-	private static final String MANGLED_BUTT1 = "htm";
-	private static final String MANGLED_BUTT2 = ".js";
-	
-	//private IJavaProject javaProject;
-	
-	
-	private static String getUnmangedHtmlPath(String containerPathString) {
-		if (containerPathString == null) {
-			return null;
-		}
-		if (containerPathString.toLowerCase().indexOf(WebProjectClassPathContainerInitializer.MANGLED_BUTT1) != -1 && containerPathString.toLowerCase().indexOf(WebProjectClassPathContainerInitializer.MANGLED_BUTT2) != -1) {
-			return JsNameManglerUtil.unmangle(containerPathString);
-		}
-		return null;
-	}
-	public LibraryLocation getLibraryLocation() {
-		return null;
-	}
-	
-	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.ClasspathContainerInitializer#canUpdateClasspathContainer(org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.wst.jsdt.core.IJavaProject)
-	 */
-	
-	public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-		/* dont remove from this project */
-		return false;
-	}
-	
-	
-	protected IClasspathContainer getContainer(IPath containerPath, IJavaProject project) {
-		return this;
-	}
-	
-	
-	public String getDescription() {
-		return WebProjectClassPathContainerInitializer.CONTAINER_DESCRIPTION;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.ClasspathContainerInitializer#getDescription(org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.wst.jsdt.core.IJavaProject)
-	 */
-	
-	public String getDescription(IPath containerPath, IJavaProject javaProject) {
-		if (containerPath.equals(new Path(JsWebNature.VIRTUAL_CONTAINER))) {
-			return WebProjectClassPathContainerInitializer.CONTAINER_DESCRIPTION;
-		}
-		
-		String containerPathString = containerPath.toString();
-		IPath webContext = getWebContextRoot(javaProject);
-		String fileExtension = containerPath.getFileExtension();
-		if(containerPath.equals(getWebContextRoot(javaProject)) || (fileExtension!=null && fileExtension.equals("js"))) {
-			return webContext.toString();
-		}
-		String unmangled = WebProjectClassPathContainerInitializer.getUnmangedHtmlPath(containerPathString);
-		if (unmangled != null) {
-			IPath projectPath = javaProject.getPath();
-			/* Replace the project path with the project name */
-			if (unmangled.indexOf(projectPath.toString()) >= 0) {
-				unmangled = javaProject.getDisplayName() + ":" + unmangled.substring(projectPath.toString().length());
-			}
-			return unmangled;
-		}
-		return containerPathString;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.ClasspathContainerInitializer#getHostPath(org.eclipse.core.runtime.IPath)
-	 */
-	
-	public URI getHostPath(IPath path, IJavaProject project) {
-		// TODO Auto-generated method stub
-		String htmlPath = WebProjectClassPathContainerInitializer.getUnmangedHtmlPath(path.toString());
-		if (htmlPath != null) {
-			URI fileUri =  new Path(htmlPath).toFile().toURI();
-			return fileUri;
-			//			try {
-//				return new URI(htmlPath);
-//			} catch (URISyntaxException ex) {
-//				ex.printStackTrace();
-//			}
-		}
-//		else {
-//			try {
-//				return new URI(path.toString());
-//			} catch (URISyntaxException ex) {
-//				// TODO Auto-generated catch block
-//				ex.printStackTrace();
-//			}
-//		}
-		return null;
-	}
-	
-	
-	public int getKind() {
-		return IClasspathContainer.K_SYSTEM;
-	}
-	
-	
-	public IPath getPath() {
-		return new Path(JsWebNature.VIRTUAL_CONTAINER);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.internal.ui.IClasspathContainerInitialzerExtension#getImage(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.wst.jsdt.core.IJavaProject)
-	 */
-	public ImageDescriptor getImage(IPath containerPath, String element, IJavaProject project) {
-		return ImageDescriptor.createFromFile(this.getClass(),"web1.JPG");
-	}
-	public IClasspathEntry[] getClasspathEntries() {
-		
-		//IClasspathEntry entry=null;
-		
-	return new IClasspathEntry[0];
-//		try {
-//		
-//			
-//			
-//			IPath contextPath = getWebContextRoot(javaProject);
-//			//entry =JavaCore.newLibraryEntry(contextPath.makeAbsolute(), null,null, new IAccessRule[0], new IClasspathAttribute[0], true);
-//			//entry =JavaCore.newLibraryEntry(contextPath.makeAbsolute(), null, null, new IAccessRule[0], new IClasspathAttribute[0], true);
-//			//entry =JavaCore.newSourceEntry(contextPath.makeAbsolute());
-//			entry = new ClasspathEntry(
-//					IPackageFragmentRoot.K_SOURCE,
-//					IClasspathEntry.CPE_SOURCE,
-//					contextPath.makeAbsolute(),
-//					ClasspathEntry.INCLUDE_ALL, ClasspathEntry.EXCLUDE_NONE,
-//					null, // source attachment
-//					null, // source attachment root
-//					null, // custom output location
-//					false,
-//					null,
-//					false, // no access rules to combine
-//					new IClasspathAttribute[] {ClasspathEntry.EXCLUDE_VALIDATE}); 
-//			
-//		} catch (RuntimeException ex) {
-//			// TODO Auto-generated catch block
-//			ex.printStackTrace();
-//		}
-//		
-//		if(entry!=null) return new IClasspathEntry[] {entry};
-//		return new IClasspathEntry[0];
-	}
-	public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
-		//this.javaProject = project;
-		super.initialize(containerPath, project);
-		
-	}
-	
-	public static IPath getWebContextRoot(IJavaProject javaProject) {
-		String webRoot = WebRootFinder.getWebContentFolder(javaProject.getProject()).toString();	
-		IPath webRootPath = javaProject.getPath().append(webRoot);
-		return webRootPath;
-	}
-	
-//	public IPath[] getAllHtmlInProject() {
-//		final ArrayList found = new ArrayList();
-//		String webRoot = getWebContextRoot(javaProject).toString();	
-//			IResourceProxyVisitor visitor = new IResourceProxyVisitor()
-//			{
-//				public boolean visit( IResourceProxy proxy ) throws CoreException
-//				{
-//					if ( proxy.getName().endsWith( ".htm" ) )
-//					{
-//						IPath path = proxy.requestResource().getLocation();
-//						found.add(path);
-//						//IClasspathEntry newLibraryEntry = JavaCore.newLibraryEntry( path,null, null, new IAccessRule[ 0 ], new IClasspathAttribute[ 0 ], true );
-//						//entries.add( newLibraryEntry );
-//						return false;
-//					}
-//					
-//					return true;
-//				}
-//			};
-//			try
-//			{
-//				javaProject.getProject().findMember( new Path(webRoot) ).accept( visitor, 0 );
-//			}
-//			catch ( CoreException e )
-//			{
-//			}
-//		
-//		
-//		return (IPath[])found.toArray(new IPath[found.size()]);
-//	
-//	}
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java
deleted file mode 100644
index 249815c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.internal.ui.actions.ActionMessages;
-import org.eclipse.wst.jsdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-
-/**
- * @author childsb
- * 
- */
-public class AddJavaDocStubAction implements IObjectActionDelegate {
-	private ISelection selection;
-	private IWorkbenchPart targetPart;
-	
-	public String getDialogTitle() {
-		return "JavaScript Doc";
-	}
-	
-	public Shell getShell() {
-		return getSite().getShell();
-	}
-	
-	public IWorkbenchPartSite getSite() {
-		return targetPart.getSite();
-	}
-	
-	public void run(IAction action) {
-		IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		if (elements == null || elements.length < 1) {
-			return;
-		}
-		IJavaElement parent = elements[0].getParent();
-		/* find the cu */
-		while (parent != null && !(parent instanceof ICompilationUnit)) {
-			;
-		}
-		if (parent != null) {
-			ArrayList members = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IMember) {
-					members.add(elements[i]);
-				}
-			}
-			JsJfaceNode node[] = SimpleJSDTActionProxy.getJsJfaceNodesFromSelection(selection);
-			/* only should be one node */
-			run((ICompilationUnit) parent, (IMember[]) members.toArray(new IMember[members.size()]), node[0]);
-		}
-	}
-	
-	public void run(ICompilationUnit cu, IMember[] members, JsJfaceNode node) {
-		try {
-			AddJavaDocStubOperation op = new AddJavaDocStubOperation(members, node);
-			PlatformUI.getWorkbench().getProgressService().runInUI(PlatformUI.getWorkbench().getProgressService(), new WorkbenchRunnableAdapter(op, op.getScheduleRule()), op.getScheduleRule());
-		} catch (InvocationTargetException e) {
-			ExceptionHandler.handle(e, getShell(), getDialogTitle(), ActionMessages.AddJavaDocStubsAction_error_actionFailed);
-		} catch (InterruptedException e) {
-			// operation canceled
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java
deleted file mode 100644
index c483f96..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.web.core.internal.java.DocumentChangeListenerToTextEdit;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author childsb
- * 
- */
-public class AddJavaDocStubOperation extends org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation {
-	private IDocument copy;
-	/**
-	 * @param members
-	 */
-	private JsJfaceNode node;
-	private DocumentChangeListenerToTextEdit textEditListener;;
-	
-	public AddJavaDocStubOperation(IMember[] members, JsJfaceNode node) {
-		super(members);
-		this.node = node;
-	}
-	
-	protected void applyChanges() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		IStructuredDocument doc = node.getStructuredDocument();
-		try {
-			MultiTextEdit edits = textEditListener.getTextEdits();
-			model = modelManager.getExistingModelForEdit(doc);
-			model.aboutToChangeModel();
-			model.beginRecording(this, "Generate JsDoc", "Generate JsDoc");
-			edits.apply(doc);
-		} catch (MalformedTreeException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (BadLocationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} finally {
-			if (model != null) {
-				model.endRecording(this);
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation#getDocument(org.eclipse.wst.jsdt.core.ICompilationUnit,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	protected IDocument getDocument(ICompilationUnit cu, IProgressMonitor monitor) throws CoreException {
-		return getJavaDocumentFromNode();
-	}
-	
-	protected IDocument getJavaDocumentFromNode() {
-		if (copy == null) {
-			JsTranslation tran = node.getTranslation();
-			copy = new Document(tran.getJsText());
-			textEditListener = new DocumentChangeListenerToTextEdit();
-			copy.addDocumentListener(textEditListener);
-		}
-		return copy;
-	}
-	
-	
-	public void run(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
-		super.run(monitor);
-		applyChanges();
-		/* need to apply the text edits back to the original doc */
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java
deleted file mode 100644
index d921f9b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-
-/**
- * @author childsb
- * 
- */
-public class FindReferencesAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgs(org.eclipse.jface.action.IAction)
-	 */
-	
-	public Object[] getRunArgs(IAction action) {
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements != null && elements.length > 0) {
-			return new Object[] { elements[0] };
-		}
-		return new Object[0];
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IJavaElement.class };
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java
deleted file mode 100644
index 0aaf677..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-
-/**
- * @author childsb
- * 
- */
-public class FindReferencesInWorkingSetAction extends FindReferencesAction {
-	
-	public void run(IAction action) {
-		try {
-			Object handler = getActionHandler(action);
-			IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-			if (elements == null || elements.length == 0) {
-				return;
-			}
-			SimpleJSDTActionProxy.executeMethod(handler, "run", new Class[] { IJavaElement.class }, new Object[] { elements[0] });
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// If user doesn't select a working set an exception is thrown so we
-			// wont print stack trace here
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java
deleted file mode 100644
index 95ada0e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-
-/**
- * @author childsb
- * 
- */
-public class JsElementActionProxy extends SimpleJSDTActionProxy {
-	/* Util method to get all the java elements in a selection */
-	public static IJavaElement[] getJsElementsFromSelection(ISelection selection) {
-		if (selection == null) {
-			return new IJavaElement[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof IJavaElement) {
-					elements.add(element);
-				}
-				if (element instanceof IJavaWebNode) {
-					elements.add(((IJavaWebNode) element).getJavaElement());
-				}
-			}
-			return (IJavaElement[]) elements.toArray(new IJavaElement[elements.size()]);
-		}
-		return new IJavaElement[0];
-	}
-	
-	
-	public Object[] getRunArgs(IAction action) {
-		/*
-		 * Needs to return an array of IJavaElements. Since its one arg of type
-		 * IJavaElement[] need to put into an object array
-		 */
-		return new Object[] { JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()) };
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.SimpleJSDTActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { (new IJavaElement[0]).getClass() };
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java
deleted file mode 100644
index 560e6a3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-
-/**
- * @author childsb
- * 
- */
-public class OpenCallHierarchyAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.SimpleJSDTActionProxy#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		/* Open call hierarchy needs to be disabled for TYPEs */
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getElementType() == IJavaElement.TYPE) {
-				action.setEnabled(false);
-				return;
-			}
-		}
-		super.selectionChanged(action, selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java
deleted file mode 100644
index cd85638..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-
-/**
- * @author childsb
- * 
- */
-public class OpenTypeHierarchy extends JsElementActionProxy {
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		IJavaElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		/* Open call hierarchy needs to be disabled for TYPEs */
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getElementType() != IJavaElement.TYPE) {
-				action.setEnabled(false);
-				return;
-			}
-		}
-		super.selectionChanged(action, selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java
deleted file mode 100644
index b8eeef0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-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.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-
-/**
- * @author childsb
- * 
- */
-public class ShowHistoryAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaElement virtualElement) {
-		IProject project = virtualElement.getJavaProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			IWorkbenchPage page = targetWorkbenchPart.getSite().getPage();
-			IViewPart view = page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (PartInitException e) {
-			ExceptionHandler.handle(e, targetWorkbenchPart.getSite().getShell(), "Error Opening in Script View", "Error while displaying element in Script View:\n" + e);
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java
deleted file mode 100644
index 23c3382..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-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.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-
-/**
- * @author childsb
- * 
- */
-public class ShowInNavigatorAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaElement virtualElement) {
-		IProject project = virtualElement.getJavaProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			IWorkbenchPage page = targetWorkbenchPart.getSite().getPage();
-			IViewPart view = page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (PartInitException e) {
-			ExceptionHandler.handle(e, targetWorkbenchPart.getSite().getShell(), "Error Opening in Script View", "Error while displaying element in Script View:\n" + e);
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java
deleted file mode 100644
index 0f44ff1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-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.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.internal.ui.packageview.PackageExplorerPart;
-
-/**
- * @author childsb
- * 
- */
-public class ShowInScriptExplorerAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaElement virtualElement) {
-		IProject project = virtualElement.getJavaProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgs(org.eclipse.jface.action.IAction)
-	 */
-	
-	public Object[] getRunArgs(IAction action) {
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements != null && elements.length > 0) {
-			return new Object[] { elements[0] };
-		}
-		return new Object[0];
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IJavaElement.class };
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			PackageExplorerPart view = PackageExplorerPart.openInActivePerspective();
-			view.tryToReveal(resource);
-// IWorkbenchPage page= targetWorkbenchPart.getSite().getPage();
-// IViewPart view= page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (Exception e) {
-			// ExceptionHandler.handle(e,
-			// targetWorkbenchPart.getSite().getShell(), "Error Opening in
-			// Script View", "Error while displaying element in Script View:\n"
-			// + e);
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java
deleted file mode 100644
index 1a652e8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-
-/**
- * @author childsb
- * 
- */
-public class SimpleJSDTActionProxy implements IObjectActionDelegate {
-	public static Object executeMethod(Object handler, String methodName, Class[] paramaterTypes, Object[] paramaterValues) throws SecurityException,
-			NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		Class target = handler.getClass();
-		Method m = target.getMethod(methodName, paramaterTypes);
-		return m.invoke(handler, paramaterValues);
-	}
-	
-	public static JsJfaceNode[] getJsJfaceNodesFromSelection(ISelection selection) {
-		if (selection == null) {
-			return new JsJfaceNode[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof JsJfaceNode) {
-					elements.add(element);
-				}
-			}
-			return (JsJfaceNode[]) elements.toArray(new JsJfaceNode[elements.size()]);
-		}
-		return new JsJfaceNode[0];
-	}
-	protected Object actionHandlerTarget;
-	private ISelection currentSelection;
-	protected IAction handlerTargetAction;
-	protected IWorkbenchPart targetWorkbenchPart;
-	
-	public SimpleJSDTActionProxy() {}
-	
-	/*
-	 * Most handlers look for WorkBenchSite, so we convert the WorkBenchPart to
-	 * WorkBenchSite for init
-	 */
-	protected Object getActionHandler(IAction action) throws IllegalAccessException, NoSuchMethodException, IllegalArgumentException, InstantiationException,
-			InvocationTargetException {
-		/* Target class is cached */
-		if (handlerTargetAction == action && actionHandlerTarget != null) {
-			return actionHandlerTarget;
-		}
-		Class target = null;
-		String className = getActionHandlerClassName(action);
-		try {
-			target = Class.forName(className);
-		} catch (ClassNotFoundException ex) {
-			System.out.println("Error.. Class target of action handler not found: " + action);
-			System.out.println("Exception : " + ex);
-		}
-		// use the loaded class
-		Class[] types = new Class[] { IWorkbenchSite.class };
-		Constructor cons = target.getConstructor(types);
-		Object[] args = new Object[] { targetWorkbenchPart.getSite() };
-		
-		actionHandlerTarget = cons.newInstance(args);
-		handlerTargetAction = action;
-		return actionHandlerTarget;
-	}
-	
-	/*
-	 * Default way of determining the action handlers class name.. may be
-	 * subclassed/overridden
-	 */
-	protected String getActionHandlerClassName(IAction action) {
-		return action.getId();
-	}
-	
-	public ISelection getCurrentSelection() {
-		return currentSelection;
-	}
-	
-	public Object[] getRunArgs(IAction action) {
-		return new Object[] { getCurrentSelection() };
-	}
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IStructuredSelection.class };
-	}
-	
-	public Object[] getSelectionChangeArgs(IAction action, ISelection selection) {
-		return new Object[] { getCurrentSelection() };
-	}
-	
-	public Class[] getSelectionChangeArgTypes() {
-		return new Class[] { IStructuredSelection.class };
-	}
-	
-	/*
-	 * Generic reflection util method to execute a named method with unknown
-	 * paramaters on an object
-	 */
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			Object handler = getActionHandler(action);
-			SimpleJSDTActionProxy.executeMethod(handler, "run", getRunArgTypes(), getRunArgs(action));
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		currentSelection = selection;
-		if(targetWorkbenchPart==null) return;
-		
-		try {
-			Object handler = getActionHandler(action);
-			SimpleJSDTActionProxy.executeMethod(handler, "selectionChanged", getSelectionChangeArgTypes(), getSelectionChangeArgs(action, selection));
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-		
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetWorkbenchPart = targetPart;
-	}
-	
-	protected void setSelection(ISelection selection) {
-		this.currentSelection = selection;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java
deleted file mode 100644
index a3e70ba..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author childsb
- * 
- */
-public class SourceActionsAction implements IObjectActionDelegate {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-	
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java
deleted file mode 100644
index 615f440..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author childsb
- * 
- */
-public class StandardEditorActionsAction implements IObjectActionDelegate {
-	private static final boolean APPEND_NEW_LINES_TO_COPY = true;
-	protected static final String COPY = "org.eclipse.wst.jsdt.web.ui.copy";
-	protected static final String CUT = "org.eclipse.wst.jsdt.web.ui.cut";
-	protected static final String DELETE = "org.eclipse.wst.jsdt.web.ui.delete";
-	private static final char NEW_LINE = '\n';
-	protected static final String PASTE_AFTER = "org.eclipse.wst.jsdt.web.ui.paste.after";
-	protected static final String PASTE_BEFORE = "org.eclipse.wst.jsdt.web.ui.paste.before";
-	protected ISelection selection;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	private void copy(IAction action) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		Clipboard clipboard = null;
-		StringBuffer text = new StringBuffer();
-		if (StandardEditorActionsAction.APPEND_NEW_LINES_TO_COPY) {
-			text.append(StandardEditorActionsAction.NEW_LINE);
-		}
-		try {
-			for (int i = 0; i < nodes.length; i++) {
-				JsJfaceNode currentNode = nodes[i];
-				int start = currentNode.getStartOffset();
-				int length = currentNode.getLength();
-				IStructuredDocument doc = currentNode.getStructuredDocument();
-				try {
-					String elementText = doc.get(start, length);
-					text.append(elementText);
-				} catch (BadLocationException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-				if (StandardEditorActionsAction.APPEND_NEW_LINES_TO_COPY) {
-					text.append(StandardEditorActionsAction.NEW_LINE);
-				}
-				clipboard = new Clipboard(Display.getCurrent());
-				clipboard.setContents(new Object[] { text.toString() }, new Transfer[] { TextTransfer.getInstance() });
-			}
-		} finally {
-			if (clipboard != null) {
-				clipboard.dispose();
-			}
-		}
-	}
-	
-	private void delete(IAction action) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		IStructuredDocument lastDoc = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		try {
-			int start;
-			int length;
-			for (int i = 0; i < nodes.length; i++) {
-				JsJfaceNode currentNode = nodes[i];
-				start = currentNode.getStartOffset();
-				length = currentNode.getLength();
-				IStructuredDocument doc = currentNode.getStructuredDocument();
-				if (doc != lastDoc) {
-					lastDoc = doc;
-					if (model != null) {
-						model.endRecording(action);
-						model.changedModel();
-						model.releaseFromEdit();
-					}
-					if (modelManager != null) {
-						model = modelManager.getExistingModelForEdit(doc);
-						model.aboutToChangeModel();
-						model.beginRecording(action, "Delete JavaScript Element", "Delete JavaScript Element");
-					}
-				}
-				doc.replaceText(action, start, length, "");
-			}
-			model.endRecording(action);
-		} catch (Exception e) {
-			System.out.println("Error in Standard Editor Action : " + e);
-		} finally {
-			if (model != null) {
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	private JsJfaceNode[] parseSelection() {
-		if (selection == null) {
-			return new JsJfaceNode[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof IJavaElement) {
-					elements.add(element);
-				}
-				if (element instanceof IJavaWebNode) {
-					elements.add(element);
-				}
-			}
-			return (JsJfaceNode[]) elements.toArray(new JsJfaceNode[elements.size()]);
-		}
-		return new JsJfaceNode[0];
-	}
-	
-	private void paste(IAction action, boolean atEnd) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		StringBuffer text = new StringBuffer();
-		int startOfPaste = -1;
-		IStructuredDocument doc = null;
-		/* Figure out where to paste the content */
-		if (atEnd) {
-			for (int i = 0; i < nodes.length; i++) {
-				if ((nodes[i].getStartOffset() + nodes[i].getLength()) > startOfPaste) {
-					startOfPaste = (nodes[i].getStartOffset() + nodes[i].getLength());
-					doc = nodes[i].getStructuredDocument();
-				}
-			}
-		} else {
-			for (int i = 0; i < nodes.length; i++) {
-				if ((nodes[i].getStartOffset() < startOfPaste || startOfPaste < 0)) {
-					startOfPaste = nodes[i].getStartOffset();
-					doc = nodes[i].getStructuredDocument();
-				}
-			}
-		}
-		Clipboard clipboard = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		try {
-			clipboard = new Clipboard(Display.getCurrent());
-			String pasteString = (String) clipboard.getContents(TextTransfer.getInstance());
-			model = modelManager.getExistingModelForEdit(doc);
-			model.aboutToChangeModel();
-			model.beginRecording(action, "Insert Text " + (atEnd ? "before" : "after") + " a JavaScript Element.", "Insert Text " + (atEnd ? "before" : "after") + " a JavaScript Element.");
-			doc.replaceText(action, startOfPaste, 0, pasteString);
-		} finally {
-			if (clipboard != null) {
-				clipboard.dispose();
-			}
-			if (model != null) {
-				model.endRecording(action);
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (action.getId().equals(StandardEditorActionsAction.CUT)) {
-			copy(action);
-			delete(action);
-		} else if (action.getId().equals(StandardEditorActionsAction.COPY)) {
-			copy(action);
-		} else if (action.getId().equals(StandardEditorActionsAction.PASTE_BEFORE)) {
-			paste(action, false);
-		} else if (action.getId().equals(StandardEditorActionsAction.PASTE_AFTER)) {
-			paste(action, true);
-		} else if (action.getId().equals(StandardEditorActionsAction.DELETE)) {
-			delete(action);
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java
deleted file mode 100644
index a615e20..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal;
-
-/**
- * @author pavery
- */
-public interface IActionConstantsJs {
-	public final static String ACTION_NAME_MOVE_ELEMENT = "MoveElement"; //$NON-NLS-1$
-	public final static String ACTION_NAME_RENAME_ELEMENT = "RenameElement"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java
deleted file mode 100644
index 74d8c19..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal;
-
-import org.eclipse.wst.jsdt.ui.actions.IJavaEditorActionDefinitionIds;
-
-/**
- * @author pavery
- */
-public interface IActionDefinitionIdsJs {
-	public final static String MOVE_ELEMENT = IJavaEditorActionDefinitionIds.MOVE_ELEMENT;
-	public final static String RENAME_ELEMENT = IJavaEditorActionDefinitionIds.RENAME_ELEMENT;
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties
deleted file mode 100644
index 85cfe32..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-## The following line is a sample JSP document.  Please translate only the following parts:
-## Use below tags ONLY for JSP 1.1
-## Welcome!
-## Use below tags ONLY for JSP 1.2
-## Welcome!
-Sample_JSP_doc=<%@ page \n\tlanguage=\"java\" \n\tcontentType=\"text/html; charset=ISO-8859-1\"\n%>\n<jsp:include flush=\"true\" page=\"titleBar.jsp\"/>\n\n<%-- Use below tags ONLY for JSP 1.1 --%>\n<%\n\tSystem.out.println(\"Welcome!\");\n%>\n<%-- Use below tags ONLY for JSP 1.2 --%>\n<jsp:scriptlet>\n\tSystem.out.println(\"Welcome!\");\n</jsp:scriptlet>
-JSP_Delimiters_UI_=JSP Delimiters
-Refactor_label=Refactor
-RenameElement_label=Rename
-MoveElement_label=Move
-MoveElementWizard=Move the selected elements
-#
-OK=OK
-JSP_changes=JSP changes
-ActionContributorJSP_0=Refa&ctor
-JSPRenameElementAction_0=Editor selection does not resolve to a renamable Java element
-JSPMoveElementAction_0=Editor selection does not resolve to movable Java elements
-BasicRefactorSearchRequestor_0=JSP Rename
-BasicRefactorSearchRequestor_1=in file: {0} line: {1}
-BasicRefactorSearchRequestor_2=Move Type ''{0}'' to package ''{1}''
-BasicRefactorSearchRequestor_3=Rename Method ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_4=Rename Type ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_5=Rename Package ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_6=JSP Rename Change
-#
-_UI_WIZARD_NEW_TITLE = New JavaServer Page
-_UI_WIZARD_NEW_HEADING = JavaServer Page
-_UI_WIZARD_NEW_DESCRIPTION = Create a new JavaServer Page.
-_ERROR_FILENAME_MUST_END_JSP = The file name must end in one of the following extensions {0}. 
-_WARNING_FILE_MUST_BE_INSIDE_JAVA_PROJECT = JavaServer Pages created in projects that do not support Java might not work as expected. 
-_WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT = Files created outside of the Web Content folder will not be included in your deployed Web application. 
-ResourceGroup_nameExists = The same name already exists.
-NewJSPTemplatesWizardPage_0=Select JSP Template
-NewJSPTemplatesWizardPage_1=Select a template as initial content in the JSP page.
-NewJSPTemplatesWizardPage_2=Name
-NewJSPTemplatesWizardPage_3=Description
-NewJSPTemplatesWizardPage_4=Use JSP Template
-NewJSPTemplatesWizardPage_5=Preview
-NewJSPTemplatesWizardPage_6=Templates are 'New JSP' templates found in the <a>JSP Templates</a> preference page.
-# Copied from sse.ui
-CleanupDocument_label=Cleanup Document...
-CleanupDocument_tooltip=Cleanup Document
-CleanupDocument_description=Cleanup Document
-ToggleComment_label=Toggle Comment
-ToggleComment_tooltip=Toggle Comment
-ToggleComment_description=Toggle Comment
-AddBlockComment_label=Add Block Comment
-AddBlockComment_tooltip=Add Block Comment
-AddBlockComment_description=Add Block Comment
-RemoveBlockComment_label=Remove Block Comment
-RemoveBlockComment_tooltip=Remove Block Comment
-RemoveBlockComment_description=Remove Block Comment
-FindOccurrences_label=Occurrences in File
-OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}
-OccurrencesSearchQuery_2=file
-Content_Assist_not_availab_UI_=Content Assist not available at the current location
-Java_Content_Assist_is_not_UI_=Java Content Assist is not available for the current cursor location
-#
-Override_method_in=Override method in '
-Creating_files_encoding=Creating files encoding preference
-#
-JSPSourcePreferencePage_0=JSP Source preferences are based on the content within the JSP.
-JSPSourcePreferencePage_1=See <a>''{0}''</a> for JSP with HTML content.
-JSPSourcePreferencePage_2=See <a>''{0}''</a> for JSP with XML content.
-JSPColorPage_jsp_content=JSP Content
-JSPFilesPreferencePage_0=Validating files
-JSPFilesPreferencePage_1=Validate JSP fragments
-# JSP Fragments
-JSPFContentSettingsPropertyPage_0=none
-JSPFContentSettingsPropertyPage_1=The properties used instead of the page directive that cannot be specified in JSP fragment files.  The project setting is used if you specify "none."
-JSPFContentSettingsPropertyPage_2=Language:
-JSPFContentSettingsPropertyPage_3=Content Type:
-JSPFContentSettingsPropertyPage_4=Enable specific setting:
-ProjectJSPFContentSettingsPropertyPage_0=The properties for J2EE Web projects act as "project" default to be looked up when no properties are specified for a particular JSP fragment file.
-# CSS JSP
-Title_InvalidValue=Invalid Value
-Message_InvalidValue=Invalid property value.
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java
deleted file mode 100644
index 580fc89..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**********************************************************************
- * 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
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by JSP UI
- * 
- * @plannedfor 1.0
- */
-public class JsUIMessages extends NLS {
-	public static String _ERROR_FILENAME_MUST_END_JSP;
-	public static String _UI_WIZARD_NEW_DESCRIPTION;
-	public static String _UI_WIZARD_NEW_HEADING;
-	public static String _UI_WIZARD_NEW_TITLE;
-	public static String _WARNING_FILE_MUST_BE_INSIDE_JAVA_PROJECT;
-	public static String _WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT;
-	public static String ActionContributorJSP_0;
-	public static String AddBlockComment_description; // resource bundle
-	public static String AddBlockComment_label; // resource bundle
-	public static String AddBlockComment_tooltip; // resource bundle
-	public static String BasicRefactorSearchRequestor_0;
-	public static String BasicRefactorSearchRequestor_1;
-	public static String BasicRefactorSearchRequestor_2;
-	public static String BasicRefactorSearchRequestor_3;
-	public static String BasicRefactorSearchRequestor_4;
-	public static String BasicRefactorSearchRequestor_5;
-	public static String BasicRefactorSearchRequestor_6;
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.internal.JSPUIPluginResources";//$NON-NLS-1$
-	public static String CleanupDocument_description; // resource bundle
-	public static String CleanupDocument_label; // resource bundle
-	public static String CleanupDocument_tooltip; // resource bundle
-	public static String Content_Assist_not_availab_UI_;
-	public static String Creating_files_encoding;
-	public static String FindOccurrences_label; // resource bundle
-	private static ResourceBundle fResourceBundle;
-	public static String Java_Content_Assist_is_not_UI_;
-	public static String JSP_changes;
-	public static String JSP_Delimiters_UI_;
-	public static String JSPColorPage_jsp_content;
-	public static String JSPFContentSettingsPropertyPage_0;
-	public static String JSPFContentSettingsPropertyPage_1;
-	public static String JSPFContentSettingsPropertyPage_2;
-	public static String JSPFContentSettingsPropertyPage_3;
-	public static String JSPFContentSettingsPropertyPage_4;
-	public static String JSPFilesPreferencePage_0;
-	public static String JSPFilesPreferencePage_1;
-	public static String JSPMoveElementAction_0;
-	public static String JSPRenameElementAction_0;
-	public static String JSPSourcePreferencePage_0;
-	public static String JSPSourcePreferencePage_1;
-	public static String JSPSourcePreferencePage_2;
-	public static String Message_InvalidValue;
-	public static String MoveElement_label; // resource bundle
-	public static String MoveElementWizard;
-	public static String NewJSPTemplatesWizardPage_0;
-	public static String NewJSPTemplatesWizardPage_1;
-	public static String NewJSPTemplatesWizardPage_2;
-	public static String NewJSPTemplatesWizardPage_3;
-	public static String NewJSPTemplatesWizardPage_4;
-	public static String NewJSPTemplatesWizardPage_5;
-	public static String NewJSPTemplatesWizardPage_6;
-	public static String OccurrencesSearchQuery_0;
-	public static String OccurrencesSearchQuery_2;
-	public static String OK;
-	public static String Override_method_in;
-	public static String ProjectJSPFContentSettingsPropertyPage_0;
-	public static String Refactor_label;
-	public static String RemoveBlockComment_description; // resource bundle
-	public static String RemoveBlockComment_label; // resource bundle
-	public static String RemoveBlockComment_tooltip; // resource bundle
-	public static String RenameElement_label; // resource bundle
-	public static String ResourceGroup_nameExists;
-	public static String Sample_JSP_doc;
-	public static String Title_InvalidValue;
-	public static String ToggleComment_description; // resource bundle
-	public static String ToggleComment_label; // resource bundle
-	public static String ToggleComment_tooltip; // resource bundle
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(JsUIMessages.BUNDLE_NAME, JsUIMessages.class);
-	}
-	
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (JsUIMessages.fResourceBundle == null) {
-				JsUIMessages.fResourceBundle = ResourceBundle.getBundle(JsUIMessages.BUNDLE_NAME);
-			}
-		} catch (MissingResourceException x) {
-			JsUIMessages.fResourceBundle = null;
-		}
-		return JsUIMessages.fResourceBundle;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
deleted file mode 100644
index 56473ef..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.jsdt.internal.ui.JavaPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JsUIPlugin extends AbstractUIPlugin {
-	public final static String ID = "org.eclipse.wst.jsdt.web.ui"; //$NON-NLS-1$
-	protected static JsUIPlugin instance = null;
-	
-	public static JsUIPlugin getDefault() {
-		return JsUIPlugin.instance;
-	}
-	
-	public synchronized static JsUIPlugin getInstance() {
-		return JsUIPlugin.instance;
-	}
-	/**
-	 * The template context type registry for the jsp editor.
-	 */
-	private ContextTypeRegistry fContextTypeRegistry;
-	/**
-	 * The template store for the jsp editor.
-	 */
-	private TemplateStore fTemplateStore;
-	
-	public JsUIPlugin() {
-		super();
-		JsUIPlugin.instance = this;
-	}
-	
-	public AdapterFactoryRegistry getAdapterFactoryRegistry() {
-		return AdapterFactoryRegistryImpl.getInstance();
-	}
-	
-	/**
-	 * Returns the template context type registry for the jsp plugin.
-	 * 
-	 * @return the template context type registry for the jsp plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry() {
-		if (fContextTypeRegistry == null) {
-// ContributionContextTypeRegistry registry = new
-// ContributionContextTypeRegistry();
-// registry.addContextType(TemplateContextTypeIdsJSP.ALL);
-// registry.addContextType(TemplateContextTypeIdsJSP.NEW);
-// registry.addContextType(TemplateContextTypeIdsJSP.TAG);
-// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE);
-// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE);
-			fContextTypeRegistry = JavaPlugin.getDefault().getCodeTemplateContextRegistry();
-		}
-		return fContextTypeRegistry;
-	}
-	
-	/**
-	 * Returns the template store for the jsp editor templates.
-	 * 
-	 * @return the template store for the jsp editor templates
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fTemplateStore == null) {
-// fTemplateStore = new ContributionTemplateStore(
-// getTemplateContextRegistry(), getPreferenceStore(),
-// JSPUIPreferenceNames.TEMPLATES_KEY);
-			JavaPlugin jp = JavaPlugin.getDefault();
-			fTemplateStore = jp.getTemplateStore();
-			try {
-				fTemplateStore.load();
-			} catch (IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fTemplateStore;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java
deleted file mode 100644
index 792cc6c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + Logger.ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + Logger.INFO;
-	public static final int OK = IStatus.OK; // 0
-	public static final int OK_DEBUG = 200 + Logger.OK;
-	private static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.ui"; //$NON-NLS-1$
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + Logger.WARNING;
-	
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == Logger.OK_DEBUG || level == Logger.INFO_DEBUG || level == Logger.WARNING_DEBUG || level == Logger.ERROR_DEBUG) {
-			if (!Logger.isDebugging()) {
-				return;
-			}
-		}
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG:
-			case INFO:
-				severity = IStatus.INFO;
-			break;
-			case WARNING_DEBUG:
-			case WARNING:
-				severity = IStatus.WARNING;
-			break;
-			case ERROR_DEBUG:
-			case ERROR:
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, Logger.PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-		if (bundle != null) {
-			Platform.getLog(bundle).log(statusObj);
-		}
-	}
-	
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (Logger.isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, Logger.PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-			if (bundle != null) {
-				Platform.getLog(bundle).log(statusObj);
-			}
-		}
-	}
-	
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!Logger.isDebugging()) {
-			return false;
-		}
-		String traceFilter = Platform.getDebugOption(Logger.PLUGIN_ID + Logger.TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void log(int level, String message) {
-		Logger._log(level, message, null);
-	}
-	
-	public static void log(int level, String message, Throwable exception) {
-		Logger._log(level, message, exception);
-	}
-	
-	public static void logException(String message, Throwable exception) {
-		Logger._log(Logger.ERROR, message, exception);
-	}
-	
-	public static void logException(Throwable exception) {
-		Logger._log(Logger.ERROR, exception.getMessage(), exception);
-	}
-	
-	public static void trace(String category, String message) {
-		Logger._trace(category, message, null);
-	}
-	
-	public static void traceException(String category, String message, Throwable exception) {
-		Logger._trace(category, message, exception);
-	}
-	
-	public static void traceException(String category, Throwable exception) {
-		Logger._trace(category, exception.getMessage(), exception);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java
deleted file mode 100644
index 70186b6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.autoedit;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.internal.ui.text.java.JavaAutoIndentStrategy;
-import org.eclipse.wst.jsdt.internal.ui.text.java.SmartSemicolonAutoEditStrategy;
-import org.eclipse.wst.jsdt.internal.ui.text.javadoc.JavaDocAutoIndentStrategy;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class AutoEditStrategyForJs implements IAutoEditStrategy {
-	private IAutoEditStrategy[] fStrategies;
-	
-	public AutoEditStrategyForJs() {
-		super();
-	}
-	
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		IAutoEditStrategy[] strats = getAutoEditStrategies(document);
-		for (int i = 0; i < strats.length; i++) {
-			strats[i].customizeDocumentCommand(document, command);
-		}
-	}
-	
-	public IAutoEditStrategy[] getAutoEditStrategies(IDocument document) {
-		if (fStrategies != null) {
-			return fStrategies;
-		}
-		String partitioning = IHTMLPartitions.SCRIPT;
-		fStrategies = new IAutoEditStrategy[] { new JavaDocAutoIndentStrategy(partitioning), new SmartSemicolonAutoEditStrategy(partitioning),
-				new JavaAutoIndentStrategy(partitioning, getJavaProject(document)) };
-		/* new AutoEditStrategyForTabs() */
-		return fStrategies;
-	}
-	
-	private IJavaProject getJavaProject(IDocument document) {
-		IDOMModel model = null;
-		IJavaProject javaProject = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			String baseLocation = model.getBaseLocation();
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IPath filePath = new Path(baseLocation);
-			IProject project = null;
-			if (filePath.segmentCount() > 0) {
-				project = root.getProject(filePath.segment(0));
-			}
-			if (project != null) {
-				javaProject = JavaCore.create(project);
-			}
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return javaProject;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java
deleted file mode 100644
index 21cb26d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.autoedit;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ConfigurableLineTracker;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ILineTracker;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorExtension3;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * AutoEditStrategy to handle characters inserted when Tab key is pressed
- */
-public class AutoEditStrategyForTabs implements IAutoEditStrategy {
-	private final String TAB_CHARACTER = "\t"; //$NON-NLS-1$
-	
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		// if not in smart insert mode just ignore
-		if (!isSmartInsertMode()) {
-			return;
-		}
-		// spaces for tab character
-		if (command.length == 0 && command.text != null && command.text.length() > 0 && command.text.indexOf(TAB_CHARACTER) != -1) {
-			smartInsertForTab(command, document);
-		}
-	}
-	
-	/**
-	 * Returns indentation width if using spaces for indentation, -1 otherwise
-	 * 
-	 * @return
-	 */
-	private int getIndentationWidth() {
-		int width = -1;
-		Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-		if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR))) {
-			width = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);
-		}
-		return width;
-	}
-	
-	/**
-	 * Calculate number of spaces for next tab stop
-	 */
-	private String getIndentString(int indentationWidth, int lineOffset, ILineTracker lineTracker, int index) {
-		int indentSize = indentationWidth;
-		int offsetInLine = -1;
-		if (lineTracker != null) {
-			try {
-				IRegion lineInfo = lineTracker.getLineInformationOfOffset(index);
-				if (lineInfo.getOffset() == 0 && lineOffset > -1) {
-					offsetInLine = lineOffset + index;
-				} else {
-					offsetInLine = index - lineInfo.getOffset();
-				}
-			} catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		} else {
-			if (lineOffset > -1) {
-				offsetInLine = lineOffset + index;
-			}
-		}
-		if (offsetInLine > -1 && indentationWidth > 0) {
-			int remainder = offsetInLine % indentationWidth;
-			indentSize = indentationWidth - remainder;
-		}
-		StringBuffer indent = new StringBuffer();
-		for (int i = 0; i < indentSize; i++) {
-			indent.append(' ');
-		}
-		return indent.toString();
-	}
-	
-	/**
-	 * Set up a line tracker for text within command if text is multi-line
-	 */
-	private ILineTracker getLineTracker(IDocument document, String originalText) {
-		ConfigurableLineTracker lineTracker = null;
-		int[] delims = TextUtilities.indexOf(document.getLegalLineDelimiters(), originalText, 0);
-		if (delims[0] != -1 || delims[1] != -1) {
-			lineTracker = new ConfigurableLineTracker(document.getLegalLineDelimiters());
-			lineTracker.set(originalText);
-		}
-		return lineTracker;
-	}
-	
-	/**
-	 * Return true if active editor is in smart insert mode, false otherwise
-	 * 
-	 * @return
-	 */
-	private boolean isSmartInsertMode() {
-		boolean isSmartInsertMode = false;
-		ITextEditor textEditor = null;
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IEditorPart editor = page.getActiveEditor();
-				if (editor != null) {
-					if (editor instanceof ITextEditor) {
-						textEditor = (ITextEditor) editor;
-					} else {
-						textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-					}
-				}
-			}
-		}
-		// check if smart insert mode
-		if (textEditor instanceof ITextEditorExtension3 && ((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT) {
-			isSmartInsertMode = true;
-		}
-		return isSmartInsertMode;
-	}
-	
-	/**
-	 * Insert spaces for tabs
-	 * 
-	 * @param command
-	 */
-	private void smartInsertForTab(DocumentCommand command, IDocument document) {
-		// tab key was pressed. now check preferences to see if need to insert
-		// spaces instead of tab
-		int indentationWidth = getIndentationWidth();
-		if (indentationWidth > -1) {
-			String originalText = command.text;
-			StringBuffer newText = new StringBuffer(originalText);
-			// determine where in line this command begins
-			int lineOffset = -1;
-			try {
-				IRegion lineInfo = document.getLineInformationOfOffset(command.offset);
-				lineOffset = command.offset - lineInfo.getOffset();
-			} catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-			ILineTracker lineTracker = getLineTracker(document, originalText);
-			int startIndex = 0;
-			int index = newText.indexOf(TAB_CHARACTER);
-			while (index != -1) {
-				String indent = getIndentString(indentationWidth, lineOffset, lineTracker, index);
-				// replace \t character with spaces
-				newText.replace(index, index + 1, indent);
-				if (lineTracker != null) {
-					try {
-						lineTracker.replace(index, 1, indent);
-					} catch (BadLocationException e) {
-						// if something goes wrong with replacing text, just
-						// reset to current string
-						lineTracker.set(newText.toString());
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-				startIndex = index + indent.length();
-				index = newText.indexOf(TAB_CHARACTER, startIndex);
-			}
-			command.text = newText.toString();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java
deleted file mode 100644
index e4b789c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.wst.jsdt.ui.text.java.IJavaCompletionProposal;
-
-/**
- * Implements IJavaCompletionProposal for use with JSPProposalCollector.
- * 
- * @plannedfor 1.0
- */
-// public class JSPCompletionProposal extends CustomCompletionProposal
-// implements
-public class JSDTCompletionProposal extends JavaCompletionProposal implements IJavaCompletionProposal {
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-	 * 
-	 * This is a wrapped proposal so we don't need to make "slow" calls to the
-	 * java proposal up front, only when needed for example, getAdditionalInfo()
-	 * reads external javadoc, and it makes no sense
-	 */
-	ICompletionProposal fJavaCompletionProposal = null;
-	
-	public JSDTCompletionProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image,
-			String displayString, IContextInformation contextInformation, String additionalProposalInfo, int relevance,
-			boolean updateReplacementLengthOnValidate) {
-		super(replacementString, replacementOffset, replacementLength, image, displayString, relevance);
-		super.setCursorPosition(cursorPosition);
-		super.setContextInformation(contextInformation);
-// super(replacementString, replacementOffset, replacementLength,
-// cursorPosition, image, displayString, contextInformation,
-// additionalProposalInfo, relevance,
-// updateReplacementLengthOnValidate);
-	}
-	
-	/**
-	 * Sets cursor position after applying.
-	 */
-	
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		super.apply(viewer, trigger, stateMask, offset);
-	}
-	
-	
-	public String getAdditionalProposalInfo() {
-		String additionalInfo = super.getAdditionalProposalInfo();
-		ICompletionProposal javaProposal = getJavaCompletionProposal();
-		if (javaProposal != null) {
-			additionalInfo = javaProposal.getAdditionalProposalInfo();
-		}
-		return additionalInfo;
-	}
-	
-	final public ICompletionProposal getJavaCompletionProposal() {
-		return fJavaCompletionProposal;
-	}
-	
-	final public void setJavaCompletionProposal(ICompletionProposal javaCompletionProposal) {
-		fJavaCompletionProposal = javaCompletionProposal;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
deleted file mode 100644
index 8aed39d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.Arrays;
-import java.util.Vector;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.core.CompletionProposal;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
-
-public class JSDTContentAssistant extends AbstractContentAssistProcessor {
-	private JSDTContentAssistantProcessor fContentAssistProcessor;
-	private JSDTTemplateAssistProcessor fTemplateAssistProcessor;
-	private JsTranslationAdapter fTranslationAdapter;
-	private JSDTHtmlCompletionProcessor fHhtmlcomp;
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentPosition) {
-		Vector proposals = new Vector();
-		ICompletionProposal[] completionProposals;
-		ICompletionProposal endScript = getHtmlContentAssistProcessor().getEndScriptProposal(viewer, documentPosition);
-		if(endScript!=null) {
-			return new ICompletionProposal[] {endScript};
-			//proposals.add(endScript);
-		}
-		JSDTProposalCollector theCollector = getProposalCollector(viewer, documentPosition);
-		/* add end script tag if needed */
-
-		/* --------- Content Assistant --------- */
-		getContentAssistProcessor().setProposalCollector(theCollector);
-		completionProposals = getContentAssistProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		/* HTML Proposals */
-		completionProposals = getHtmlContentAssistProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		/* --------- template completions --------- */
-		getTemplateCompletionProcessor().setProposalCollector(theCollector);
-		completionProposals = getTemplateCompletionProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[0]);
-	}
-	
-	private JSDTHtmlCompletionProcessor getHtmlContentAssistProcessor() {
-		if (fHhtmlcomp == null) {
-			fHhtmlcomp = new JSDTHtmlCompletionProcessor();
-		}
-		return fHhtmlcomp;
-	}
-	
-	private JSDTContentAssistantProcessor getContentAssistProcessor() {
-		if (fContentAssistProcessor == null) {
-			fContentAssistProcessor = new JSDTContentAssistantProcessor();
-		}
-		return fContentAssistProcessor;
-	}
-	private JsTranslation getJSPTranslation(ITextViewer viewer, int offset) {
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			if (fTranslationAdapter == null) {
-				fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			}
-			if (fTranslationAdapter != null) {
-				return fTranslationAdapter.getJSPTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-	protected JSDTProposalCollector getProposalCollector(ITextViewer viewer, int offset) {
-		JsTranslation tran = getJSPTranslation(viewer, offset);
-		return new JSDTProposalCollector(tran);
-	}
-	
-	private JSDTTemplateAssistProcessor getTemplateCompletionProcessor() {
-		if (fTemplateAssistProcessor == null) {
-			fTemplateAssistProcessor = new JSDTTemplateAssistProcessor();
-		}
-		return fTemplateAssistProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
deleted file mode 100644
index 19c0434..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
-import org.osgi.framework.Bundle;
-
-public class JSDTContentAssistantProcessor extends AbstractContentAssistProcessor {
-	private static final boolean DEBUG;
-	private static final String JSDT_CORE_PLUGIN_ID = "org.eclipse.wst.jsdt.core"; //$NON-NLS-1$
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslation"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	protected String fErrorMessage = null;
-	protected int fJspSourcePosition, fJavaPosition;
-	private JSDTProposalCollector fProposalCollector;
-	private JsTranslationAdapter fTranslationAdapter = null;
-	protected StructuredTextViewer fViewer = null;
-	
-	public JSDTContentAssistantProcessor() {
-		super();
-	}
-	
-	/**
-	 * Returns a list of completion proposals based on the specified location
-	 * within the document that corresponds to the current cursor position
-	 * within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the proposals
-	 * @param documentPosition
-	 *            an offset within the document for which completions should be
-	 *            computed
-	 * @return an array of completion proposals or <code>null</code> if no
-	 *         proposals are possible
-	 */
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int pos) {
-		initialize(pos);
-		JSDTProposalCollector collector = null;
-		IDOMModel xmlModel = null;
-		try {
-			if (viewer instanceof StructuredTextViewer) {
-				fViewer = (StructuredTextViewer) viewer;
-			}
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(fViewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			if (fTranslationAdapter == null) {
-				fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			}
-			if (fTranslationAdapter != null) {
-				JsTranslation translation = fTranslationAdapter.getJSPTranslation(true);
-				fJavaPosition = getDocumentPosition();
-				try {
-					ICompilationUnit cu = translation.getCompilationUnit();
-					// can't get java proposals w/out a compilation unit
-					// or without a valid position
-					if (cu == null || -1 == fJavaPosition) {
-						return new ICompletionProposal[0];
-					}
-					collector = getProposalCollector();
-					synchronized (cu) {
-						cu.codeComplete(fJavaPosition, collector, null);
-					}
-				} catch (CoreException coreEx) {
-					// a possible Java Model Exception due to not being a Web
-					// (Java) Project
-					coreEx.printStackTrace();
-				}
-			}
-		} catch (Exception exc) {
-			exc.printStackTrace();
-			// throw out exceptions on code assist.
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		ICompletionProposal[] results = new ICompletionProposal[0];
-		if (collector != null) {
-			results = collector.getJSPCompletionProposals();
-			if (results == null || results.length < 1) {
-				fErrorMessage = JsUIMessages.Java_Content_Assist_is_not_UI_;
-			}
-		}
-		return results;
-	}
-	
-	/**
-	 * Returns information about possible contexts based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the possible
-	 *            contexts
-	 * @param documentPosition
-	 *            an offset within the document for which context information
-	 *            should be computed
-	 * @return an array of context information objects or <code>null</code> if
-	 *         no context could be found
-	 */
-	
-	public org.eclipse.jface.text.contentassist.IContextInformation[] computeContextInformation(org.eclipse.jface.text.ITextViewer viewer, int documentOffset) {
-		return null;
-	}
-	
-	/**
-	 * Returns a string of characters which when pressed should automatically
-	 * display content-assist proposals.
-	 * 
-	 * @return string of characters
-	 */
-	public java.lang.String getAutoProposalInvocationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns a string of characters which when pressed should automatically
-	 * display a content-assist tip.
-	 * 
-	 * @return string of characters
-	 */
-	public java.lang.String getAutoTipInvocationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of possible completions.
-	 * 
-	 * @return the auto activation characters for completion proposal or
-	 *         <code>null</code> if no auto activation is desired
-	 */
-	
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of context information.
-	 * 
-	 * @return the auto activation characters for presenting context information
-	 *         or <code>null</code> if no auto activation is desired
-	 */
-	
-	public char[] getContextInformationAutoActivationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns a validator used to determine when displayed context information
-	 * should be dismissed. May only return <code>null</code> if the processor
-	 * is incapable of computing context information.
-	 * 
-	 * @return a context information validator, or <code>null</code> if the
-	 *         processor is incapable of computing context information
-	 */
-	
-	public org.eclipse.jface.text.contentassist.IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-	
-	protected int getDocumentPosition() {
-		return fJspSourcePosition;
-	}
-	
-	
-	public String getErrorMessage() {
-		// TODO: get appropriate error message
-		// if (fCollector.getErrorMessage() != null &&
-		// fCollector.getErrorMessage().length() > 0)
-		// return fCollector.getErrorMessage();
-		return fErrorMessage;
-	}
-	
-	protected JSDTProposalCollector getProposalCollector() {
-		return fProposalCollector;
-		// return new JSPProposalCollector(translation);
-	}
-	
-	/**
-	 * Initialize the code assist processor.
-	 */
-	protected void initialize(int pos) {
-		initializeJavaPlugins();
-		fJspSourcePosition = pos;
-		fErrorMessage = null;
-	}
-	
-	/**
-	 * Initialize the Java Plugins that the JSP processor requires. See
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=143765 We should not call
-	 * "start", because that will cause that state to be remembered, and
-	 * re-started automatically during the next boot up sequence.
-	 * 
-	 * ISSUE: we may be able to get rid of this all together, in future, since
-	 * 99% we probably have already used some JDT class by the time we need JDT
-	 * to be active ... but ... this is the safest fix for this point in 1.5
-	 * stream. Next release, let's just remove this, re-discover what ever bug
-	 * this was fixing (if any) and if there is one, then we'll either put back
-	 * in, as is, or come up with a more appropriate fix.
-	 * 
-	 */
-	protected void initializeJavaPlugins() {
-		try {
-			Bundle bundle = Platform.getBundle(JSDTContentAssistantProcessor.JSDT_CORE_PLUGIN_ID);
-			bundle.loadClass("dummyClassNameThatShouldNeverExist");
-		} catch (ClassNotFoundException e) {
-			// this is the expected result, we just want to
-			// nudge the bundle to be sure its activated.
-		}
-	}
-	
-	
-	public void release() {
-		fTranslationAdapter = null;
-	}
-	
-	public void setProposalCollector(JSDTProposalCollector translation) {
-		this.fProposalCollector = translation;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
deleted file mode 100644
index 0e89158..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class JSDTContetAssistInvocationContext extends JavaContentAssistInvocationContext {
-	public static JSDTContetAssistInvocationContext getInstance(ITextViewer viewer, int offset, JSDTProposalCollector theCollector) {
-		JsTranslation tran = JSDTContetAssistInvocationContext.getJSPTranslation(viewer);
-		return new JSDTContetAssistInvocationContext(viewer, offset, theCollector);
-	}
-	
-	private static JsTranslation getJSPTranslation(ITextViewer viewer) {
-		JsTranslation fTranslation = null;
-		;
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			if (fTranslationAdapter != null) {
-				fTranslation = fTranslationAdapter.getJSPTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return fTranslation;
-	}
-	ITextViewer viewer;
-	
-	private JSDTContetAssistInvocationContext(ITextViewer viewer, int offset, JSDTProposalCollector theCollector) {
-		super(viewer, offset, null);
-		this.viewer = viewer;
-		// this.offset=getJSPTranslation().getJavaOffset(offset);
-		// CompletionProposalCollector theCollector = getProposalCollector();
-		super.setCollector(theCollector);
-	}
-	
-// public IDocument getDocument() {
-// return
-// ((JSPTranslationExtension)getJSPTranslation(viewer)).getJavaDocument();
-//      
-// }
-// protected CompletionProposalCollector getProposalCollector() {
-//       
-// return ((CompletionProposalCollector) ( new JSPProposalCollector(
-// getJSPTranslation()) ));
-// }
-	
-	public IDocument getDocument() {
-		return viewer.getDocument();
-	}
-// public ICompilationUnit getCompilationUnit() {
-// return getJSPTranslation(viewer).getCompilationUnit();
-// }
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
deleted file mode 100644
index 7e083ad..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.core.CompletionProposal;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * 
- */
-/**
- * @author childsb
- *
- */
-public class JSDTHtmlCompletionProcessor {
-	
-	public JSDTHtmlCompletionProcessor() {}
-	
-	
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-		/* add </script if necisary */
-		ArrayList allProposals = new ArrayList();
-		JsTranslation tran = getJSPTranslation(viewer);
-		int missingAtOffset = tran.getMissingTagStart();
-		
-		return (ICompletionProposal[])allProposals.toArray(new ICompletionProposal[allProposals.size()]);
-	}
-	
-	public ICompletionProposal getEndScriptProposal(ITextViewer viewer, int offset) {
-		/* add </script if necisary */
-		ArrayList allProposals = new ArrayList();
-		JsTranslation tran = getJSPTranslation(viewer);
-		int missingAtOffset = tran.getMissingTagStart();
-		
-		if(offset>=missingAtOffset&& missingAtOffset>-1) {
-			String text = "\n</script>\n";
-			String displayText = "<> end with </script>";
-			return new CustomCompletionProposal(text,offset,0,offset,null,displayText,null,"Close the script tag.",100);
-		}
-		
-		return null;
-	}
-	private JsTranslation getJSPTranslation(ITextViewer viewer) {
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			
-			JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			
-			if (fTranslationAdapter != null) {
-				return fTranslationAdapter.getJSPTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java
deleted file mode 100644
index c591612..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.CompletionProposal;
-import org.eclipse.wst.jsdt.core.Signature;
-import org.eclipse.wst.jsdt.ui.text.java.CompletionProposalCollector;
-import org.eclipse.wst.jsdt.ui.text.java.CompletionProposalComparator;
-import org.eclipse.wst.jsdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-
-/**
- * Passed into ICodeComplete#codeComplete(int offset, CompletionRequestor
- * requestor). Adapts IJavaCompletionProposals to JSPCompletion proposals. This
- * includes: - translating offsets - "fixing" up display strings - filtering
- * some unwanted proposals
- * 
- * @plannedfor 1.0
- */
-public class JSDTProposalCollector extends CompletionProposalCollector {
-	static char[] getTypeTriggers() {
-		return CompletionProposalCollector.TYPE_TRIGGERS;
-	}
-	private Comparator fComparator;
-	private JsTranslation fTranslation;
-	
-// public List getGeneratedFunctionNames(){
-// if(fGeneratedFunctionNames==null){
-// fGeneratedFunctionNames = fTranslation.getGeneratedFunctionNames();
-// }
-// return fGeneratedFunctionNames;
-// }
-	public JSDTProposalCollector(JsTranslation translation) {
-		super(translation.getCompilationUnit());
-		if (translation == null) {
-			throw new IllegalArgumentException("JSPTranslation cannot be null"); //$NON-NLS-1$
-		}
-		fTranslation = translation;
-	}
-	
-	/**
-	 * Cacluates the where the cursor should be after applying this proposal.
-	 * eg. method(|) if the method proposal chosen had params.
-	 * 
-	 * @param proposal
-	 * @param completion
-	 * @param currentCursorOffset
-	 * @return
-	 */
-	private int calculatePositionAfter(CompletionProposal proposal, String completion, int currentCursorOffset) {
-		// calculate cursor position after
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=118398
-		// int positionAfter = currentCursorOffset+completion.length();
-		int positionAfter = completion.length();
-		int kind = proposal.getKind();
-		// may need better logic here...
-		// put cursor inside parenthesis if there's params
-		// only checking for any kind of declaration
-		if (kind == CompletionProposal.ANONYMOUS_CLASS_DECLARATION || kind == CompletionProposal.METHOD_DECLARATION || kind == CompletionProposal.POTENTIAL_METHOD_DECLARATION || kind == CompletionProposal.METHOD_REF) {
-			String[] params = Signature.getParameterTypes(String.valueOf(proposal.getSignature()));
-			if (completion.length() > 0 && params.length > 0) {
-				positionAfter--;
-			}
-		}
-		return positionAfter;
-	}
-	
-	/**
-	 * Overridden to: - translate Java -> JSP offsets - fix
-	 * cursor-position-after - fix mangled servlet name in display string -
-	 * remove unwanted proposals (servlet constructor)
-	 */
-	
-	protected IJavaCompletionProposal createJavaCompletionProposal(CompletionProposal proposal) {
-		JSDTCompletionProposal jspProposal = null;
-		// ignore constructor proposals (they're not relevant for our JSP
-		// proposal list)
-		if (!proposal.isConstructor()) {
-// if (proposal.getKind() == CompletionProposal.TYPE_REF) {
-// String signature = String.valueOf(proposal
-// .getDeclarationSignature());
-// String completion = String.valueOf(proposal.getCompletion());
-// if (completion.indexOf(signature) != -1) {
-// jspProposal = createAutoImportProposal(proposal);
-// }
-// }
-			// default behavior
-// if (jspProposal == null) {
-// for(int i = 0;i<getGeneratedFunctionNames().size();i++){
-// if((new
-// String(proposal.getName())).equalsIgnoreCase((String)getGeneratedFunctionNames().get(i)))
-// return jspProposal;
-// }
-			jspProposal = createJspProposal(proposal);
-			// }
-		}
-		return jspProposal;
-	}
-	
-// private JSPCompletionProposal createAutoImportProposal(
-// CompletionProposal proposal) {
-//
-// JSPCompletionProposal jspProposal = null;
-//
-// String signature = new String(proposal.getDeclarationSignature());
-// String completion = new String(proposal.getCompletion());
-//
-// // it's fully qualified so we should
-// // add an import statement
-// // create an autoimport proposal
-// String newCompletion = completion.replaceAll(signature + ".", "");
-// //$NON-NLS-1$ //$NON-NLS-2$
-//
-// // java offset
-// int offset = proposal.getReplaceStart();
-// // replacement length
-// int length = proposal.getReplaceEnd() - offset;
-// // translate offset from Java > JSP
-// offset = fTranslation.getJspOffset(offset);
-// // cursor position after must be calculated
-// int positionAfter = calculatePositionAfter(proposal, newCompletion,
-// offset);
-//
-// // from java proposal
-// IJavaCompletionProposal javaProposal = super
-// .createJavaCompletionProposal(proposal);
-// proposal.getDeclarationSignature();
-// Image image = javaProposal.getImage();
-// String displayString = javaProposal.getDisplayString();
-// displayString = getTranslation().fixupMangledName(displayString);
-// IContextInformation contextInformation = javaProposal
-// .getContextInformation();
-// // don't do this, it's slow
-// // String additionalInfo = javaProposal.getAdditionalProposalInfo();
-// int relevance = javaProposal.getRelevance();
-//
-// boolean updateLengthOnValidate = true;
-//
-// jspProposal = new AutoImportProposal(completion, newCompletion, offset,
-// length, positionAfter, image, displayString,
-// contextInformation, null, relevance, updateLengthOnValidate);
-//
-// // https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-// // set wrapped java proposal so additional info can be calculated on
-// // demand
-// jspProposal.setJavaCompletionProposal(javaProposal);
-//
-// return jspProposal;
-// }
-	private JSDTCompletionProposal createJspProposal(CompletionProposal proposal) {
-		JSDTCompletionProposal jspProposal;
-		String completion = String.valueOf(proposal.getCompletion());
-		// java offset
-		int offset = proposal.getReplaceStart();
-		// replacement length
-		int length = proposal.getReplaceEnd() - offset;
-		// translate offset from Java > JSP
-		// cursor position after must be calculated
-		int positionAfter = calculatePositionAfter(proposal, completion, offset);
-		// from java proposal
-		IJavaCompletionProposal javaProposal = super.createJavaCompletionProposal(proposal);
-		proposal.getDeclarationSignature();
-		Image image = javaProposal.getImage();
-		String displayString = javaProposal.getDisplayString();
-		displayString = getTranslation().fixupMangledName(displayString);
-// for(int i = 0;i<getGeneratedFunctionNames().size();i++){
-// displayString.replace((String)getGeneratedFunctionNames().get(i), "");
-// }
-		IContextInformation contextInformation = javaProposal.getContextInformation();
-		// String additionalInfo = javaProposal.getAdditionalProposalInfo();
-		int relevance = javaProposal.getRelevance();
-		boolean updateLengthOnValidate = true;
-		jspProposal = new JSDTCompletionProposal(completion, offset, length, positionAfter, image, displayString, contextInformation, null, relevance, updateLengthOnValidate);
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-		// set wrapped java proposal so additional info can be calculated on
-		// demand
-		jspProposal.setJavaCompletionProposal(javaProposal);
-		return jspProposal;
-	}
-	
-	private Comparator getComparator() {
-		if (fComparator == null) {
-			fComparator = new CompletionProposalComparator();
-		}
-		return fComparator;
-	}
-	
-	/**
-	 * Ensures that we only return JSPCompletionProposals.
-	 * 
-	 * @return an array of JSPCompletionProposals
-	 */
-	public JSDTCompletionProposal[] getJSPCompletionProposals() {
-		List results = new ArrayList();
-		IJavaCompletionProposal[] javaProposals = getJavaCompletionProposals();
-		// need to filter out non JSPCompletionProposals
-		// because their offsets haven't been translated
-		for (int i = 0; i < javaProposals.length; i++) {
-			if (javaProposals[i] instanceof JSDTCompletionProposal) {
-				results.add(javaProposals[i]);
-			}
-		}
-		Collections.sort(results, getComparator());
-		return (JSDTCompletionProposal[]) results.toArray(new JSDTCompletionProposal[results.size()]);
-	}
-	
-	public JsTranslation getTranslation() {
-		return fTranslation;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
deleted file mode 100644
index 1229657..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.internal.ui.text.java.TemplateCompletionProposalComputer;
-import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-
-public class JSDTTemplateAssistProcessor {
-	TemplateCompletionProposalComputer fJavaTemplateCompletion;
-	JSDTProposalCollector fProposalCollector;
-	JsTranslationAdapter fTranslationAdapter;
-	IProgressMonitor monitor;
-	
-	public JSDTTemplateAssistProcessor() {
-		monitor = new NullProgressMonitor();
-	}
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-		JavaContentAssistInvocationContext context = getInvocationContext(viewer, offset);
-		List props = getTemplateCompletionProposalComputer().computeCompletionProposals(context, monitor);
-		return (ICompletionProposal[]) props.toArray(new ICompletionProposal[] {});
-	}
-	
-	private JavaContentAssistInvocationContext getInvocationContext(ITextViewer viewer, int offset) {
-		return JSDTContetAssistInvocationContext.getInstance(viewer, offset, getProposalCollector());
-	}
-	
-	protected JSDTProposalCollector getProposalCollector() {
-		return fProposalCollector;
-		// return new JSPProposalCollector(translation);
-	}
-	
-	private TemplateCompletionProposalComputer getTemplateCompletionProposalComputer() {
-		if (fJavaTemplateCompletion == null) {
-			fJavaTemplateCompletion = new TemplateCompletionProposalComputer();
-		}
-		return fJavaTemplateCompletion;
-	}
-	
-	public void setProposalCollector(JSDTProposalCollector translation) {
-		this.fProposalCollector = translation;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java
deleted file mode 100644
index 2baaff7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.derived;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/*
- * Copied from org.eclipse.wst.jsdt.internal.corext.javadoc.SingleCharReader.
- * Modification was made to fix statement unnecessarily nested within else
- * clause warning in read(..).
- */
-public abstract class SingleCharReader extends Reader {
-	/**
-	 * Gets the content as a String
-	 */
-	public String getString() throws IOException {
-		StringBuffer buf = new StringBuffer();
-		int ch;
-		while ((ch = read()) != -1) {
-			buf.append((char) ch);
-		}
-		return buf.toString();
-	}
-	
-	/**
-	 * @see Reader#read()
-	 */
-	
-	public abstract int read() throws IOException;
-	
-	/**
-	 * @see Reader#read(char[],int,int)
-	 */
-	
-	public int read(char cbuf[], int off, int len) throws IOException {
-		int end = off + len;
-		for (int i = off; i < end; i++) {
-			int ch = read();
-			if (ch == -1) {
-				if (i == off) {
-					return -1;
-				}
-				return i - off;
-			}
-			cbuf[i] = (char) ch;
-		}
-		return len;
-	}
-	
-	/**
-	 * @see Reader#ready()
-	 */
-	
-	public boolean ready() throws IOException {
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java
deleted file mode 100644
index 9bbc4ea..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.jsdt.web.ui.internal.editor;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-import org.eclipse.wst.html.ui.internal.edit.ui.ActionContributorHTML;
-import org.eclipse.wst.jsdt.ui.actions.RefactorActionGroup;
-import org.eclipse.wst.jsdt.web.ui.internal.IActionConstantsJs;
-import org.eclipse.wst.jsdt.web.ui.internal.IActionDefinitionIdsJs;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
-
-/**
- * ActionContributorJSP
- * 
- * This class should not be used inside multi page editor's
- * ActionBarContributor, since cascaded init() call from the
- * ActionBarContributor will causes exception and it leads to lose whole
- * toolbars.
- * 
- * Instead, use SourcePageActionContributor for source page contributor of multi
- * page editor.
- * 
- * Note that this class is still valid for single page editor.
- */
-public class ActionContributorJSP extends ActionContributorHTML {
-	private static final String[] EDITOR_IDS = { "org.eclipse.wst.html.core.htmlsource.source", "org.eclipse.wst.sse.ui.StructuredTextEditor" }; //$NON-NLS-1$ //$NON-NLS-2$
-	private RetargetTextEditorAction moveElementAction = null;
-	private IMenuManager refactorMenu = null;
-	private RetargetTextEditorAction renameElementAction = null;
-	
-	public ActionContributorJSP() {
-		super();
-		ResourceBundle bundle = JsUIMessages.getResourceBundle();
-		this.renameElementAction = new RetargetTextEditorAction(bundle, IActionConstantsJs.ACTION_NAME_RENAME_ELEMENT + StructuredTextEditorActionConstants.UNDERSCORE);
-		this.renameElementAction.setActionDefinitionId(IActionDefinitionIdsJs.RENAME_ELEMENT);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.renameElementAction, IHelpContextIds.JSP_REFACTORRENAME_HELPID);
-		this.moveElementAction = new RetargetTextEditorAction(bundle, IActionConstantsJs.ACTION_NAME_MOVE_ELEMENT + StructuredTextEditorActionConstants.UNDERSCORE);
-		this.moveElementAction.setActionDefinitionId(IActionDefinitionIdsJs.MOVE_ELEMENT);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.moveElementAction, IHelpContextIds.JSP_REFACTORMOVE_HELPID);
-		// the refactor menu, add the menu itself to add all refactor actions
-		this.refactorMenu = new MenuManager(JsUIMessages.ActionContributorJSP_0, RefactorActionGroup.MENU_ID);
-		refactorMenu.add(this.renameElementAction);
-		refactorMenu.add(this.moveElementAction);
-	}
-	
-	
-	protected void addToMenu(IMenuManager menu) {
-		super.addToMenu(menu);
-		menu.insertAfter(IWorkbenchActionConstants.M_EDIT, this.refactorMenu);
-	}
-	
-	
-	protected String[] getExtensionIDs() {
-		return ActionContributorJSP.EDITOR_IDS;
-	}
-	
-	
-	public void setActiveEditor(IEditorPart activeEditor) {
-		super.setActiveEditor(activeEditor);
-		this.renameElementAction.setAction(getAction(getTextEditor(getActiveEditorPart()), IActionConstantsJs.ACTION_NAME_RENAME_ELEMENT));
-		this.moveElementAction.setAction(getAction(getTextEditor(getActiveEditorPart()), IActionConstantsJs.ACTION_NAME_MOVE_ELEMENT));
-	}
-	
-	
-	public void setViewerSpecificContributionsEnabled(boolean enabled) {
-		super.setViewerSpecificContributionsEnabled(enabled);
-		this.renameElementAction.setEnabled(enabled);
-		this.moveElementAction.setEnabled(enabled);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java
deleted file mode 100644
index 0ca92e2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.editor;
-
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-
-/**
- * Help context ids for the JSP Source Editor.
- * <p>
- * This interface contains constants only; it is not intended to be implemented.
- * </p>
- * 
- */
-public interface IHelpContextIds {
-	// JSP Fragment Property Page
-	public static final String JSP_FRAGMENT_HELPID = IHelpContextIds.PREFIX + "jspf1000"; //$NON-NLS-1$
-	// // figured out on the fly
-	// // JSP Source page editor
-	// public static final String JSP_SOURCEVIEW_HELPID =
-	// ContentTypeIdForJSP.ContentTypeID_JSP +"_source_HelpId"; //$NON-NLS-1$
-	// JSP New File Wizard - Template Page
-	public static final String JSP_NEWWIZARD_TEMPLATE_HELPID = IHelpContextIds.PREFIX + "jspw0010"; //$NON-NLS-1$
-	// JSP Files Preference page
-	public static final String JSP_PREFWEBX_FILES_HELPID = IHelpContextIds.PREFIX + "webx0050"; //$NON-NLS-1$
-	// JSP Styles Preference page
-	public static final String JSP_PREFWEBX_STYLES_HELPID = IHelpContextIds.PREFIX + "webx0051"; //$NON-NLS-1$
-	// JSP Templates Preference page
-	public static final String JSP_PREFWEBX_TEMPLATES_HELPID = IHelpContextIds.PREFIX + "webx0052"; //$NON-NLS-1$
-	// Refactor Move
-	public static final String JSP_REFACTORMOVE_HELPID = IHelpContextIds.PREFIX + "jspr0020"; //$NON-NLS-1$
-	// JSP Source Editor Context Menu
-	// Refactor Rename
-	public static final String JSP_REFACTORRENAME_HELPID = IHelpContextIds.PREFIX + "jspr0010"; //$NON-NLS-1$
-	// org.eclipse.wst.jsdt.web.ui.
-	public static final String PREFIX = JsUIPlugin.ID + "."; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
deleted file mode 100644
index 8a45990..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.format;
-
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.TypedPosition;
-import org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.JavaCore;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.internal.corext.util.CodeFormatterUtil;
-import org.eclipse.wst.jsdt.internal.formatter.DefaultCodeFormatter;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class FormattingStrategyJSDT extends ContextBasedFormattingStrategy {
-	private static final int regionStartIndentLevel = 1;
-	/** Documents to be formatted by this strategy */
-	private final LinkedList fDocuments = new LinkedList();
-	/** Partitions to be formatted by this strategy */
-	private final LinkedList fPartitions = new LinkedList();
-	private int startIndentLevel;
-	
-	/**
-	 * Creates a new java formatting strategy.
-	 */
-	public FormattingStrategyJSDT() {
-		super();
-	}
-	
-	class ModelIrritant implements IDocumentPartitioningListener {
-		public ModelIrritant(IDocument attachedDoc) {}
-		
-		public void documentPartitioningChanged(IDocument document) {
-			document.removeDocumentPartitioningListener(this);
-			if (document instanceof BasicStructuredDocument) {
-				try {
-					((BasicStructuredDocument) document).replace(0, document.getLength(), document.get());
-				} catch (BadLocationException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#format()
-	 */
-	
-	public void format() {
-		super.format();
-		final IStructuredDocument document = (IStructuredDocument) fDocuments.removeFirst();
-		final TypedPosition partition = (TypedPosition) fPartitions.removeFirst();
-		if (document != null) {
-			try {
-				// JSPTranslationUtil translationUtil = new
-				// JSPTranslationUtil(document);
-				JsTranslation translation = getTranslation(document);
-				ICompilationUnit cu = translation.getCompilationUnit();
-				if (cu != null) {
-					String cuSource = cu.getSource();
-					int javaStart = partition.getOffset();
-					int javaLength = partition.getLength();
-					TextEdit edit = CodeFormatterUtil.format2(CodeFormatter.K_COMPILATION_UNIT, cuSource, javaStart, javaLength, startIndentLevel, TextUtilities.getDefaultLineDelimiter(document), getPreferences());
-					IDocument doc = new Document(translation.getJsText());
-					edit.apply(doc);
-					String replaceText = TextUtilities.getDefaultLineDelimiter(document) + getIndentationString(getPreferences(), startIndentLevel) + (doc.get(edit.getOffset(), edit.getLength())).trim() + TextUtilities.getDefaultLineDelimiter(document);
-					/*
-					 * this is necisary since SSE disconnects document
-					 * partitioners.. Because of that, the replaced regions are
-					 * considered 'partitionless' when the linestyle provider
-					 * trys to color them.
-					 * 
-					 */
-					document.replaceText(document, partition.getOffset(), partition.getLength(), replaceText);
-					document.addDocumentPartitioningListener(new ModelIrritant(document));
-				}
-			} catch (BadLocationException e) {
-			} catch (JavaModelException e) {
-			}
-		}
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
-	 */
-	
-	public void formatterStarts(final IFormattingContext context) {
-		fPartitions.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PARTITION));
-		fDocuments.addLast(context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM));
-		startIndentLevel = FormattingStrategyJSDT.regionStartIndentLevel + 0;
-		Map projectOptions = (Map) context.getProperty(FormattingContextProperties.CONTEXT_PREFERENCES);
-		if (projectOptions == null) {
-			IDocument doc = (IDocument) context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM);
-			context.setProperty(FormattingContextProperties.CONTEXT_PREFERENCES, getProjectOptions(doc));
-		}
-		super.formatterStarts(context);
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
-	 */
-	
-	public void formatterStops() {
-		super.formatterStops();
-		fPartitions.clear();
-		fDocuments.clear();
-		startIndentLevel = 0;
-	}
-	
-	public String getIndentationString(Map options, int indentationLevel) {
-		DefaultCodeFormatter formatter = new DefaultCodeFormatter(options);
-		return formatter.createIndentationString(indentationLevel);
-	}
-	
-	private Map getProjectOptions(IDocument baseDocument) {
-		IJavaProject javaProject = null;
-		IDOMModel xmlModel = null;
-		Map options = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(baseDocument);
-			String baseLocation = xmlModel.getBaseLocation();
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IPath filePath = new Path(baseLocation);
-			IProject project = null;
-			if (filePath.segmentCount() > 0) {
-				project = root.getProject(filePath.segment(0));
-			}
-			if (project != null) {
-				javaProject = JavaCore.create(project);
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		if (javaProject != null) {
-			options = javaProject.getOptions(true);
-		}
-		return options;
-	}
-	
-	public JsTranslation getTranslation(IStructuredDocument document) {
-		JsTranslation tran = null;
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			if (translationAdapter != null) {
-				tran = translationAdapter.getJSPTranslation(true);
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return tran;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java
deleted file mode 100644
index 929cd56..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
- * EditorInput for external files. Copied from
- * org.eclipse.ui.internal.editors.text.JavaFileEditorInput
- */
-class ExternalFileEditorInput implements IEditorInput, ILocationProvider {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	/**
-	 * The workbench adapter which simply provides the label.
-	 * 
-	 * @see Eclipse 3.1
-	 */
-	private class WorkbenchAdapter implements IWorkbenchAdapter {
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object o) {
-			return null;
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-		 */
-		public ImageDescriptor getImageDescriptor(Object object) {
-			return null;
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-		 */
-		public String getLabel(Object o) {
-			return ((ExternalFileEditorInput) o).getName();
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object o) {
-			return null;
-		}
-	}
-	private File fFile;
-	private WorkbenchAdapter fWorkbenchAdapter = new WorkbenchAdapter();
-	
-	public ExternalFileEditorInput(File file) {
-		super();
-		fFile = file;
-		fWorkbenchAdapter = new WorkbenchAdapter();
-	}
-	
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if (o instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) o;
-			return fFile.equals(input.fFile);
-		}
-		if (o instanceof IPathEditorInput) {
-			IPathEditorInput input = (IPathEditorInput) o;
-			return getPath().equals(input.getPath());
-		}
-		return false;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return fFile.exists();
-	}
-	
-	/*
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (ILocationProvider.class.equals(adapter)) {
-			return this;
-		}
-		if (IWorkbenchAdapter.class.equals(adapter)) {
-			return fWorkbenchAdapter;
-		}
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return fFile.getName();
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 * @since 3.1
-	 */
-	public IPath getPath() {
-		return Path.fromOSString(fFile.getAbsolutePath());
-	}
-	
-	/*
-	 * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object)
-	 */
-	public IPath getPath(Object element) {
-		if (element instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) element;
-			return Path.fromOSString(input.fFile.getAbsolutePath());
-		}
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fFile.getAbsolutePath();
-	}
-	
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
-	
-	public int hashCode() {
-		return fFile.hashCode();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java
deleted file mode 100644
index 07b5068..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * Hyperlink for external files.
- */
-class ExternalFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private File fHyperlinkFile;
-	private IRegion fHyperlinkRegion;
-	
-	public ExternalFileHyperlink(IRegion region, File file) {
-		fHyperlinkFile = file;
-		fHyperlinkRegion = region;
-	}
-	
-	public IRegion getHyperlinkRegion() {
-		return fHyperlinkRegion;
-	}
-	
-	public String getHyperlinkText() {
-		return null;
-	}
-	
-	public String getTypeLabel() {
-		return null;
-	}
-	
-	public void open() {
-		if (fHyperlinkFile != null) {
-			IEditorInput input = new ExternalFileEditorInput(fHyperlinkFile);
-			IEditorDescriptor descriptor;
-			try {
-				descriptor = IDE.getEditorDescriptor(input.getName(), true);
-				if (descriptor != null) {
-					IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					IDE.openEditor(page, input, descriptor.getId(), true);
-				}
-			} catch (PartInitException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
deleted file mode 100644
index 90ca387..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.ui.JavaUI;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * Hyperlink for JSP Java elements
- */
-class JSDTHyperlink implements IHyperlink {
-	private IJavaElement fElement;
-	private IRegion fRegion;
-	
-	public JSDTHyperlink(IRegion region, IJavaElement element) {
-		fRegion = region;
-		fElement = element;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
-	 */
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	public void open() {
-		try {
-			IEditorPart editor = JavaUI.openInEditor(fElement);
-			if (editor != null) {
-				JavaUI.revealInEditor(editor, fElement);
-			}
-		} catch (Exception e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
deleted file mode 100644
index 173e5a2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IField;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.ILocalVariable;
-import org.eclipse.wst.jsdt.core.IMethod;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.ISourceReference;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * Detects hyperlinks in JSP Java content
- */
-public class JSDTHyperlinkDetector extends AbstractHyperlinkDetector {
-	private IHyperlink createHyperlink(IJavaElement element, IRegion region, IDocument document) {
-		IHyperlink link = null;
-		if (region != null) {
-			// open local variable in the JSP file...
-			if (element instanceof ISourceReference) {
-				IFile file = null;
-				IPath outsidePath = null;
-				int jspOffset = 0;
-				IStructuredModel sModel = null;
-				// try to locate the file in the workspace
-				try {
-					sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-					if (sModel != null) {
-						URIResolver resolver = sModel.getResolver();
-						if (resolver != null) {
-							String uriString = resolver.getFileBaseLocation();
-							file = getFile(uriString);
-						}
-					}
-				} finally {
-					if (sModel != null) {
-						sModel.releaseFromRead();
-					}
-				}
-				// get Java range, translate coordinate to JSP
-				try {
-					ISourceRange range = null;
-					IJsTranslation jspTranslation = getJSPTranslation(document);
-					if (jspTranslation != null) {
-						// link to local variable definitions
-						if (element instanceof ILocalVariable) {
-							range = ((ILocalVariable) element).getNameRange();
-							IJavaElement unit=((ILocalVariable) element).getParent();
-							ICompilationUnit myUnit = jspTranslation.getCompilationUnit();
-							
-							while(!(unit instanceof ICompilationUnit || unit instanceof IClassFile || unit==null)) {
-								unit = ((JavaElement) unit).getParent();
-							}
-							if(unit instanceof ICompilationUnit) {
-								ICompilationUnit cu = (ICompilationUnit)unit;
-								if(cu!=myUnit) {
-									file = getFile(cu.getPath().toString());
-									if(file==null) {
-										outsidePath = cu.getPath();
-									}
-								}
-							}else if(unit instanceof IClassFile) {
-								IClassFile cu = (IClassFile)unit;
-								if(cu!=myUnit) {
-									file = getFile(cu.getPath().toString());
-									if(file==null) {
-										outsidePath = cu.getPath();
-									}
-								}
-							}
-							
-						}
-						// linking to fields of the same compilation unit
-						else if (element.getElementType() == IJavaElement.FIELD) {
-							Object cu = ((IField) element).getCompilationUnit();
-							if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) {
-								range = ((ISourceReference) element).getSourceRange();
-							}
-						}
-						// linking to methods of the same compilation unit
-						else if (element.getElementType() == IJavaElement.METHOD) {
-							Object cu = ((IMethod) element).getCompilationUnit();
-							if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) {
-								range = ((ISourceReference) element).getSourceRange();
-							}
-						}
-					}
-					if (range != null && file != null) {
-						jspOffset = range.getOffset();
-						if (jspOffset >= 0) {
-							link = new WorkspaceFileHyperlink(region, file, new Region(jspOffset, range.getLength()));
-						}
-					}else if (range!=null && outsidePath!=null) {
-						jspOffset = range.getOffset();
-						if (jspOffset >= 0) {
-							link = new ExternalFileHyperlink(region,outsidePath.toFile());
-						}
-					}
-				} catch (JavaModelException jme) {
-					Logger.log(Logger.WARNING_DEBUG, jme.getMessage(), jme);
-				}
-			}
-			if (link == null) {
-				link = new JSDTHyperlink(region, element);
-			}
-		}
-		return link;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion, boolean)
-	 */
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		List hyperlinks = new ArrayList(0);
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			// check and make sure this is a valid Java type
-			JsTranslation jspTranslation = getJSPTranslation(document);
-			if (jspTranslation != null) {
-				// check if we are in JSP Java content
-				// check that we are not in indirect Java content (like
-				// included files)
-				// get Java elements
-				IJavaElement[] elements = jspTranslation.getElementsFromJsRange(region.getOffset(), region.getOffset() + region.getLength());
-				if (elements != null && elements.length > 0) {
-					// create a JSPJavaHyperlink for each Java element
-					for (int i = 0; i < elements.length; ++i) {
-						IJavaElement element = elements[i];
-						// find hyperlink range for Java element
-						IRegion hyperlinkRegion = selectWord(document, region.getOffset());
-						IHyperlink link = createHyperlink(element, hyperlinkRegion, document);
-						if (link != null) {
-							hyperlinks.add(link);
-						}
-					}
-				}
-			}
-		}
-		if (hyperlinks.size() == 0) {
-			return null;
-		}
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-	
-	/**
-	 * Returns an IFile from the given uri if possible, null if cannot find file
-	 * from uri.
-	 * 
-	 * @param fileString
-	 *            file system path
-	 * @return returns IFile if fileString exists in the workspace
-	 */
-	private IFile getFile(String fileString) {
-		IFile file = null;
-		if (fileString != null) {
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(fileString));
-			for (int i = 0; i < files.length && file == null; i++) {
-				if (files[i].exists()) {
-					file = files[i];
-				}
-			}
-		}
-		return file;
-	}
-	
-	/**
-	 * Get JSP translation object
-	 * 
-	 * @return JSPTranslation if one exists, null otherwise
-	 */
-	private JsTranslation getJSPTranslation(IDocument document) {
-		JsTranslation translation = null;
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (xmlModel != null) {
-				IDOMDocument xmlDoc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					translation = adapter.getJSPTranslation(true);
-				}
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return translation;
-	}
-	
-	/**
-	 * Java always selects word when defining region
-	 * 
-	 * @param document
-	 * @param anchor
-	 * @return IRegion
-	 */
-	private IRegion selectWord(IDocument document, int anchor) {
-		try {
-			int offset = anchor;
-			char c;
-			while (offset >= 0) {
-				c = document.getChar(offset);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				--offset;
-			}
-			int start = offset;
-			offset = anchor;
-			int length = document.getLength();
-			while (offset < length) {
-				c = document.getChar(offset);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				++offset;
-			}
-			int end = offset;
-			if (start == end) {
-				return new Region(start, 0);
-			}
-			return new Region(start + 1, end - start - 1);
-		} catch (BadLocationException x) {
-			return null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java
deleted file mode 100644
index f4e2c2a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * Hyperlink for URLs (opens in read-only mode)
- */
-class URLFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	static class StorageEditorInput implements IStorageEditorInput {
-		IStorage fStorage = null;
-		
-		StorageEditorInput(IStorage storage) {
-			fStorage = storage;
-		}
-		
-		public boolean exists() {
-			return fStorage != null;
-		}
-		
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-		
-		public ImageDescriptor getImageDescriptor() {
-			return null;
-		}
-		
-		public String getName() {
-			return fStorage.getName();
-		}
-		
-		public IPersistableElement getPersistable() {
-			return null;
-		}
-		
-		public IStorage getStorage() throws CoreException {
-			return fStorage;
-		}
-		
-		public String getToolTipText() {
-			return fStorage.getFullPath() != null ? fStorage.getFullPath().toString() : fStorage.getName();
-		}
-	}
-	static class URLStorage implements IStorage {
-		URL fURL = null;
-		
-		URLStorage(URL url) {
-			fURL = url;
-		}
-		
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-		
-		public InputStream getContents() throws CoreException {
-			InputStream stream = null;
-			try {
-				stream = fURL.openStream();
-			} catch (Exception e) {
-				throw new CoreException(new Status(IStatus.ERROR, JsUIPlugin.getDefault().getBundle().getSymbolicName(), IStatus.ERROR, fURL.toString(), e));
-			}
-			return stream;
-		}
-		
-		public IPath getFullPath() {
-			return new Path(fURL.toString());
-		}
-		
-		public String getName() {
-			return new Path(fURL.getFile()).lastSegment();
-		}
-		
-		public boolean isReadOnly() {
-			return true;
-		}
-	}
-	private IRegion fRegion;
-	private URL fURL;
-	
-	public URLFileHyperlink(IRegion region, URL url) {
-		fRegion = region;
-		fURL = url;
-	}
-	
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	public void open() {
-		if (fURL != null) {
-			IEditorInput input = new StorageEditorInput(new URLStorage(fURL));
-			IEditorDescriptor descriptor;
-			try {
-				descriptor = IDE.getEditorDescriptor(input.getName());
-				if (descriptor != null) {
-					IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					IDE.openEditor(page, input, descriptor.getId(), true);
-				}
-			} catch (PartInitException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java
deleted file mode 100644
index 5093ad2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * Hyperlink for files within the workspace. (As long as there is an IFile, this
- * can be used) Opens the default editor for the file.
- */
-class WorkspaceFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private IFile fFile;
-	private IRegion fHighlightRange;
-	private IRegion fRegion;
-	
-	public WorkspaceFileHyperlink(IRegion region, IFile file) {
-		fRegion = region;
-		fFile = file;
-	}
-	
-	public WorkspaceFileHyperlink(IRegion region, IFile file, IRegion range) {
-		fRegion = region;
-		fFile = file;
-		fHighlightRange = range;
-	}
-	
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void open() {
-		if (fFile != null && fFile.exists()) {
-			try {
-				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = IDE.openEditor(page, fFile, true);
-				// highlight range in editor if possible
-				if (fHighlightRange != null && editor instanceof ITextEditor) {
-					((ITextEditor) editor).setHighlightRange(fHighlightRange.getOffset(), fHighlightRange.getLength(), true);
-				}
-			} catch (PartInitException pie) {
-				Logger.log(Logger.WARNING_DEBUG, pie.getMessage(), pie);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java
deleted file mode 100644
index 02dcebf..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ /dev/null
@@ -1,490 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.URLHyperlink;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Detects hyperlinks in XML tags. Includes detection in DOCTYPE and attribute
- * values. Resolves references to schemas, dtds, etc using the Common URI
- * Resolver.
- * 
- */
-public class XMLHyperlinkDetector implements IHyperlinkDetector {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private final String HTTP_PROTOCOL = "http://";//$NON-NLS-1$
-	private final String NO_NAMESPACE_SCHEMA_LOCATION = "noNamespaceSchemaLocation"; //$NON-NLS-1$
-	private final String SCHEMA_LOCATION = "schemaLocation"; //$NON-NLS-1$
-	private final String XMLNS = "xmlns"; //$NON-NLS-1$
-	private final String XSI_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-	
-	/**
-	 * Create the appropriate hyperlink
-	 * 
-	 * @param uriString
-	 * @param hyperlinkRegion
-	 * @return IHyperlink
-	 */
-	private IHyperlink createHyperlink(String uriString, IRegion hyperlinkRegion, IDocument document, Node node) {
-		IHyperlink link = null;
-		if (isHttp(uriString)) {
-			link = new URLHyperlink(hyperlinkRegion, uriString);
-		} else {
-			// try to locate the file in the workspace
-			File systemFile = getFileFromUriString(uriString);
-			if (systemFile != null) {
-				String systemPath = systemFile.getPath();
-				IFile file = getFile(systemPath);
-				if (file != null) {
-					// this is a WorkspaceFileHyperlink since file exists in
-					// workspace
-					link = new WorkspaceFileHyperlink(hyperlinkRegion, file);
-				} else {
-					// this is an ExternalFileHyperlink since file does not
-					// exist in workspace
-					link = new ExternalFileHyperlink(hyperlinkRegion, systemFile);
-				}
-			}
-		}
-		return link;
-	}
-	
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		// for now, only capable of creating 1 hyperlink
-		List hyperlinks = new ArrayList(0);
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			Node currentNode = getCurrentNode(document, region.getOffset());
-			if (currentNode != null) {
-				String uriString = null;
-				if (currentNode.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-					// doctype nodes
-					uriString = getURIString(currentNode, document);
-				} else if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
-					// element nodes
-					Attr currentAttr = getCurrentAttrNode(currentNode, region.getOffset());
-					if (currentAttr != null) {
-						// try to find link for current attribute
-						// resolve attribute value
-						uriString = getURIString(currentAttr, document);
-						// verify validity of uri string
-						if (uriString == null || !isValidURI(uriString)) {
-							// reset current attribute
-							currentAttr = null;
-						}
-					}
-					if (currentAttr == null) {
-						// try to find a linkable attribute within element
-						currentAttr = getLinkableAttr((Element) currentNode);
-						if (currentAttr != null) {
-							uriString = getURIString(currentAttr, document);
-						}
-					}
-					currentNode = currentAttr;
-				}
-				// try to create hyperlink from information gathered
-				if (uriString != null && currentNode != null && isValidURI(uriString)) {
-					IRegion hyperlinkRegion = getHyperlinkRegion(currentNode);
-					IHyperlink hyperlink = createHyperlink(uriString, hyperlinkRegion, document, currentNode);
-					if (hyperlink != null) {
-						hyperlinks.add(hyperlink);
-					}
-				}
-			}
-		}
-		if (hyperlinks.size() == 0) {
-			return null;
-		}
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-	
-	/**
-	 * Get the base location from the current model (local file system)
-	 */
-	private String getBaseLocation(IDocument document) {
-		String baseLoc = null;
-		// get the base location from the current model
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (sModel != null) {
-				IPath location = new Path(sModel.getBaseLocation());
-				if (location.toFile().exists()) {
-					baseLoc = location.toString();
-				} else {
-					if (location.segmentCount() > 1) {
-						baseLoc = ResourcesPlugin.getWorkspace().getRoot().getFile(location).getLocation().toString();
-					} else {
-						baseLoc = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(location).toString();
-					}
-				}
-			}
-		} finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		return baseLoc;
-	}
-	
-	/**
-	 * Get the CMElementDeclaration for an element
-	 * 
-	 * @param element
-	 * @return CMElementDeclaration
-	 */
-	private CMElementDeclaration getCMElementDeclaration(Element element) {
-		CMElementDeclaration ed = null;
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if (mq != null) {
-			ed = mq.getCMElementDeclaration(element);
-		}
-		return ed;
-	}
-	
-	/**
-	 * Returns the attribute node within node at offset
-	 * 
-	 * @param node
-	 * @param offset
-	 * @return Attr
-	 */
-	private Attr getCurrentAttrNode(Node node, int offset) {
-		if ((node instanceof IndexedRegion) && ((IndexedRegion) node).contains(offset) && (node.hasAttributes())) {
-			NamedNodeMap attrs = node.getAttributes();
-			// go through each attribute in node and if attribute contains
-			// offset, return that attribute
-			for (int i = 0; i < attrs.getLength(); ++i) {
-				// assumption that if parent node is of type IndexedRegion,
-				// then its attributes will also be of type IndexedRegion
-				IndexedRegion attRegion = (IndexedRegion) attrs.item(i);
-				if (attRegion.contains(offset)) {
-					return (Attr) attrs.item(i);
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the node the cursor is currently on in the document. null if no
-	 * node is selected
-	 * 
-	 * @param offset
-	 * @return Node either element, doctype, text, or null
-	 */
-	private Node getCurrentNode(IDocument document, int offset) {
-		// get the current node at the offset (returns either: element,
-		// doctype, text)
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			inode = sModel.getIndexedRegion(offset);
-			if (inode == null) {
-				inode = sModel.getIndexedRegion(offset - 1);
-			}
-		} finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		if (inode instanceof Node) {
-			return (Node) inode;
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns an IFile from the given uri if possible, null if cannot find file
-	 * from uri.
-	 * 
-	 * @param fileString
-	 *            file system path
-	 * @return returns IFile if fileString exists in the workspace
-	 */
-	private IFile getFile(String fileString) {
-		IFile file = null;
-		if (fileString != null) {
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(fileString));
-			for (int i = 0; i < files.length && file == null; i++) {
-				if (files[i].exists()) {
-					file = files[i];
-				}
-			}
-		}
-		return file;
-	}
-	
-	/**
-	 * Create a file from the given uri string
-	 * 
-	 * @param uriString -
-	 *            assumes uriString is not http://
-	 * @return File created from uriString if possible, null otherwise
-	 */
-	private File getFileFromUriString(String uriString) {
-		File file = null;
-		try {
-			// first just try to create a file directly from uriString as
-			// default in case create file from uri does not work
-			file = new File(uriString);
-			// try to create file from uri
-			URI uri = new URI(uriString);
-			file = new File(uri);
-		} catch (Exception e) {
-			// if exception is thrown while trying to create File just ignore
-			// and file will be null
-		}
-		return file;
-	}
-	
-	private IRegion getHyperlinkRegion(Node node) {
-		IRegion hyperRegion = null;
-		if (node != null) {
-			short nodeType = node.getNodeType();
-			if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-				// handle doc type node
-				IDOMNode docNode = (IDOMNode) node;
-				hyperRegion = new Region(docNode.getStartOffset(), docNode.getEndOffset() - docNode.getStartOffset());
-			} else if (nodeType == Node.ATTRIBUTE_NODE) {
-				// handle attribute nodes
-				IDOMAttr att = (IDOMAttr) node;
-				// do not include quotes in attribute value region
-				int regOffset = att.getValueRegionStartOffset();
-				ITextRegion valueRegion = att.getValueRegion();
-				if (valueRegion != null) {
-					int regLength = valueRegion.getTextLength();
-					String attValue = att.getValueRegionText();
-					if (StringUtils.isQuoted(attValue)) {
-						++regOffset;
-						regLength = regLength - 2;
-					}
-					hyperRegion = new Region(regOffset, regLength);
-				}
-			}
-		}
-		return hyperRegion;
-	}
-	
-	/**
-	 * Attempts to find an attribute within element that is openable.
-	 * 
-	 * @param element -
-	 *            cannot be null
-	 * @return Attr attribute that can be used for open on, null if no attribute
-	 *         could be found
-	 */
-	private Attr getLinkableAttr(Element element) {
-		CMElementDeclaration ed = getCMElementDeclaration(element);
-		// get the list of attributes for this node
-		NamedNodeMap attrs = element.getAttributes();
-		for (int i = 0; i < attrs.getLength(); ++i) {
-			// check if this attribute is "openOn-able"
-			Attr att = (Attr) attrs.item(i);
-			if (isLinkableAttr(att, ed)) {
-				return att;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Find the location hint for the given namespaceURI if it exists
-	 * 
-	 * @param elementNode -
-	 *            cannot be null
-	 * @param namespaceURI -
-	 *            cannot be null
-	 * @return location hint (systemId) if it was found, null otherwise
-	 */
-	private String getLocationHint(Element elementNode, String namespaceURI) {
-		Attr schemaLocNode = elementNode.getAttributeNodeNS(XSI_NAMESPACE_URI, SCHEMA_LOCATION);
-		if (schemaLocNode != null) {
-			StringTokenizer st = new StringTokenizer(schemaLocNode.getValue());
-			while (st.hasMoreTokens()) {
-				String publicId = st.hasMoreTokens() ? st.nextToken() : null;
-				String systemId = st.hasMoreTokens() ? st.nextToken() : null;
-				// found location hint
-				if (namespaceURI.equalsIgnoreCase(publicId)) {
-					return systemId;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the URI string
-	 * 
-	 * @param node -
-	 *            assumes not null
-	 */
-	private String getURIString(Node node, IDocument document) {
-		String resolvedURI = null;
-		// need the base location, publicId, and systemId for URIResolver
-		String baseLoc = null;
-		String publicId = null;
-		String systemId = null;
-		short nodeType = node.getNodeType();
-		// handle doc type node
-		if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-			baseLoc = getBaseLocation(document);
-			publicId = ((DocumentType) node).getPublicId();
-			systemId = ((DocumentType) node).getSystemId();
-		} else if (nodeType == Node.ATTRIBUTE_NODE) {
-			// handle attribute node
-			Attr attrNode = (Attr) node;
-			String attrName = attrNode.getName();
-			String attrValue = attrNode.getValue();
-			attrValue = StringUtils.strip(attrValue);
-			if (attrValue != null && attrValue.length() > 0) {
-				baseLoc = getBaseLocation(document);
-				// handle schemaLocation attribute
-				String prefix = DOMNamespaceHelper.getPrefix(attrName);
-				String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-				if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-					publicId = attrValue;
-					systemId = getLocationHint(attrNode.getOwnerElement(), publicId);
-					if (systemId == null) {
-						systemId = attrValue;
-					}
-				} else if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attrNode))) && (SCHEMA_LOCATION.equals(unprefixedName))) {
-					// for now just use the first pair
-					// need to look into being more precise
-					StringTokenizer st = new StringTokenizer(attrValue);
-					publicId = st.hasMoreTokens() ? st.nextToken() : null;
-					systemId = st.hasMoreTokens() ? st.nextToken() : null;
-					// else check if xmlns publicId = value
-				} else {
-					systemId = attrValue;
-				}
-			}
-		}
-		resolvedURI = resolveURI(baseLoc, publicId, systemId);
-		return resolvedURI;
-	}
-	
-	/**
-	 * Returns true if this uriString is an http string
-	 * 
-	 * @param uriString
-	 * @return true if uriString is http string, false otherwise
-	 */
-	private boolean isHttp(String uriString) {
-		boolean isHttp = false;
-		if (uriString != null) {
-			String tempString = uriString.toLowerCase();
-			if (tempString.startsWith(HTTP_PROTOCOL)) {
-				isHttp = true;
-			}
-		}
-		return isHttp;
-	}
-	
-	/**
-	 * Checks to see if the given attribute is openable. Attribute is openable
-	 * if it is a namespace declaration attribute or if the attribute value is
-	 * of type URI.
-	 * 
-	 * @param attr
-	 *            cannot be null
-	 * @param cmElement
-	 *            CMElementDeclaration associated with the attribute (can be
-	 *            null)
-	 * @return true if this attribute is "openOn-able" false otherwise
-	 */
-	private boolean isLinkableAttr(Attr attr, CMElementDeclaration cmElement) {
-		String attrName = attr.getName();
-		String prefix = DOMNamespaceHelper.getPrefix(attrName);
-		String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-		// determine if attribute is namespace declaration
-		if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-			return true;
-		}
-		// determine if attribute contains schema location
-		if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attr))) && ((SCHEMA_LOCATION.equals(unprefixedName)) || (NO_NAMESPACE_SCHEMA_LOCATION.equals(unprefixedName)))) {
-			return true;
-		}
-		// determine if attribute value is of type URI
-		if (cmElement != null) {
-			CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) cmElement.getAttributes().getNamedItem(attrName);
-			if ((attrDecl != null) && (attrDecl.getAttrType() != null) && (CMDataType.URI.equals(attrDecl.getAttrType().getDataTypeName()))) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks whether the given uriString is really pointing to a file
-	 * 
-	 * @param uriString
-	 * @return boolean
-	 */
-	private boolean isValidURI(String uriString) {
-		boolean isValid = false;
-		if (isHttp(uriString)) {
-			isValid = true;
-		} else {
-			File file = getFileFromUriString(uriString);
-			if (file != null) {
-				isValid = file.isFile();
-			}
-		}
-		return isValid;
-	}
-	
-	/**
-	 * Resolves the given URI information
-	 * 
-	 * @param baseLocation
-	 * @param publicId
-	 * @param systemId
-	 * @return String resolved uri.
-	 */
-	private String resolveURI(String baseLocation, String publicId, String systemId) {
-		// dont resolve if there's nothing to resolve
-		if ((baseLocation == null) && (publicId == null) && (systemId == null)) {
-			return null;
-		}
-		return URIResolverPlugin.createResolver().resolve(baseLocation, publicId, systemId);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java
deleted file mode 100644
index 6bcf8d3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.DocumentChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.encoding.CodedStreamCreator;
-
-/**
- * Creates document change(s) for an IJavaElement rename. Changes are created
- * for every type "match" in the workspace
- * 
- * @author pavery
- */
-public class BasicRefactorSearchRequestor extends SearchRequestor {
-	/**
-	 * Change class that wraps a text edit on the jsp document
-	 */
-	private class RenameChange extends DocumentChange {
-		private String fDescription = JsUIMessages.BasicRefactorSearchRequestor_0;
-		private TextEdit fEdit = null;
-		private IDocument fJSPDoc = null;
-		private IFile fJSPFile = null;
-		
-		public RenameChange(IFile jspFile, IDocument jspDoc, TextEdit edit, String description) {
-			super(JsUIMessages.BasicRefactorSearchRequestor_6, jspDoc);
-			this.fEdit = edit;
-			this.fJSPFile = jspFile;
-			this.fJSPDoc = jspDoc;
-			this.fDescription = description;
-		}
-		
-		
-		public Object getModifiedElement() {
-			return getElement();
-		}
-		
-		
-		public String getName() {
-			return this.fDescription;
-		}
-		
-		
-		public IDocument getPreviewDocument(IProgressMonitor pm) throws CoreException {
-			IDocument copyDoc = new Document(fJSPDoc.get());
-			try {
-				fEdit.apply(copyDoc);
-			} catch (MalformedTreeException e) {
-				// ignore
-			} catch (BadLocationException e) {
-				// ignore
-			}
-			return copyDoc;
-		}
-		
-		/**
-		 * Checks if a document is open in an editor
-		 * 
-		 * @param jspDoc
-		 * @return
-		 */
-		private boolean isOpenInEditor(IDocument jspDoc) {
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-			IWorkbenchWindow w = null;
-			for (int i = 0; i < windows.length; i++) {
-				w = windows[i];
-				IWorkbenchPage page = w.getActivePage();
-				if (page != null) {
-					IEditorReference[] references = page.getEditorReferences();
-					IEditorPart editor = null;
-					Object o = null;
-					IDocument doc = null;
-					for (int j = 0; j < references.length; j++) {
-						editor = references[j].getEditor(true);
-						// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3764
-						// use adapter to get ITextEditor (for things like
-						// page designer)
-						o = editor.getAdapter(ITextEditor.class);
-						if (o != null && o instanceof ITextEditor) {
-							doc = ((ITextEditor) o).getDocumentProvider().getDocument(editor.getEditorInput());
-							if (doc != null && doc.equals(jspDoc)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-			return false;
-		}
-		
-		
-		public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-			return new RefactoringStatus();
-		}
-		
-		
-		public Change perform(IProgressMonitor pm) throws CoreException {
-			RenameChange undoChange = null;
-			try {
-				if (!isOpenInEditor(this.fJSPDoc)) {
-					// apply edit to JSP doc AND save model
-					undoChange = new RenameChange(this.fJSPFile, this.fJSPDoc, this.fEdit.apply(fJSPDoc), this.fDescription);
-					saveFile(this.fJSPFile, this.fJSPDoc);
-				} else {
-					// just apply edit to JSP document
-					undoChange = new RenameChange(this.fJSPFile, this.fJSPDoc, this.fEdit.apply(fJSPDoc), this.fDescription);
-				}
-			} catch (MalformedTreeException e) {
-				Logger.logException(e);
-			} catch (BadLocationException e) {
-				Logger.logException(e);
-			}
-			return undoChange;
-		}
-		
-		/**
-		 * Performed in an operation since it modifies resources in the
-		 * workspace
-		 * 
-		 * @param jspDoc
-		 * @throws CoreException
-		 */
-		private void saveFile(IFile jspFile, IDocument jspDoc) {
-			SaveJspFileOp op = new SaveJspFileOp(jspFile, jspDoc);
-			try {
-				op.run(JsSearchSupport.getInstance().getProgressMonitor());
-			} catch (InvocationTargetException e) {
-				Logger.logException(e);
-			} catch (InterruptedException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-	// end inner class SaveJspFileOp
-	/**
-	 * Workspace operation to perform save on model for updated documents.
-	 * Should only be done on models not open in an editor.
-	 */
-	private class SaveJspFileOp extends WorkspaceModifyOperation {
-		private IDocument fJSPDoc = null;
-		private IFile fJSPFile = null;
-		
-		public SaveJspFileOp(IFile jspFile, IDocument jspDoc) {
-			this.fJSPDoc = jspDoc;
-			this.fJSPFile = jspFile;
-		}
-		
-		
-		protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3765
-			// save file w/ no intermediate model creation
-			CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
-			Reader reader = new DocumentReader(this.fJSPDoc);
-			codedStreamCreator.set(this.fJSPFile, reader);
-			ByteArrayOutputStream codedByteStream = null;
-			InputStream codedStream = null;
-			try {
-				codedByteStream = codedStreamCreator.getCodedByteArrayOutputStream();
-				codedStream = new ByteArrayInputStream(codedByteStream.toByteArray());
-				if (this.fJSPFile.exists()) {
-					this.fJSPFile.setContents(codedStream, true, true, null);
-				} else {
-					this.fJSPFile.create(codedStream, false, null);
-				}
-			} catch (CoreException e) {
-				Logger.logException(e);
-			} catch (IOException e) {
-				Logger.logException(e);
-			} finally {
-				try {
-					if (codedByteStream != null) {
-						codedByteStream.close();
-					}
-					if (codedStream != null) {
-						codedStream.close();
-					}
-				} catch (IOException e) {
-					// unlikely
-				}
-			}
-		}
-	}
-	// end inner class RenameChange
-	/** The type being renamed (the old type) */
-	IJavaElement fElement = null;
-	/** The new name of the type being renamed */
-	private String fNewName = ""; //$NON-NLS-1$
-	/** maps a JSPSearchDocument path -> MultiTextEdit for the java file */
-	private HashMap fSearchDocPath2JavaEditMap = null;
-	
-	public BasicRefactorSearchRequestor(IJavaElement element, String newName) {
-		this.fNewName = newName;
-		this.fElement = element;
-		this.fSearchDocPath2JavaEditMap = new HashMap();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.wst.jsdt.core.search.SearchMatch)
-	 */
-	
-	public void acceptSearchMatch(SearchMatch javaMatch) throws CoreException {
-		String matchDocumentPath = javaMatch.getResource().getFullPath().toString();
-		SearchDocument searchDoc = JsSearchSupport.getInstance().getSearchDocument(matchDocumentPath);
-		if (searchDoc != null && searchDoc instanceof JSDTSearchDocumentDelegate) {
-			String renameText = getRenameText((JSDTSearchDocumentDelegate) searchDoc, javaMatch);
-			// add it for the correct document
-			addJavaEdit(searchDoc.getPath(), new ReplaceEdit(javaMatch.getOffset(), javaMatch.getLength(), renameText));
-		}
-	}
-	
-	/**
-	 * Adds to the multi edit for a give java document.
-	 * 
-	 * @param javaDocument
-	 * @param javaEdit
-	 */
-	private void addJavaEdit(String searchDocPath, ReplaceEdit javaEdit) {
-		Object o = this.fSearchDocPath2JavaEditMap.get(searchDocPath);
-		if (o != null) {
-			MultiTextEdit multi = (MultiTextEdit) o;
-			multi.addChild(javaEdit);
-		} else {
-			// use a multi edit so doc position offsets get updated
-			// automatically
-			// when adding multiple child edits
-			MultiTextEdit multi = new MultiTextEdit();
-			multi.addChild(javaEdit);
-			this.fSearchDocPath2JavaEditMap.put(searchDocPath, multi);
-		}
-	}
-	
-	private Change createChange(JSDTSearchDocumentDelegate searchDoc, TextEdit edit) {
-		IDocument doc = searchDoc.getJspTranslation().getHtmlDocument();
-		String file = searchDoc.getFile().getName();
-		String description = getDescription();
-		try {
-			// document lines are 0 based
-			String lineNumber = Integer.toString(doc.getLineOfOffset(edit.getOffset()) + 1);
-			description += " " + NLS.bind(JsUIMessages.BasicRefactorSearchRequestor_1, new String[] { file, lineNumber }); //$NON-NLS-1$
-		} catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-		return new RenameChange(searchDoc.getFile(), doc, edit, description);
-	}
-	
-	/**
-	 * 
-	 * @return all JSP changes for the search matches for the given Type
-	 */
-	public Change[] getChanges() {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		List changes = new ArrayList();
-		Iterator keys = fSearchDocPath2JavaEditMap.keySet().iterator();
-		String searchDocPath = null;
-		SearchDocument delegate = null;
-		while (keys.hasNext()) {
-			// create on the fly
-			searchDocPath = (String) keys.next();
-			MultiTextEdit javaEdit = (MultiTextEdit) fSearchDocPath2JavaEditMap.get(searchDocPath);
-			delegate = support.getSearchDocument(searchDocPath);
-			if (delegate != null && delegate instanceof JSDTSearchDocumentDelegate) {
-				JSDTSearchDocumentDelegate javaDelegate = (JSDTSearchDocumentDelegate) delegate;
-				changes.add(createChange(javaDelegate, javaEdit));
-			}
-		}
-		return (Change[]) changes.toArray(new Change[changes.size()]);
-	}
-	
-	/**
-	 * Subclasses should override to better describe the change.
-	 * 
-	 * @return
-	 */
-	protected String getDescription() {
-		return ""; //$NON-NLS-1$
-	}
-	
-	public IJavaElement getElement() {
-		return this.fElement;
-	}
-	
-	/**
-	 * @return the new name for the Type
-	 */
-	public String getNewName() {
-		return this.fNewName;
-	}
-	
-	/**
-	 * @param searchDoc
-	 * @return
-	 */
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		return getNewName();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
deleted file mode 100644
index 0d54b97..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-class JSPJavaSelectionProvider {
-	static IJavaElement[] getSelection(ITextEditor textEditor) {
-		IJavaElement[] elements = null;
-		IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-		ISelection selection = textEditor.getSelectionProvider().getSelection();
-		if (selection instanceof ITextSelection) {
-			ITextSelection textSelection = (ITextSelection) selection;
-			// get the JSP translation object for this editor's document
-			IStructuredModel model = null;
-			try {
-				model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-				if (model instanceof IDOMModel) {
-					IDOMModel xmlModel = (IDOMModel) model;
-					IDOMDocument xmlDoc = xmlModel.getDocument();
-					JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-					if (adapter != null) {
-						JsTranslation translation = adapter.getJSPTranslation(true);
-						elements = translation.getElementsFromJsRange(textSelection.getOffset(), textSelection.getOffset() + textSelection.getLength());
-					}
-				}
-			} finally {
-				if (model != null) {
-					model.releaseFromRead();
-				}
-			}
-		}
-		if (elements == null) {
-			elements = new IJavaElement[0];
-		}
-		return elements;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java
deleted file mode 100644
index a895ec0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IMethod;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPMethodRenameChange extends Change {
-	public static Change[] createChangesFor(IMethod method, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		BasicRefactorSearchRequestor requestor = new JSPMethodRenameRequestor(method, newName);
-		support.searchRunnable(method, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// pa_TODO Auto-generated method stub
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// pa_TODO return the "undo" change here
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java
deleted file mode 100644
index 9dfd3ce..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 May 6, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IMethod;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-
-/**
- * @author pavery
- */
-public class JSPMethodRenameParticipant extends RenameParticipant {
-	private IMethod fMethod = null;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPMethodRenameChange.createChangesFor(this.fMethod, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fMethod != null) {
-			try {
-				name = this.fMethod.getSource();
-			} catch (JavaModelException e) {
-				Logger.logException(e);
-			}
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IMethod) {
-			this.fMethod = (IMethod) element;
-			return true;
-		}else if (element instanceof IJavaWebNode) {
-			if(((IJavaWebNode)element).getJavaElement() instanceof IMethod) {
-				this.fMethod = (IMethod) ((IJavaWebNode)element).getJavaElement();
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java
deleted file mode 100644
index b999703..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPMethodRenameRequestor extends BasicRefactorSearchRequestor {
-	public JSPMethodRenameRequestor(IJavaElement element, String newName) {
-		super(element, newName);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String methodName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_3, new String[] { methodName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String javaText = searchDoc.getJspTranslation().getJsText();
-		String methodText = javaText.substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		String methodSuffix = methodText.substring(methodText.indexOf("(")); //$NON-NLS-1$
-		return getNewName() + methodSuffix;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java
deleted file mode 100644
index 3a3fb28..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
-
-/**
- * An action delegate that launches JDT move element wizard
- * 
- * Still relies heavily on internal API will change post 3.0 with public move
- * support https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
- */
-public class JSPMoveElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	// private IEditorPart fEditor;
-	public void dispose() {
-	// nulling out just in case
-	// fEditor = null;
-	}
-	
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(JsUIMessages.MoveElement_label);
-			action.setToolTipText(JsUIMessages.MoveElement_label);
-		}
-	}
-	
-	public void init(IViewPart view) {
-	// do nothing
-	}
-	
-	public void run(IAction action) {
-	// no-op until we know how we're supposed to use this
-	// eclipse 3.2M5
-	// public move support:
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
-	// IJavaElement[] elements = getSelectedElements();
-	// if (elements.length > 0) {
-	//
-	// // need to check if it's movable
-	// try {
-	// JavaMoveProcessor processor =
-	// JavaMoveProcessor.create(getResources(elements), elements);
-	//				
-	// Shell parent =
-	// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-	// MoveRefactoring refactoring = new MoveRefactoring(processor);
-	//
-	// RefactoringWizard wizard = createWizard(refactoring);
-	//
-	// /*
-	// * We want to get the shell from the refactoring dialog but
-	// * it's not known at this point, so we pass the wizard and
-	// * then, once the dialog is open, we will have access to its
-	// * shell.
-	// */
-	//
-	// processor.setCreateTargetQueries(new CreateTargetQueries(wizard));
-	// processor.setReorgQueries(new ReorgQueries(wizard));
-	// // String openRefactoringWizMsg =
-	// //
-	// RefactoringMessages.getString("OpenRefactoringWizardAction.refactoring");
-	// // //$NON-NLS-1$
-	// String openRefactoringWizMsg = JSPUIMessages.MoveElementWizard; //
-	// "Move
-	// // the
-	// // selected
-	// // elements";
-	// // //$NON-NLS-1$
-	// new RefactoringStarter().activate(refactoring, wizard, parent,
-	// openRefactoringWizMsg, true);
-	//
-	// PlatformStatusLineUtil.clearStatusLine();
-	//
-	// }
-	// catch (JavaModelException e) {
-	// Logger.logException(e);
-	// }
-	// }
-	// else {
-	// PlatformStatusLineUtil.displayErrorMessage(JSPUIMessages.JSPMoveElementAction_0);
-	// //$NON-NLS-1$
-	// }
-	}
-	
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		PlatformStatusLineUtil.clearStatusLine();
-	}
-	
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-	// fEditor = targetEditor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java
deleted file mode 100644
index a4c2c78..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPPackageRenameChange extends Change {
-	public static Change[] createChangesFor(IPackageFragment pkg, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		BasicRefactorSearchRequestor requestor = new JSPPackageRenameRequestor(pkg, newName);
-		support.searchRunnable(pkg, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// return this.pkg;
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java
deleted file mode 100644
index e34ef9a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * Remember to change the plugin.xml file if the name of this class changes.
- * 
- * @author pavery
- */
-public class JSPPackageRenameParticipant extends RenameParticipant {
-	private IPackageFragment fPkg = null;
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPPackageRenameChange.createChangesFor(this.fPkg, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fPkg != null) {
-			name = this.fPkg.getElementName();
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IPackageFragment) {
-			this.fPkg = (IPackageFragment) element;
-			return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java
deleted file mode 100644
index 4a7738d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * Overrides get description
- * 
- * @author pavery
- */
-public class JSPPackageRenameRequestor extends BasicRefactorSearchRequestor {
-	/**
-	 * Element is the old package. newName is the new package name.
-	 * 
-	 * @param element
-	 * @param newName
-	 */
-	public JSPPackageRenameRequestor(IJavaElement element, String newName) {
-		super(element, newName);
-	}
-	
-	/*
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String packageName = getElement().getElementName();
-		String newName = getNewName();
-		String description = NLS.bind(JsUIMessages.BasicRefactorSearchRequestor_5, (new String[] { packageName, newName }));
-		return description;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java
deleted file mode 100644
index 7676a7d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.IMethod;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.ui.refactoring.RenameSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
-
-/**
- * An action delegate that launches JDT rename element wizard
- */
-public class JSPRenameElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	private IEditorPart fEditor;
-	
-	public void dispose() {
-		// nulling out just in case
-		fEditor = null;
-	}
-	
-	private IJavaElement getSelectedElement() {
-		IJavaElement element = null;
-		if (fEditor instanceof ITextEditor) {
-			IJavaElement[] elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor);
-			if (elements.length == 1) {
-				element = elements[0];
-			}
-		}
-		return element;
-	}
-	
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(JsUIMessages.RenameElement_label);
-			action.setToolTipText(JsUIMessages.RenameElement_label);
-		}
-	}
-	
-	public void init(IViewPart view) {
-	// do nothing
-	}
-	
-	public void run(IAction action) {
-		IJavaElement element = getSelectedElement();
-		if (element != null) {
-			RenameSupport renameSupport = null;
-			try {
-				switch (element.getElementType()) {
-					case IJavaElement.TYPE:
-						renameSupport = RenameSupport.create((IType) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-					case IJavaElement.METHOD:
-						renameSupport = RenameSupport.create((IMethod) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-					case IJavaElement.PACKAGE_FRAGMENT:
-						renameSupport = RenameSupport.create((IPackageFragment) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-				}
-				if (renameSupport != null) {
-					renameSupport.openDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-					PlatformStatusLineUtil.clearStatusLine();
-				}
-			} catch (CoreException e) {
-				Logger.logException(e);
-			}
-		} else {
-			PlatformStatusLineUtil.displayErrorMessage(JsUIMessages.JSPRenameElementAction_0);
-			PlatformStatusLineUtil.addOneTimeClearListener();
-		}
-	}
-	
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		PlatformStatusLineUtil.clearStatusLine();
-	}
-	
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		fEditor = targetEditor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java
deleted file mode 100644
index abda4f9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPTypeMoveChange extends Change {
-	public static Change[] createChangesFor(IType type, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		JSPTypeMoveRequestor requestor = new JSPTypeMoveRequestor(type, newName);
-		support.searchRunnable(type, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java
deleted file mode 100644
index 4e108ba..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPTypeMoveParticipant extends MoveParticipant {
-	IType fType = null;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		if (pm != null && pm.isCanceled()) {
-			return null;
-		}
-		CompositeChange multiChange = null;
-		Object dest = getArguments().getDestination();
-		if (dest instanceof IPackageFragment) {
-			Change[] changes = JSPTypeMoveChange.createChangesFor(fType, ((IPackageFragment) dest).getElementName());
-			if (changes.length > 0) {
-				multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-			}
-		}
-		return multiChange;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fType != null) {
-			name = this.fType.getElementName();
-		}
-		return name;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			this.fType = (IType) element;
-			return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java
deleted file mode 100644
index a8a4ed5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPTypeMoveRequestor extends BasicRefactorSearchRequestor {
-	/**
-	 * @param element
-	 * @param newName
-	 */
-	public JSPTypeMoveRequestor(IJavaElement element, String newPackage) {
-		super(element, newPackage);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String typeName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_2, new String[] { typeName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String renameText = getElement().getElementName();
-		JsTranslation trans = searchDoc.getJspTranslation();
-		String matchText = trans.getJsText().substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		// if it's an import or jsp:useBean, we need to add the package name as
-		// well
-// if (trans.isImport(javaMatch.getOffset())
-//			
-// || isFullyQualified(matchText)) {
-// if (!getNewName().equals("")) {
-// // getNewName() is the pkg name
-// renameText = getNewName() + "." + renameText; //$NON-NLS-1$
-// }
-// }
-		return renameText;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java
deleted file mode 100644
index e18423e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * @author pavery
- */
-public class JSPTypeRenameChange extends Change {
-	public static Change[] createChangesFor(IType type, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		JSPTypeRenameRequestor requestor = new JSPTypeRenameRequestor(type, newName);
-		support.searchRunnable(type, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java
deleted file mode 100644
index 50ba712..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IMethod;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-
-/**
- * Remember to change the plugin.xml file if the name of this class changes.
- * 
- * @author pavery
- */
-public class JSPTypeRenameParticipant extends RenameParticipant {
-	private IType fType = null;
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPTypeRenameChange.createChangesFor(fType, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fType != null) {
-			try {
-				name = this.fType.getSource();
-			} catch (JavaModelException e) {
-				Logger.logException(e);
-			}
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			this.fType = (IType) element;
-			return true;
-		}else if (element instanceof IJavaWebNode) {
-			if(((IJavaWebNode)element).getJavaElement() instanceof IType) {
-				this.fType = (IType) ((IJavaWebNode)element).getJavaElement();
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java
deleted file mode 100644
index 0c900b8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
- * Creates document change(s) for a type rename. Changes are created for every
- * type "match" in the workspace
- * 
- * @author pavery
- */
-public class JSPTypeRenameRequestor extends BasicRefactorSearchRequestor {
-	public JSPTypeRenameRequestor(IType type, String newName) {
-		super(type, newName);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String typeName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_4, new String[] { typeName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String renameText = getNewName();
-		String pkg = getType().getPackageFragment().getElementName();
-		JsTranslation trans = searchDoc.getJspTranslation();
-		String matchText = trans.getJsText().substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		// if it's an import or jsp:useBean or fully qualified type, we need to
-		// add the package name as well
-// if (trans.isImport(javaMatch.getOffset())
-// || /* trans.isUseBean(javaMatch.getOffset()) ||
-// */isFullyQualified(matchText)) {
-// if (!pkg.equals("")) {
-// renameText = pkg + "." + renameText; //$NON-NLS-1$
-// }
-// }
-		return renameText;
-	}
-	
-	private IType getType() {
-		return (IType) getElement();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java
deleted file mode 100644
index 5098d90..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JSDTSearchDocumentDelegate;
-
-/**
- * Accepts matches from JSPSearchSupport.search(...) request. Adapts the results
- * from java to JSP and displays in the SearchResultView.
- * 
- * @author pavery
- */
-public class BasicJsSearchRequestor extends SearchRequestor {
-	// for debugging
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Maps java search coordinates to corresponding JSP coordinates. Adds the
-	 * matches to the Search Results view.
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.wst.jsdt.core.search.SearchMatch)
-	 */
-	
-	public void acceptSearchMatch(SearchMatch match) throws CoreException {
-		if (JsSearchSupport.getInstance().isCanceled()) {
-			return;
-		}
-		String matchDocumentPath = match.getResource().getFullPath().toString();
-		SearchDocument searchDoc = JsSearchSupport.getInstance().getSearchDocument(matchDocumentPath);
-		if (searchDoc != null && searchDoc instanceof JSDTSearchDocumentDelegate) {
-			JSDTSearchDocumentDelegate javaSearchDoc = (JSDTSearchDocumentDelegate) searchDoc;
-			int jspStart = match.getOffset();
-			int jspEnd = match.getOffset() + match.getLength();
-			JsTranslation trans = javaSearchDoc.getJspTranslation();
-			String jspText = trans.getHtmlText();
-			String javaText = javaSearchDoc.getJavaText();
-			if (BasicJsSearchRequestor.DEBUG) {
-				displayDebugInfo(match, jspStart, jspEnd, jspText, javaText);
-			}
-			if (jspStart > -1 && jspEnd > -1) {
-				addSearchMatch(new Document(trans.getHtmlText()), javaSearchDoc.getFile(), jspStart, jspEnd, jspText);
-			}
-		}
-	}
-	
-	/**
-	 * @param searchDoc
-	 * @param jspStart
-	 * @param jspEnd
-	 * @param jspTranslation
-	 * @param jspText
-	 * @throws CoreException
-	 */
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-	// implement in subclass
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#beginReporting()
-	 */
-	
-	public void beginReporting() {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: beginReporting()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * For debug.
-	 * 
-	 * @param origMatch
-	 * @param jspStart
-	 * @param jspEnd
-	 * @param jspText
-	 * @param javaText
-	 */
-	private void displayDebugInfo(SearchMatch origMatch, int jspStart, int jspEnd, String jspText, String javaText) {
-		if (origMatch == null || jspStart == -1 || jspEnd == -1 || jspEnd < jspStart || jspText == null || javaText == null) {
-			return;
-		}
-		System.out.println("+-----------------------------------------+"); //$NON-NLS-1$
-		System.out.println("accept possible match [jspDoc: " + origMatch.getResource().getFullPath().toOSString() + " " + origMatch.getOffset() + ":" + origMatch.getOffset() + origMatch.getLength() + "]?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		System.out.println("match info:"); //$NON-NLS-1$
-		System.out.println("the java text is:" + javaText.substring(origMatch.getOffset(), origMatch.getOffset() + origMatch.getLength())); //$NON-NLS-1$
-		System.out.println("java search match translates to jsp coords [start: " + jspStart + " end:" + jspEnd + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		System.out.println(" the jsp text is:" + jspText.substring(jspStart, jspEnd)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#endReporting()
-	 */
-	
-	public void endReporting() {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: endReporting()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#enterParticipant(org.eclipse.wst.jsdt.core.search.SearchParticipant)
-	 */
-	
-	public void enterParticipant(SearchParticipant participant) {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: enterParticipant()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#exitParticipant(org.eclipse.wst.jsdt.core.search.SearchParticipant)
-	 */
-	
-	public void exitParticipant(SearchParticipant participant) {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: exitParticipant()"); //$NON-NLS-1$
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java
deleted file mode 100644
index b87dd14..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesProcessor;
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionDelegate;
-
-/**
- * Sets up FindOccurrencesActionDelegate for jsp find occurrences processors
- */
-public class JsFindOccurrencesActionDelegate extends FindOccurrencesActionDelegate {
-	private List fProcessors;
-	
-	
-	protected List getProcessors() {
-		if (fProcessors == null) {
-			fProcessors = new ArrayList();
-			HTMLFindOccurrencesProcessor htmlProcessor = new HTMLFindOccurrencesProcessor();
-			fProcessors.add(htmlProcessor);
-			// temporary, workaround to disable function, since using the
-			// function
-			// can easily cause deadlock to occur.
-			// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=103662
-// JSPFindOccurrencesProcessor jspProcessor = new
-// JSPFindOccurrencesProcessor();
-// fProcessors.add(jspProcessor);
-		}
-		return fProcessors;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
deleted file mode 100644
index bfa2ad6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.text.IJsPartitions;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * Configures a FindOccurrencesProcessor with JSP partitions and regions
- */
-public class JsFindOccurrencesProcessor extends FindOccurrencesProcessor {
-	private IJavaElement getJavaElement(IDocument document, ITextSelection textSelection) {
-		IJavaElement[] elements = getJavaElementsForCurrentSelection(document, textSelection);
-		return elements.length > 0 ? elements[0] : null;
-	}
-	
-	/**
-	 * uses JSPTranslation to get currently selected Java elements.
-	 * 
-	 * @return currently selected IJavaElements
-	 */
-	private IJavaElement[] getJavaElementsForCurrentSelection(IDocument document, ITextSelection selection) {
-		IJavaElement[] elements = new IJavaElement[0];
-		// get JSP translation object for this viewer's document
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null && model instanceof IDOMModel) {
-				IDOMDocument xmlDoc = ((IDOMModel) model).getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					JsTranslation translation = adapter.getJSPTranslation(true);
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102211
-					elements = translation.getElementsFromJsRange(selection.getOffset(), selection.getOffset() + selection.getLength());
-				}
-			}
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return elements;
-	}
-	
-	
-	protected String[] getPartitionTypes() {
-		return new String[] { IJsPartitions.HtmlJsPartition };
-	}
-	
-	
-	protected String[] getRegionTypes() {
-		return new String[] { DOMRegionContext.BLOCK_TEXT };
-	}
-	
-	
-	protected ISearchQuery getSearchQuery(IFile file, IStructuredDocument document, String regionText, String regionType, ITextSelection textSelection) {
-		return new JsSearchQuery(file, getJavaElement(document, textSelection));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java
deleted file mode 100644
index 9a3e7fa..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.sse.ui.internal.search.OccurrencesSearchResult;
-
-/**
- * @author pavery
- */
-public class JsOccurrencesSearchResult extends OccurrencesSearchResult {
-	public JsOccurrencesSearchResult(ISearchQuery query) {
-		super(query);
-	}
-	
-	
-	public Match[] getMatches() {
-		return ((JsSearchQuery) getQuery()).getMatches();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java
deleted file mode 100644
index 46b8702..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.search.BasicSearchQuery;
-
-/**
- * Implementation of <code>ISearchQuery</code> for <code>IJavaElement</code>s
- * in JSP files.
- * 
- * @author pavery
- */
-public class JsSearchQuery extends BasicSearchQuery {
-	/** the IJavaElement we are searching for in the file * */
-	private IJavaElement fElement = null;
-	
-	public JsSearchQuery(IFile file, IJavaElement element) {
-		super(file);
-		this.fElement = element;
-	}
-	
-	
-	public boolean canRerun() {
-		return false;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
-	 */
-	
-	public boolean canRunInBackground() {
-		return true;
-	}
-	
-	
-	protected IStatus doQuery() {
-		clearMatches();
-		IStatus status = Status.OK_STATUS;
-		try {
-			JsSearchSupport support = JsSearchSupport.getInstance();
-			// index the file
-			SearchDocument delegate = support.addJspFile(getFile());
-			String scopePath = delegate.getPath();
-			JsSearchScope singleFileScope = new JsSearchScope(new String[] { getFile().getFullPath().toString(), scopePath });
-			// perform a searchs
-			// by passing in this jsp search query, requstor can add matches
-			// support.searchRunnable(getJavaElement(), singleFileScope, new
-			// JSPSingleFileSearchRequestor(getInstance()));
-			support.searchRunnable(getJavaElement(), singleFileScope, new JsSingleFileSearchRequestor(getInstance()));
-		} catch (Exception e) {
-			status = new Status(IStatus.ERROR, "org.eclipse.wst.sse.ui", IStatus.OK, "", null); //$NON-NLS-1$	//$NON-NLS-2$
-		}
-		return status;
-	}
-	
-	private String getFilename() {
-		String filename = JsUIMessages.OccurrencesSearchQuery_2;
-		if (getFile() != null) {
-			filename = getFile().getName();
-		}
-		return filename;
-	}
-	
-	// for access by inner class
-	public JsSearchQuery getInstance() {
-		return this;
-	}
-	
-	public IJavaElement getJavaElement() {
-		return this.fElement;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
-	 */
-	
-	public String getLabel() {
-		String[] args = { getSearchText(), getOccurrencesCountText(), getFilename() };
-		return NLS.bind(JsUIMessages.OccurrencesSearchQuery_0, args);
-	}
-	
-	private String getOccurrencesCountText() {
-		String count = ""; //$NON-NLS-1$
-		// pa_TODO make dynamic
-		return count;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	
-	public ISearchResult getSearchResult() {
-		return new JsOccurrencesSearchResult(this);
-	}
-	
-	
-	protected String getSearchText() {
-		return fElement.getElementName();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java
deleted file mode 100644
index 05149e7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.jsdt.ui.search.ISearchRequestor;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * @author pavery
- */
-public class JsSearchRequestor extends BasicJsSearchRequestor {
-	private ISearchRequestor fJavaRequestor = null;
-	
-	public JsSearchRequestor() {
-		super();
-	}
-	
-	public JsSearchRequestor(ISearchRequestor javaRequestor) {
-		// need to report matches to javaRequestor
-		this.fJavaRequestor = javaRequestor;
-	}
-	
-	
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-		if (!jspFile.exists()) {
-			return;
-		}
-		int lineNumber = -1;
-		try {
-			lineNumber = jspDocument.getLineOfOffset(jspStart);
-		} catch (BadLocationException e) {
-			Logger.logException("offset: " + Integer.toString(jspStart), e); //$NON-NLS-1$
-		}
-		createSearchMarker(jspFile, jspStart, jspEnd, lineNumber);
-		if (this.fJavaRequestor != null) {
-			Match match = new Match(jspFile, jspStart, jspEnd - jspStart);
-			this.fJavaRequestor.reportMatch(match);
-		}
-	}
-	
-	/**
-	 * @param jspFile
-	 * @param jspStart
-	 * @param jspEnd
-	 */
-	private void createSearchMarker(IFile jspFile, int jspStart, int jspEnd, int lineNumber) {
-		try {
-			IMarker marker = jspFile.createMarker(NewSearchUI.SEARCH_MARKER);
-			HashMap attributes = new HashMap(4);
-			attributes.put(IMarker.CHAR_START, new Integer(jspStart));
-			attributes.put(IMarker.CHAR_END, new Integer(jspEnd));
-			attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-			marker.setAttributes(attributes);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java
deleted file mode 100644
index 60fc490..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-
-/**
- * <p>
- * Special requestor that adds search results for single file search (Used for
- * JSPFindOccurrences action). It groups each match as it's own result.
- * </p>
- * 
- * @author pavery
- */
-public class JsSingleFileSearchRequestor extends BasicJsSearchRequestor {
-	private JsSearchQuery fQuery = null;
-	
-	public JsSingleFileSearchRequestor(JsSearchQuery query) {
-		this.fQuery = query;
-	}
-	
-	
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-		// add match to JSP query...
-		this.fQuery.addMatch(jspDocument, jspStart, jspEnd);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java
deleted file mode 100644
index b85da44..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search.ui;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.wst.jsdt.ui.search.IMatchPresentation;
-import org.eclipse.wst.sse.ui.internal.search.BasicSearchLabelProvider;
-
-/**
- * @author pavery
- */
-public class JsMatchPresentation implements IMatchPresentation {
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IMatchPresentation#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new BasicSearchLabelProvider();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.ui.search.IMatchPresentation#showMatch(org.eclipse.search.ui.text.Match,
-	 *      int, int, boolean)
-	 */
-	public void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException {
-		// pa_TODO implement
-		// Object obj = match.getElement();
-		// show match in JSP editor
-		if (activate) {
-			// use show in target?
-		} else {
-			// just select
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java
deleted file mode 100644
index 22dbf45..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.java.search.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.ui.search.ElementQuerySpecification;
-import org.eclipse.wst.jsdt.ui.search.IMatchPresentation;
-import org.eclipse.wst.jsdt.ui.search.IQueryParticipant;
-import org.eclipse.wst.jsdt.ui.search.ISearchRequestor;
-import org.eclipse.wst.jsdt.ui.search.PatternQuerySpecification;
-import org.eclipse.wst.jsdt.ui.search.QuerySpecification;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.internal.java.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.java.search.JsSearchRequestor;
-
-/**
- * @author pavery
- */
-public class JsQueryParticipant implements IQueryParticipant {
-	// for debugging
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#estimateTicks(org.eclipse.wst.jsdt.ui.search.QuerySpecification)
-	 */
-	public int estimateTicks(QuerySpecification data) {
-		// pa_TODO use project file counter from JSPSearchSupport...
-		return 0;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#getUIParticipant()
-	 */
-	public IMatchPresentation getUIParticipant() {
-		return new JsMatchPresentation();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#search(org.eclipse.wst.jsdt.ui.search.ISearchRequestor,
-	 *      org.eclipse.wst.jsdt.ui.search.QuerySpecification,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void search(ISearchRequestor requestor, QuerySpecification querySpecification, IProgressMonitor monitor) throws CoreException {
-		// indexIfNeeded();
-		// do search based on the particular Java query
-		if (querySpecification instanceof ElementQuerySpecification) {
-			// element search (eg. from global find references in Java file)
-			ElementQuerySpecification elementQuery = (ElementQuerySpecification) querySpecification;
-			IJavaElement element = elementQuery.getElement();
-			if (JsQueryParticipant.DEBUG) {
-				System.out.println("JSP Query Participant searching on ELEMENT: " + element); //$NON-NLS-1$
-			}
-			SearchRequestor jspRequestor = new JsSearchRequestor(requestor);
-			// pa_TODO need to adapt JavaSearchScope to a JSPSearchScope
-			JsSearchSupport.getInstance().search(element, new JsSearchScope(), jspRequestor);
-		} else if (querySpecification instanceof PatternQuerySpecification) {
-			// pattern search (eg. from Java search page)
-			PatternQuerySpecification patternQuery = (PatternQuerySpecification) querySpecification;
-			String pattern = patternQuery.getPattern();
-			if (JsQueryParticipant.DEBUG) {
-				System.out.println("JSP Query Participant searching on PATTERN: " + pattern); //$NON-NLS-1$
-			}
-			SearchRequestor jspRequestor = new JsSearchRequestor(requestor);
-			JsSearchSupport.getInstance().search(pattern, new JsSearchScope(), patternQuery.getSearchFor(), patternQuery.getLimitTo(), SearchPattern.R_PATTERN_MATCH, false, jspRequestor);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java
deleted file mode 100644
index caef8e9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.registry;
-
-import org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapterFactory;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JFaceNodeAdapterFactoryForJSDT;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-
-public class AdapterFactoryProviderForJSDT implements AdapterFactoryProvider {
-	/*
-	 * @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
-	 */
-	public void addAdapterFactories(IStructuredModel structuredModel) {
-		// these are the main factories, on model's factory registry
-		addContentBasedFactories(structuredModel);
-		// -------
-		// Must update/add to propagating adapters here too
-		addPropagatingAdapters(structuredModel);
-	}
-	
-	protected void addContentBasedFactories(IStructuredModel structuredModel) {
-		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
-		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
-		INodeAdapterFactory factory = null;
-		factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class);
-		if (!(factory instanceof JFaceNodeAdapterFactoryForJSDT)) {
-			factoryRegistry.removeFactoriesFor(IJFaceNodeAdapter.class);
-			factory = new JFaceNodeAdapterFactoryForJSDT(IJFaceNodeAdapter.class, true);
-			factoryRegistry.addFactory(factory);
-		}
-		factory = factoryRegistry.getFactoryFor(IJsTranslation.class);
-		if (factory == null) {
-			factory = new JsTranslationAdapterFactory();
-			factoryRegistry.addFactory(factory);
-		}
-	}
-	
-	protected void addPropagatingAdapters(IStructuredModel structuredModel) {}
-	
-	/*
-	 * @see AdapterFactoryProvider#isFor(ContentTypeDescription)
-	 */
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		// return (contentTypeDescription instanceof ModelHandlerForJSP);
-		return (contentTypeDescription instanceof ModelHandlerForHTML);
-	}
-	
-	public void reinitializeFactories(IStructuredModel structuredModel) {
-		addAdapterFactories(structuredModel);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java
deleted file mode 100644
index 35eabe4..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.internal.style;
-
-public interface IStyleConstantsJs {
-	public static final String JSP_CONTENT = "jsp_content"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java
deleted file mode 100644
index 4b7813d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style.java;
-
-public interface IStyleConstantsJSDT {
-	String JAVA_DEFAULT = "default"; //$NON-NLS-1$
-	String JAVA_KEYWORD = "keyword"; //$NON-NLS-1$
-	String JAVA_SINGLE_LINE_COMMENT = "single_line_comment"; //$NON-NLS-1$
-	String JAVA_STRING = "string"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java
deleted file mode 100644
index ccfc023..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.style.java;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsDataTypes;
-
-/**
- * A Java code scanner.
- */
-class JSDTCodeScanner extends org.eclipse.jface.text.rules.RuleBasedScanner {
-	private static String[] fgConstants = JsDataTypes.CONSTANTS;
-	private static String[] fgKeywords = JsDataTypes.KEYWORDS;
-	private static String[] fgTypes = JsDataTypes.TYPES;
-	private IToken fDefaultToken;
-	private IToken fKeywordToken;
-	private IToken fSingleLineCommentToken;
-	private IToken fStringToken;
-	private IToken fTypeToken;
-	
-	/**
-	 * Creates a Java code scanner
-	 */
-	public JSDTCodeScanner() {
-		super();
-	}
-	
-	public void initializeRules() {
-		List rules = new ArrayList();
-		// Add rule for multiple line comments.
-		rules.add(new MultiLineRule("/*", "*/", fSingleLineCommentToken));//$NON-NLS-1$ //$NON-NLS-2$
-		// Add rule for single line comments.
-		rules.add(new EndOfLineRule("//", fSingleLineCommentToken));//$NON-NLS-1$
-		// Add rule for strings and character constants.
-		rules.add(new SingleLineRule("\"", "\"", fStringToken, '\\'));//$NON-NLS-2$//$NON-NLS-1$
-		rules.add(new SingleLineRule("'", "'", fStringToken, '\\'));//$NON-NLS-2$//$NON-NLS-1$
-		// Add generic whitespace rule.
-		// rules.add(new WhitespaceRule(new JavaWhitespaceDetector()));
-		// Add word rule for keywords, types, and constants.
-		WordRule wordRule = new WordRule(new JavaWordDetector(), fDefaultToken);
-		for (int i = 0; i < JSDTCodeScanner.fgKeywords.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgKeywords[i], fKeywordToken);
-		}
-		for (int i = 0; i < JSDTCodeScanner.fgTypes.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgTypes[i], fTypeToken);
-		}
-		for (int i = 0; i < JSDTCodeScanner.fgConstants.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgConstants[i], fTypeToken);
-		}
-		rules.add(wordRule);
-		IRule[] result = new IRule[rules.size()];
-		rules.toArray(result);
-		setRules(result);
-	}
-	
-	public void setTokenData(String tokenKey, Object data) {
-		if (tokenKey == IStyleConstantsJSDT.JAVA_KEYWORD) {
-			fKeywordToken = new Token(data);
-			fTypeToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_STRING) {
-			fStringToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT) {
-			fSingleLineCommentToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_DEFAULT) {
-			fDefaultToken = new Token(data);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java
deleted file mode 100644
index 0e7c57f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.style.java;
-
-/**
- * A Java aware word detector.
- */
-public class JavaWordDetector implements org.eclipse.jface.text.rules.IWordDetector {
-	/**
-	 * @see org.eclipse.jface.text.rules.IWordDetector#isWordIdentifierPart
-	 */
-	public boolean isWordPart(char c) {
-		return Character.isJavaIdentifierPart(c);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.text.rules.IWordDetector#isWordIdentifierStart
-	 */
-	public boolean isWordStart(char c) {
-		return Character.isJavaIdentifierStart(c);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java
deleted file mode 100644
index 05277c1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.jsdt.web.ui.internal.style.java;
-
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.html.ui.internal.style.IStyleConstantsHTML;
-import org.eclipse.wst.jsdt.ui.PreferenceConstants;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-import org.eclipse.wst.jsdt.web.ui.internal.style.IStyleConstantsJs;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-// Note: many of the methods in this class were based on (or copied from) those
-// found in the example Java Editor
-public class LineStyleProviderForJSDT implements LineStyleProvider {
-	private class PropertyChangeListener implements IPropertyChangeListener {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-		 */
-		public void propertyChange(PropertyChangeEvent event) {
-			// have to do it this way so others can override the method
-			handlePropertyChange(event);
-		}
-	}
-	private IDocument fDocument;
-	private Highlighter fHighlighter;
-	private boolean fIsInitialized = false;
-	private PropertyChangeListener fPreferenceListener = new PropertyChangeListener();
-	/** The scanner it uses */
-	private JSDTCodeScanner fScanner;
-	/** Contains all text attributes pretaining to this line style provider */
-	private HashMap fTextAttributes = null;
-	
-	public LineStyleProviderForJSDT() {
-		super();
-		fScanner = new JSDTCodeScanner();
-	}
-	
-	/**
-	 * Looks up the colorKey in the preference store and adds the style
-	 * information to list of TextAttributes
-	 * 
-	 * @param colorKey
-	 */
-	private void addJavaTextAttribute(String colorKey) {
-		IPreferenceStore store = getJavaColorPreferences();
-		if (store != null && colorKey != null) {
-			TextAttribute ta = null;
-			if (colorKey == IStyleConstantsJSDT.JAVA_KEYWORD) {
-				// keyword
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_STRING) {
-				// string
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_STRING_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_STRING_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_STRING_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_STRING_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_STRING_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT) {
-				// single line comment
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_DEFAULT) {
-				// default
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			}
-			if (ta != null) {
-				getTextAttributes().put(colorKey, ta);
-				fScanner.setTokenData(colorKey, ta);
-			}
-		}
-	}
-	
-	/**
-	 * Adds style information to the given text presentation.
-	 * 
-	 * @param presentation
-	 *            the text presentation to be extended
-	 * @param offset
-	 *            the offset of the range to be styled
-	 * @param length
-	 *            the length of the range to be styled
-	 * @param attr
-	 *            the attribute describing the style of the range to be styled
-	 */
-	private void addRange(Collection presentation, int offset, int length, TextAttribute attr) {
-		// support for user defined backgroud for JSP scriptlet regions
-		TextAttribute ta = (TextAttribute) getTextAttributes().get(IStyleConstantsJs.JSP_CONTENT);
-		Color bgColor = ta.getBackground();
-		if (bgColor == null) {
-			bgColor = attr.getBackground();
-		}
-		StyleRange result = new StyleRange(offset, length, attr.getForeground(), bgColor, attr.getStyle());
-		if ((attr.getStyle() & TextAttribute.STRIKETHROUGH) != 0) {
-			result.strikeout = true;
-		}
-		if ((attr.getStyle() & TextAttribute.UNDERLINE) != 0) {
-			result.underline = true;
-		}
-		presentation.add(result);
-	}
-	
-	/**
-	 * Looks up the colorKey in the preference store and adds the style
-	 * information to list of TextAttributes
-	 * 
-	 * @param colorKey
-	 */
-	private void addTextAttribute(String colorKey) {
-		if (getColorPreferences() != null) {
-			String prefString = getColorPreferences().getString(colorKey);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-				boolean bold = Boolean.valueOf(stylePrefs[2]).booleanValue();
-				boolean italic = Boolean.valueOf(stylePrefs[3]).booleanValue();
-				boolean strikethrough = Boolean.valueOf(stylePrefs[4]).booleanValue();
-				boolean underline = Boolean.valueOf(stylePrefs[5]).booleanValue();
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italic) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				TextAttribute createTextAttribute = createTextAttribute(foreground, background, style);
-				getTextAttributes().put(colorKey, createTextAttribute);
-			}
-		}
-	}
-	
-	private TextAttribute createTextAttribute(RGB foreground, RGB background, int style) {
-		return new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, style);
-	}
-	
-	private IPreferenceStore getColorPreferences() {
-		return JsUIPlugin.getDefault().getPreferenceStore();
-	}
-	
-	private IPreferenceStore getJavaColorPreferences() {
-		return PreferenceConstants.getPreferenceStore();
-	}
-	
-	/**
-	 * Returns the hashtable containing all the text attributes for this line
-	 * style provider. Lazily creates a hashtable if one has not already been
-	 * created.
-	 * 
-	 * @return
-	 */
-	private HashMap getTextAttributes() {
-		if (fTextAttributes == null) {
-			fTextAttributes = new HashMap();
-			loadColors();
-		}
-		return fTextAttributes;
-	}
-	
-	/**
-	 * Returns a text attribute encoded in the given token. If the token's data
-	 * is not <code>null</code> and a text attribute it is assumed that it is
-	 * the encoded text attribute. It returns the default text attribute if
-	 * there is no encoded text attribute found.
-	 * 
-	 * @param token
-	 *            the token whose text attribute is to be determined
-	 * @return the token's text attribute
-	 */
-	private TextAttribute getTokenTextAttribute(IToken token) {
-		TextAttribute ta = null;
-		Object data = token.getData();
-		if (data instanceof TextAttribute) {
-			ta = (TextAttribute) data;
-		} else {
-			ta = (TextAttribute) getTextAttributes().get(IStyleConstantsJSDT.JAVA_DEFAULT);
-		}
-		return ta;
-	}
-	
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-		String javaStyleKey = null;
-		if (event != null) {
-			String prefKey = event.getProperty();
-			// check if preference changed is a style preference
-			if (IStyleConstantsHTML.SCRIPT_AREA_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsHTML.SCRIPT_AREA_BORDER;
-			} else if (IStyleConstantsXML.TAG_ATTRIBUTE_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_NAME;
-			} else if (IStyleConstantsXML.TAG_ATTRIBUTE_VALUE.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_VALUE;
-			} else if (IStyleConstantsJs.JSP_CONTENT.equals(prefKey)) {
-				styleKey = IStyleConstantsJs.JSP_CONTENT;
-			} else if (PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_KEYWORD;
-			} else if (PreferenceConstants.EDITOR_STRING_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_STRING_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_STRING_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_STRING;
-			} else if (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT;
-			} else if (PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_DEFAULT;
-			}
-		}
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-		}
-		if (javaStyleKey != null) {
-			// overwrite style preference with new value
-			addJavaTextAttribute(javaStyleKey);
-			fScanner.initializeRules();
-		}
-		if (styleKey != null || javaStyleKey != null) {
-			// force a full update of the text viewer
-			fHighlighter.refreshDisplay();
-		}
-	}
-	
-	public void init(IStructuredDocument document, Highlighter highlighter) {
-		fDocument = document;
-		fHighlighter = highlighter;
-		if (fIsInitialized) {
-			return;
-		}
-		registerPreferenceListener();
-		fIsInitialized = true;
-	}
-	
-	private void loadColors() {
-		addTextAttribute(IStyleConstantsHTML.SCRIPT_AREA_BORDER);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		addTextAttribute(IStyleConstantsJs.JSP_CONTENT);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_KEYWORD);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_STRING);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_DEFAULT);
-		fScanner.initializeRules();
-	}
-	
-	public boolean prepareRegions(ITypedRegion typedRegion, int ssssrequestedStart, int ssssrequestedLength, Collection holdResults) {
-		boolean result = true;
-		try {
-			// ideally, eventually, we'll have a "virtualDocument" we can
-			// refer to, but for now ... we'll simple rescan the one region.
-			// use simple adjustment (since "sub-content" starts at 0
-			int offsetAdjustment = typedRegion.getOffset();
-			String content = fDocument.get(typedRegion.getOffset(), typedRegion.getLength());
-			IDocument document = new Document(content);
-			int lastStart = 0;
-			int length = 0;
-			IToken lastToken = Token.UNDEFINED;
-			int remainingLength = typedRegion.getLength();
-			fScanner.setRange(document, lastStart, remainingLength);
-			while (true) {
-				IToken token = fScanner.nextToken();
-				if (token.isEOF()) {
-					if (!lastToken.isUndefined() && length != 0) {
-						addRange(holdResults, lastStart + offsetAdjustment, length, getTokenTextAttribute(lastToken));
-					}
-					break;
-				}
-				if (token.isWhitespace()) {
-					length += fScanner.getTokenLength();
-					continue;
-				}
-				if (lastToken.isUndefined()) {
-					lastToken = token;
-					length += fScanner.getTokenLength();
-					continue;
-				}
-				if (token != lastToken) {
-					addRange(holdResults, lastStart + offsetAdjustment, length, getTokenTextAttribute(lastToken));
-					lastToken = token;
-					lastStart = fScanner.getTokenOffset();
-					length = fScanner.getTokenLength();
-					continue;
-				}
-				length += fScanner.getTokenLength();
-			}
-		} catch (BadLocationException e) {
-			// shouldn't happen, but we don't want it to stop other
-			// highlighting, if it does.
-			result = false;
-		}
-		return result;
-	}
-	
-	private void registerPreferenceListener() {
-		getColorPreferences().addPropertyChangeListener(fPreferenceListener);
-		getJavaColorPreferences().addPropertyChangeListener(fPreferenceListener);
-	}
-	
-	public void release() {
-		unregisterPreferenceManager();
-		if (fTextAttributes != null) {
-			fTextAttributes.clear();
-			fTextAttributes = null;
-		}
-	}
-	
-	private void unregisterPreferenceManager() {
-		getColorPreferences().removePropertyChangeListener(fPreferenceListener);
-		getJavaColorPreferences().removePropertyChangeListener(fPreferenceListener);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java
deleted file mode 100644
index 860beb7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.taginfo;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
- * Provides a set of convenience methods for creating HTML pages.
- * 
- * Based on org.eclipse.wst.jsdt.internal.ui.text.HTMLPrinter
- */
-class HTMLPrinter {
-	static RGB BG_COLOR_RGB = null;
-	static {
-		final Display display = Display.getDefault();
-		if (display != null && !display.isDisposed()) {
-			try {
-				display.asyncExec(new Runnable() {
-					/*
-					 * @see java.lang.Runnable#run()
-					 */
-					public void run() {
-						HTMLPrinter.BG_COLOR_RGB = display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB();
-					}
-				});
-			} catch (SWTError err) {
-				// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=45294
-				if (err.code != SWT.ERROR_DEVICE_DISPOSED) {
-					throw err;
-				}
-			}
-		}
-	}
-	
-	public static void addBullet(StringBuffer buffer, String bullet) {
-		if (bullet != null) {
-			buffer.append("<li>"); //$NON-NLS-1$
-			buffer.append(bullet);
-			buffer.append("</li>"); //$NON-NLS-1$
-		}
-	}
-	
-	public static void addPageEpilog(StringBuffer buffer) {
-		buffer.append("</font></body></html>"); //$NON-NLS-1$
-	}
-	
-	public static void addPageProlog(StringBuffer buffer) {
-		HTMLPrinter.insertPageProlog(buffer, buffer.length());
-	}
-	
-	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
-		if (paragraphReader != null) {
-			HTMLPrinter.addParagraph(buffer, HTMLPrinter.read(paragraphReader));
-		}
-	}
-	
-	public static void addParagraph(StringBuffer buffer, String paragraph) {
-		if (paragraph != null) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(paragraph);
-		}
-	}
-	
-	public static void addSmallHeader(StringBuffer buffer, String header) {
-		if (header != null) {
-			buffer.append("<h5>"); //$NON-NLS-1$
-			buffer.append(header);
-			buffer.append("</h5>"); //$NON-NLS-1$
-		}
-	}
-	
-	private static void appendColor(StringBuffer buffer, RGB rgb) {
-		buffer.append('#');
-		buffer.append(Integer.toHexString(rgb.red));
-		buffer.append(Integer.toHexString(rgb.green));
-		buffer.append(Integer.toHexString(rgb.blue));
-	}
-	
-	private static void appendStyleSheetLink(StringBuffer buffer, URL styleSheetURL) {
-		if (styleSheetURL == null) {
-			return;
-		}
-		buffer.append("<head>"); //$NON-NLS-1$
-		buffer.append("<LINK REL=\"stylesheet\" HREF= \""); //$NON-NLS-1$
-		buffer.append(styleSheetURL);
-		buffer.append("\" CHARSET=\"ISO-8859-1\" TYPE=\"text/css\">"); //$NON-NLS-1$
-		buffer.append("</head>"); //$NON-NLS-1$
-	}
-	
-	public static String convertToHTMLContent(String content) {
-		content = HTMLPrinter.replace(content, '&', "&amp;"); //$NON-NLS-1$
-		content = HTMLPrinter.replace(content, '"', "&quot;"); //$NON-NLS-1$
-		content = HTMLPrinter.replace(content, '<', "&lt;"); //$NON-NLS-1$
-		return HTMLPrinter.replace(content, '>', "&gt;"); //$NON-NLS-1$
-	}
-	
-	public static void endBulletList(StringBuffer buffer) {
-		buffer.append("</ul>"); //$NON-NLS-1$
-	}
-	
-	private static RGB getBgColor() {
-		if (HTMLPrinter.BG_COLOR_RGB != null) {
-			return HTMLPrinter.BG_COLOR_RGB;
-		}
-		// RGB value of info bg color on WindowsXP
-		return new RGB(255, 255, 225);
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position) {
-		HTMLPrinter.insertPageProlog(buffer, position, HTMLPrinter.getBgColor());
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, RGB bgRGB) {
-		if (bgRGB == null) {
-			HTMLPrinter.insertPageProlog(buffer, position);
-		} else {
-			StringBuffer pageProlog = new StringBuffer(60);
-			pageProlog.append("<html><body text=\"#000000\" bgcolor=\""); //$NON-NLS-1$
-			HTMLPrinter.appendColor(pageProlog, bgRGB);
-			pageProlog.append("\"><font size=-1>"); //$NON-NLS-1$
-			buffer.insert(position, pageProlog.toString());
-		}
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, RGB bgRGB, URL styleSheetURL) {
-		if (bgRGB == null) {
-			HTMLPrinter.insertPageProlog(buffer, position, styleSheetURL);
-		} else {
-			StringBuffer pageProlog = new StringBuffer(300);
-			pageProlog.append("<html>"); //$NON-NLS-1$
-			HTMLPrinter.appendStyleSheetLink(pageProlog, styleSheetURL);
-			pageProlog.append("<body text=\"#000000\" bgcolor=\""); //$NON-NLS-1$
-			HTMLPrinter.appendColor(pageProlog, bgRGB);
-			pageProlog.append("\"><font size=-1>"); //$NON-NLS-1$
-			buffer.insert(position, pageProlog.toString());
-		}
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, URL styleSheetURL) {
-		HTMLPrinter.insertPageProlog(buffer, position, HTMLPrinter.getBgColor(), styleSheetURL);
-	}
-	
-	static String read(Reader rd) {
-		StringBuffer buffer = new StringBuffer();
-		char[] readBuffer = new char[2048];
-		try {
-			int n = rd.read(readBuffer);
-			while (n > 0) {
-				buffer.append(readBuffer, 0, n);
-				n = rd.read(readBuffer);
-			}
-			return buffer.toString();
-		} catch (IOException x) {
-			// never expected
-			Logger.log(Logger.WARNING_DEBUG, x.getMessage(), x);
-		}
-		return null;
-	}
-	
-	private static String replace(String text, char c, String s) {
-		int previous = 0;
-		int current = text.indexOf(c, previous);
-		if (current == -1) {
-			return text;
-		}
-		StringBuffer buffer = new StringBuffer();
-		while (current > -1) {
-			buffer.append(text.substring(previous, current));
-			buffer.append(s);
-			previous = current + 1;
-			current = text.indexOf(c, previous);
-		}
-		buffer.append(text.substring(previous));
-		return buffer.toString();
-	}
-	
-	public static void startBulletList(StringBuffer buffer) {
-		buffer.append("<ul>"); //$NON-NLS-1$
-	}
-	
-	private HTMLPrinter() {
-	// nothing
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
deleted file mode 100644
index ea76957..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.jsdt.web.ui.internal.taginfo;
-
-import java.io.Reader;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.ui.JavaElementLabels;
-import org.eclipse.wst.jsdt.ui.JavadocContentAccess;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.taginfo.AbstractHoverProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * Provides javadoc hover help documentation for java code inside JSPs
- */
-public class JSDTHoverProcessor extends AbstractHoverProcessor {
-	/*
-	 * Bulk of the work was copied from
-	 * org.eclipse.wst.jsdt.internal.ui.text.java.hover.JavadocHover
-	 */
-	private final long LABEL_FLAGS = JavaElementLabels.ALL_FULLY_QUALIFIED | JavaElementLabels.M_PRE_RETURNTYPE | JavaElementLabels.M_PARAMETER_TYPES | JavaElementLabels.M_PARAMETER_NAMES | JavaElementLabels.M_EXCEPTIONS | JavaElementLabels.F_PRE_TYPE_SIGNATURE | JavaElementLabels.M_PRE_TYPE_PARAMETERS | JavaElementLabels.T_TYPE_PARAMETERS | JavaElementLabels.USE_RESOLVED;
-	private final long LOCAL_VARIABLE_FLAGS = LABEL_FLAGS & ~JavaElementLabels.F_FULLY_QUALIFIED | JavaElementLabels.F_POST_QUALIFIED;
-	
-	private String getHoverInfo(IJavaElement[] result) {
-		StringBuffer buffer = new StringBuffer();
-		int nResults = result.length;
-		if (nResults == 0) {
-			return null;
-		}
-		if (nResults > 1) {
-			for (int i = 0; i < result.length; i++) {
-				HTMLPrinter.startBulletList(buffer);
-				IJavaElement curr = result[i];
-				if (curr instanceof IMember || curr.getElementType() == IJavaElement.LOCAL_VARIABLE) {
-					HTMLPrinter.addBullet(buffer, getInfoText(curr));
-				}
-				HTMLPrinter.endBulletList(buffer);
-			}
-		} else {
-			IJavaElement curr = result[0];
-			if (curr == null) {
-				return null;
-			}
-			if (curr instanceof IMember) {
-				IMember member = (IMember) curr;
-				HTMLPrinter.addSmallHeader(buffer, getInfoText(member));
-				Reader reader;
-				try {
-					reader = JavadocContentAccess.getHTMLContentReader(member, true, true);
-				} catch (JavaModelException ex) {
-					return null;
-				}
-				if (reader != null) {
-					HTMLPrinter.addParagraph(buffer, reader);
-				}
-			} else if (curr.getElementType() == IJavaElement.LOCAL_VARIABLE || curr.getElementType() == IJavaElement.TYPE_PARAMETER) {
-				HTMLPrinter.addSmallHeader(buffer, getInfoText(curr));
-			}
-		}
-		if (buffer.length() > 0) {
-			HTMLPrinter.insertPageProlog(buffer, 0);
-			HTMLPrinter.addPageEpilog(buffer);
-			return buffer.toString();
-		}
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		// get JSP translation object for this viewer's document
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(textViewer.getDocument());
-			if (xmlModel != null) {
-				IDOMDocument xmlDoc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					JsTranslation translation = adapter.getJSPTranslation(true);
-					IJavaElement[] result = translation.getElementsFromJsRange(hoverRegion.getOffset(), hoverRegion.getOffset() + hoverRegion.getLength());
-// Vector filteredResults = new Vector();
-// List badFunctions = translation.getGeneratedFunctionNames();
-// boolean bad = false;
-// for(int i = 0;i<result.length;i++){
-// bad=false;
-// if(result[i] instanceof IMethod){
-// for(int j=0;j<badFunctions.size() && ! bad;j++){
-// if(((IMethod)result[i]).getElementName().equalsIgnoreCase((String)badFunctions.get(j))){
-// bad=true;
-// continue;
-// }
-// }
-// if(!bad)filteredResults.add(result[i]);
-// }
-// }
-// if(filteredResults.size()<1) return new String();
-//					
-// String filteredResult =
-// translation.fixupMangledName(getHoverInfo((IJavaElement[])filteredResults.toArray(new
-// IJavaElement[]{})));
-// for(int i = 0;i<badFunctions.size();i++){
-// filteredResult.replace((String)badFunctions.get(i), "");
-// }
-// return filteredResult;
-					return translation.fixupMangledName(getHoverInfo(result));
-				}
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		return JsWordFinder.findWord(textViewer.getDocument(), offset);
-	}
-	
-	private String getInfoText(IJavaElement member) {
-		long flags = member.getElementType() == IJavaElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS : LABEL_FLAGS;
-		String label = JavaElementLabels.getElementLabel(member, flags);
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < label.length(); i++) {
-			char ch = label.charAt(i);
-			if (ch == '<') {
-				buf.append("&lt;"); //$NON-NLS-1$
-			} else if (ch == '>') {
-				buf.append("&gt;"); //$NON-NLS-1$
-			} else {
-				buf.append(ch);
-			}
-		}
-		return buf.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTInformationProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTInformationProvider.java
deleted file mode 100644
index 8c30fa1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTInformationProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * 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.jsdt.web.ui.internal.taginfo;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.information.IInformationProvider;
-import org.eclipse.jface.text.information.IInformationProviderExtension;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-
-/**
- * Provides javadoc context information for java code inside JSPs (Shows tooltip
- * description)
- */
-public class JSDTInformationProvider implements IInformationProvider, IInformationProviderExtension {
-	private ITextHover fTextHover = null;
-	
-	public JSDTInformationProvider() {
-		fTextHover = SSEUIPlugin.getDefault().getTextHoverManager().createBestMatchHover(new JSDTHoverProcessor());
-	}
-	
-	public String getInformation(ITextViewer textViewer, IRegion subject) {
-		return (String) getInformation2(textViewer, subject);
-	}
-	
-	public Object getInformation2(ITextViewer textViewer, IRegion subject) {
-		return fTextHover.getHoverInfo(textViewer, subject);
-	}
-	
-	public IRegion getSubject(ITextViewer textViewer, int offset) {
-		return fTextHover.getHoverRegion(textViewer, offset);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java
deleted file mode 100644
index b8a6dd4..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.taginfo;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-
-/**
- * Copied from org.eclipse.wst.jsdt.internal.ui.text.JavaWordFinder
- */
-class JsWordFinder {
-	public static IRegion findWord(IDocument document, int offset) {
-		int start = -1;
-		int end = -1;
-		try {
-			int pos = offset;
-			char c;
-			while (pos >= 0) {
-				c = document.getChar(pos);
-				// System.out.println("JavaWordFinder.findWord() Test java char
-				// (--):" + c);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				--pos;
-			}
-			start = pos;
-			pos = offset;
-			int length = document.getLength();
-			while (pos < length) {
-				c = document.getChar(pos);
-				// System.out.println("JavaWordFinder.findWord() Test java char
-				// (++):" + c);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				++pos;
-			}
-			end = pos;
-			// System.out.println("Start:" + start + "End:"+end);
-			// System.out.println("JavaWordFinder.findWord() Retrieved java
-			// token of:" + document.get(start, end-start) );
-		} catch (BadLocationException x) {
-		}
-		if (start > -1 && end > -1) {
-			if (start == offset && end == offset) {
-				return new Region(offset, 0);
-			} else if (start == offset) {
-				return new Region(start, end - start);
-			} else {
-				return new Region(start + 1, end - start - 1);
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java
deleted file mode 100644
index a2ad050..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 2, 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.jsdt.web.ui.internal.text;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.web.ui.internal.derived.SingleCharReader;
-
-/**
- * Reads from a document either forwards or backwards. May be configured to skip
- * comments and strings.
- * 
- * Copied from org.eclipse.wst.jsdt.internal.ui.text so we don't have to depend
- * on the org.eclipse.wst.jsdt.ui plugin.
- * 
- * No modifications were made.
- */
-class JsCodeReader extends SingleCharReader {
-	/** The EOF character */
-	public static final int EOF = -1;
-	private int fCachedLineNumber = -1;
-	private int fCachedLineOffset = -1;
-	private IDocument fDocument;
-	private int fEnd = -1;
-	private boolean fForward = false;
-	private int fOffset;
-	private boolean fSkipComments = false;
-	private boolean fSkipStrings = false;
-	
-	public JsCodeReader() {}
-	
-	/*
-	 * @see Reader#close()
-	 */
-	
-	public void close() throws IOException {
-		fDocument = null;
-	}
-	
-	public void configureBackwardReader(IDocument document, int offset, boolean skipComments, boolean skipStrings) throws IOException {
-		fDocument = document;
-		fOffset = offset;
-		fSkipComments = skipComments;
-		fSkipStrings = skipStrings;
-		fForward = false;
-		try {
-			fCachedLineNumber = fDocument.getLineOfOffset(fOffset);
-		} catch (BadLocationException x) {
-			throw new IOException(x.getMessage());
-		}
-	}
-	
-	public void configureForwardReader(IDocument document, int offset, int length, boolean skipComments, boolean skipStrings) throws IOException {
-		fDocument = document;
-		fOffset = offset;
-		fSkipComments = skipComments;
-		fSkipStrings = skipStrings;
-		fForward = true;
-		fEnd = Math.min(fDocument.getLength(), fOffset + length);
-	}
-	
-	/**
-	 * Returns the offset of the last read character. Should only be called
-	 * after read has been called.
-	 */
-	public int getOffset() {
-		return fForward ? fOffset - 1 : fOffset;
-	}
-	
-	private void gotoCommentEnd() throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			if (current == '*') {
-				if (fOffset < fEnd && fDocument.getChar(fOffset) == '/') {
-					++fOffset;
-					return;
-				}
-			}
-		}
-	}
-	
-	private void gotoCommentStart() throws BadLocationException {
-		while (0 < fOffset) {
-			char current = fDocument.getChar(fOffset--);
-			if (current == '*' && 0 <= fOffset && fDocument.getChar(fOffset) == '/') {
-				return;
-			}
-		}
-	}
-	
-	private void gotoLineEnd() throws BadLocationException {
-		int line = fDocument.getLineOfOffset(fOffset);
-		fOffset = fDocument.getLineOffset(line + 1);
-	}
-	
-	private void gotoStringEnd(char delimiter) throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			if (current == '\\') {
-				// ignore escaped characters
-				++fOffset;
-			} else if (current == delimiter) {
-				return;
-			}
-		}
-	}
-	
-	private void gotoStringStart(char delimiter) throws BadLocationException {
-		while (0 < fOffset) {
-			char current = fDocument.getChar(fOffset);
-			if (current == delimiter) {
-				if (!(0 <= fOffset && fDocument.getChar(fOffset - 1) == '\\')) {
-					return;
-				}
-			}
-			--fOffset;
-		}
-	}
-	
-	private void handleSingleLineComment() throws BadLocationException {
-		int line = fDocument.getLineOfOffset(fOffset);
-		if (line < fCachedLineNumber) {
-			fCachedLineNumber = line;
-			fCachedLineOffset = fDocument.getLineOffset(line);
-			int offset = fOffset;
-			while (fCachedLineOffset < offset) {
-				char current = fDocument.getChar(offset--);
-				if (current == '/' && fCachedLineOffset <= offset && fDocument.getChar(offset) == '/') {
-					fOffset = offset;
-					return;
-				}
-			}
-		}
-	}
-	
-	/*
-	 * @see SingleCharReader#read()
-	 */
-	
-	public int read() throws IOException {
-		try {
-			return fForward ? readForwards() : readBackwards();
-		} catch (BadLocationException x) {
-			throw new IOException(x.getMessage());
-		}
-	}
-	
-	private int readBackwards() throws BadLocationException {
-		while (0 < fOffset) {
-			--fOffset;
-			handleSingleLineComment();
-			char current = fDocument.getChar(fOffset);
-			switch (current) {
-				case '/':
-					if (fSkipComments && fOffset > 1) {
-						char next = fDocument.getChar(fOffset - 1);
-						if (next == '*') {
-							// a comment ends, advance to the comment start
-							fOffset -= 2;
-							gotoCommentStart();
-							continue;
-						}
-					}
-					return current;
-				case '"':
-				case '\'':
-					if (fSkipStrings) {
-						--fOffset;
-						gotoStringStart(current);
-						continue;
-					}
-					return current;
-			}
-			return current;
-		}
-		return JsCodeReader.EOF;
-	}
-	
-	private int readForwards() throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			switch (current) {
-				case '/':
-					if (fSkipComments && fOffset < fEnd) {
-						char next = fDocument.getChar(fOffset);
-						if (next == '*') {
-							// a comment starts, advance to the comment end
-							++fOffset;
-							gotoCommentEnd();
-							continue;
-						} else if (next == '/') {
-							// '//'-comment starts, advance to the line end
-							gotoLineEnd();
-							continue;
-						}
-					}
-					return current;
-				case '"':
-				case '\'':
-					if (fSkipStrings) {
-						gotoStringEnd(current);
-						continue;
-					}
-					return current;
-			}
-			return current;
-		}
-		return JsCodeReader.EOF;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java
deleted file mode 100644
index 0c6d868..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.text;
-
-import org.eclipse.wst.sse.ui.internal.text.DocumentRegionEdgeMatcher;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class JsDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher {
-	protected final static char[] BRACKETS = { '{', '}', '(', ')', '[', ']' };
-	
-	/**
-	 * @param validContexts
-	 * @param nextMatcher
-	 */
-	public JsDocumentRegionEdgeMatcher() {
-		super(new String[] { DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN,
-				DOMRegionContext.XML_PI_CONTENT }, new JsPairMatcher(JsDocumentRegionEdgeMatcher.BRACKETS));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java
deleted file mode 100644
index 882cbea..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.internal.text;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
- * Helper class for match pairs of characters.
- * 
- * Copied from org.eclipse.wst.jsdt.internal.ui.text so we don't have to depend
- * on the org.eclipse.wst.jsdt.ui plugin.
- * 
- * No modifications were made.
- */
-class JsPairMatcher implements ICharacterPairMatcher {
-	protected int fAnchor;
-	protected IDocument fDocument;
-	protected int fEndPos;
-	protected int fOffset;
-	protected char[] fPairs;
-	protected JsCodeReader fReader = new JsCodeReader();
-	protected int fStartPos;
-	
-	public JsPairMatcher(char[] pairs) {
-		fPairs = pairs;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#clear()
-	 */
-	public void clear() {
-		if (fReader != null) {
-			try {
-				fReader.close();
-			} catch (IOException x) {
-				// ignore
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#dispose()
-	 */
-	public void dispose() {
-		clear();
-		fDocument = null;
-		fReader = null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#getAnchor()
-	 */
-	public int getAnchor() {
-		return fAnchor;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#match(org.eclipse.jface.text.IDocument,
-	 *      int)
-	 */
-	public IRegion match(IDocument document, int offset) {
-		fOffset = offset;
-		if (fOffset < 0) {
-			return null;
-		}
-		fDocument = document;
-		if (fDocument != null && matchPairsAt() && fStartPos != fEndPos) {
-			return new Region(fStartPos, fEndPos - fStartPos + 1);
-		}
-		return null;
-	}
-	
-	protected boolean matchPairsAt() {
-		int i;
-		int pairIndex1 = fPairs.length;
-		int pairIndex2 = fPairs.length;
-		fStartPos = -1;
-		fEndPos = -1;
-		// get the chars preceding and following the start position
-		try {
-			char prevChar = fDocument.getChar(Math.max(fOffset - 1, 0));
-			// modified behavior for
-			// http://dev.eclipse.org/bugs/show_bug.cgi?id=16879
-			// char nextChar= fDocument.getChar(fOffset);
-			// search for opening peer character next to the activation point
-			for (i = 0; i < fPairs.length; i = i + 2) {
-				// if (nextChar == fPairs[i]) {
-				// fStartPos= fOffset;
-				// pairIndex1= i;
-				// } else
-				if (prevChar == fPairs[i]) {
-					fStartPos = fOffset - 1;
-					pairIndex1 = i;
-				}
-			}
-			// search for closing peer character next to the activation point
-			for (i = 1; i < fPairs.length; i = i + 2) {
-				if (prevChar == fPairs[i]) {
-					fEndPos = fOffset - 1;
-					pairIndex2 = i;
-				}
-				// else if (nextChar == fPairs[i]) {
-				// fEndPos= fOffset;
-				// pairIndex2= i;
-				// }
-			}
-			if (fEndPos > -1) {
-				fAnchor = ICharacterPairMatcher.RIGHT;
-				fStartPos = searchForOpeningPeer(fEndPos, fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument);
-				if (fStartPos > -1) {
-					return true;
-				} else {
-					fEndPos = -1;
-				}
-			} else if (fStartPos > -1) {
-				fAnchor = ICharacterPairMatcher.LEFT;
-				fEndPos = searchForClosingPeer(fStartPos, fPairs[pairIndex1], fPairs[pairIndex1 + 1], fDocument);
-				if (fEndPos > -1) {
-					return true;
-				} else {
-					fStartPos = -1;
-				}
-			}
-		} catch (BadLocationException x) {
-		} catch (IOException x) {
-		}
-		return false;
-	}
-	
-	protected int searchForClosingPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		fReader.configureForwardReader(document, offset + 1, document.getLength(), true, true);
-		int stack = 1;
-		int c = fReader.read();
-		while (c != JsCodeReader.EOF) {
-			if (c == openingPeer && c != closingPeer) {
-				stack++;
-			} else if (c == closingPeer) {
-				stack--;
-			}
-			if (stack == 0) {
-				return fReader.getOffset();
-			}
-			c = fReader.read();
-		}
-		return -1;
-	}
-	
-	protected int searchForOpeningPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		fReader.configureBackwardReader(document, offset, true, true);
-		int stack = 1;
-		int c = fReader.read();
-		while (c != JsCodeReader.EOF) {
-			if (c == closingPeer && c != openingPeer) {
-				stack++;
-			} else if (c == openingPeer) {
-				stack--;
-			}
-			if (stack == 0) {
-				return fReader.getOffset();
-			}
-			c = fReader.read();
-		}
-		return -1;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg
deleted file mode 100644
index b5a6af5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java
deleted file mode 100644
index 492b85d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.w3c.dom.Node;
-
-/**
- * @author childsb
- * 
- */
-public interface IJavaWebNode {
-	public IJavaElement getJavaElement();
-	
-	public Node getParentNode();
-		
-	public boolean hasChildren();
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java
deleted file mode 100644
index f511ea1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jsdt.web.ui.views.contentoutline;
-
-import org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JsContentOutlineConfig;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-
-/**
- * An adapter factory to create JFaceNodeAdapters. Use this adapter factory with
- * a JFaceAdapterContentProvider to display DOM nodes in a tree.
- */
-public class JFaceNodeAdapterFactoryForJSDT extends JFaceNodeAdapterFactory {
-	public JFaceNodeAdapterFactoryForJSDT() {
-		this(IJFaceNodeAdapter.class, true);
-	}
-	
-	public JFaceNodeAdapterFactoryForJSDT(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-	
-	
-	public INodeAdapterFactory copy() {
-		return new JFaceNodeAdapterFactoryForJSDT(getAdapterKey(), isShouldRegisterAdapter());
-	}
-	
-	
-	protected INodeAdapter createAdapter(INodeNotifier node) {
-		if (singletonAdapter == null) {
-			// create the JFaceNodeAdapter
-			// singletonAdapter = new JFaceNodeAdapterForJSDT(this);
-			if (JsContentOutlineConfig.USE_ADVANCED) {
-				singletonAdapter = new org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JFaceNodeAdapterForJs(this);
-			} else {
-				singletonAdapter = new org.eclipse.wst.jsdt.web.ui.views.contentoutline.JFaceNodeAdapterForJs(this);
-			}
-			initAdapter(singletonAdapter, node);
-		}
-		return singletonAdapter;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
deleted file mode 100644
index d552e55..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.Position;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
-import org.eclipse.wst.jsdt.core.ICompilationUnit;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
-import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider;
-import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-import org.w3c.dom.Node;
-
-public class JFaceNodeAdapterForJs extends JFaceNodeAdapterForHTML {
-	
-	public JFaceNodeAdapterForJs(JFaceNodeAdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-	
-	private ICompilationUnit lazyCu;
-	private IProgressMonitor monitor;
-	private JavaElementLabelProvider javaElementLabelProvider;
-	
-	public Object[] getChildren(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().getChildren(object);
-		}
-		if (object instanceof IJavaWebNode) {
-			JavaElement enclosedElement = (JavaElement) ((IJavaWebNode) object).getJavaElement();
-			if (enclosedElement != null) {
-				try {
-					IJavaElement[] children = enclosedElement.getChildren();
-					if (children == null) {
-						return new IJavaElement[0];
-					}
-					Object[] nodes = new Object[children.length];
-					Node parent = ((IJavaWebNode) object).getParentNode();
-					
-					for (int i = 0; i < children.length; i++) {
-						int htmllength = ((SourceRefElement) (children[i])).getSourceRange().getLength();
-						int htmloffset = ((SourceRefElement) (children[i])).getSourceRange().getOffset();
-						Position position = new Position(htmloffset, htmllength);
-						nodes[i] = getJsNode(parent, children[i], position);
-					}
-					return nodes;
-				} catch (JavaModelException ex) {
-				}
-			}
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-			Object[] results = getJSElementsFromNode(node.getFirstChild(), true);
-			
-			
-			return filter( results );
-		}
-		return super.getChildren(object);
-	}
-	
-	/*
-	 * @GINO: Anonymous -- matches anonymous types on the top level
-	 */
-	protected boolean matches(Object elementObj) {
-		
-		if( elementObj instanceof IJavaWebNode ){
-			IJavaElement element = ((IJavaWebNode)elementObj).getJavaElement();
-			if (element.getElementType() == IJavaElement.TYPE && element.getParent().getElementType() == IJavaElement.COMPILATION_UNIT ) {
-				
-				IType type = (IType)element;
-				try {
-					return type.isAnonymous();
-				} catch (JavaModelException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		return false;
-	}
-
-	/*
-	 * @GINO: Anonymous Filter from top level
-	 *
-	 */
-	protected Object[] filter(Object[] children) {
-		boolean initializers= false;
-		for (int i= 0; i < children.length; i++) {
-			if (matches(children[i])) {
-				initializers= true;
-				break;
-			}
-		}
-
-		if (!initializers)
-			return children;
-
-		Vector v= new Vector();
-		for (int i= 0; i < children.length; i++) {
-			if (matches(children[i]))
-				continue;
-			v.addElement(children[i]);
-		}
-
-		Object[] result= new Object[v.size()];
-		v.copyInto(result);
-		return result;
-	}
-	
-	public Object[] getElements(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().getElements(object);
-		}
-		return super.getElements(object);
-	}
-	
-	private JavaElementLabelProvider getJavaElementLabelProvider() {
-		if(javaElementLabelProvider==null) {
-			javaElementLabelProvider = new JavaElementLabelProvider();
-		}
-		return javaElementLabelProvider;
-	}
-	
-	private StandardJavaElementContentProvider getJavaElementProvider() {
-		return new StandardJavaElementContentProvider(true);
-	}
-	
-	private Object[] filterChildrenForRange(IJavaElement[] allChildren, Node node) {
-		int javaPositionStart = ((NodeImpl) node).getStartOffset();
-		int javaPositionEnd   = ((NodeImpl) node).getEndOffset();
-		
-		Object[] result =new Object[0];
-		
-		
-		Vector validChildren = new Vector();
-		for (int i = 0; i < allChildren.length; i++) {
-			if (allChildren[i] instanceof IJavaElement && allChildren[i].getElementType() != IJavaElement.PACKAGE_DECLARATION) {
-				ISourceRange range = null;
-				if (allChildren[i]  instanceof SourceRefElement) {
-					try {
-						range = ((SourceRefElement)allChildren[i] ).getSourceRange();
-					} catch (JavaModelException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				if (allChildren[i].getElementType() == IJavaElement.TYPE || (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) {
-					
-				int htmllength = range==null?0:range.getLength();
-				int htmloffset = range==null?0:range.getOffset();
-				if(htmllength<0 || htmloffset<0) {
-					continue;
-				}
-				Position position = new Position(htmloffset, htmllength);
-				validChildren.add( getJsNode(node.getParentNode(), allChildren[i], position));
-					
-				
-				}
-			}
-		}
-		if (validChildren.size() > 0) {
-			result = validChildren.toArray();
-		}
-		if (result == null || result.length == 0) {
-			return new IJavaElement[0];
-		}
-		return result;
-	}
-	
-	private synchronized Object[] getJSElementsFromNode(Node node, boolean ensureConsistant) {
-				
-		int startOffset = 0;
-		int endOffset = 0;
-		int type = node.getNodeType();
-		Object[] result = null;
-		JsTranslation translation = null;
-		if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) {
-			startOffset = ((NodeImpl) node).getStartOffset();
-			endOffset = ((NodeImpl) node).getEndOffset();
-			ICompilationUnit unit = getLazyCu(node);
-			try {
-				if(ensureConsistant) unit.makeConsistent(getProgressMonitor());
-			} catch (JavaModelException ex1) {
-				// TODO Auto-generated catch block
-				ex1.printStackTrace();
-			}
-			try {
-				result = filterChildrenForRange(unit.getChildren(),node);
-			} catch (JavaModelException ex) {
-				// TODO Auto-generated catch block
-				ex.printStackTrace();
-				result = new Object[0];
-			}
-			
-			//translation = getTranslation(node);
-			//result = translation.getAllElementsInJsRange(startOffset, endOffset);
-		}
-		return result;
-	}
-	
-	private IProgressMonitor getProgressMonitor() {
-		if(monitor==null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		return monitor;
-		
-	}
-	
-	private Object getJsNode(Node parent, IJavaElement root, Position position) {
-		JsJfaceNode instance = null;
-		if (root.getElementType() == IJavaElement.TYPE) {
-			instance = new JsJfaceNode(parent, root, position, ((SourceRefElement) root).getElementName());
-		} else if (root.getElementType() == IJavaElement.FIELD) {
-			/* Field refrence, possibly to a type may need to implement later */
-			instance = new JsJfaceNode(parent, root,  position);
-		} else {
-			instance = new JsJfaceNode(parent, root, position);
-		}
-		String name = getJavaElementLabelProvider().getText(root);
-		instance.setName(name);
-		// ((JsJfaceNode)instance).setAdapterRegistry(registry);
-		INodeAdapter adapter = (instance).getAdapterFor(IJFaceNodeAdapter.class);
-		if (!(adapter instanceof JFaceNodeAdapterForJs)) {
-			(instance).removeAdapter(adapter);
-			(instance).addAdapter(this);
-		}
-		return instance;
-	}
-	
-	
-	public Image getLabelImage(Object node) {
-		if (node instanceof JsJfaceNode) {
-			return ((JsJfaceNode) node).getImage();
-		}
-		if (node instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getImage(node);
-		}
-		return super.getLabelImage(node);
-	}
-	
-	
-	public String getLabelText(Object node) {
-//		if (node instanceof JsJfaceNode) {
-//			return ((JsJfaceNode) node).getName();
-//		}
-		if (node instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getText(node);
-		}
-		return super.getLabelText(node);
-	}
-	
-	
-	public Object getParent(Object element) {
-		if (element instanceof IJavaElement) {
-			return getJavaElementProvider().getParent(element);
-		}
-		return super.getParent(element);
-	}
-	
-	private ICompilationUnit getLazyCu(Node node) {
-		if(lazyCu==null) {
-			lazyCu = getTranslation(node).getCompilationUnit();
-			try {
-				lazyCu.makeConsistent( new NullProgressMonitor() );
-			} catch (JavaModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return lazyCu;
-	}
-	
-	private JsTranslation getTranslation(Node node) {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJSPTranslation(true);
-	}
-	
-	
-	public boolean hasChildren(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().hasChildren(object);
-		}
-		Node node = (Node) object;
-		if (node instanceof IJavaWebNode) {
-			return ((IJavaWebNode) object).hasChildren();
-			
-		}
-		if (isJSElementParent(node)) {
-			Object[] nodes = getJSElementsFromNode(node.getFirstChild(),false);
-			boolean hasElements = (nodes != null && nodes.length > 0);
-			return hasElements;
-		}
-		return super.hasChildren(object);
-	}
-	
-	private boolean isJSElementParent(Node node) {
-		return (node.hasChildNodes() && node.getNodeName().equalsIgnoreCase("script"));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
deleted file mode 100644
index 652d9ee..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import java.util.Collection;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.core.JavaModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.internal.core.Openable;
-import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class JsJfaceNode extends ElementImpl implements IndexedRegion, INodeNotifier, Node, IJavaWebNode {
-	private class JsAdaptableNode extends AbstractNotifier {
-		
-		public FactoryRegistry getFactoryRegistry() {
-			return adapterRegistry;
-		}
-	}
-	private JsAdaptableNode adaptableDomNode = new JsAdaptableNode();
-	private FactoryRegistry adapterRegistry;
-	private Position fDocPosition;
-//	private Node parent;
-	private String typeName;
-	//private IJavaElement dirtyElement;
-	private boolean hasChildren;
-	//private String name;
-	private Image me;
-	
-	public JsJfaceNode(Node parent, IJavaElement originalElement, Position structureDocLocation) {
-		this(parent, originalElement, structureDocLocation, null);
-	}
-	
-	public JsJfaceNode(Node parent, IJavaElement originalElement, Position structureDocLocation, String typeName) {
-		//super();
-		super(((ElementImpl)parent));
-		// super(parentObject, parentObject.getElementName());
-		fDocPosition = structureDocLocation;
-		//this.parent = parent;
-		this.typeName = typeName;
-		try {
-			hasChildren=((JavaElement)originalElement).hasChildren();
-		} catch (JavaModelException ex) {
-			hasChildren=false;
-		}
-		removeAttributes();
-		me = (new JavaElementLabelProvider()).getImage(originalElement);
-	}
-	
-	public Image getImage() {
-		return me;
-	}
-
-	public boolean hasChildren() {
-//		try {
-//			return ((JavaElement)this.dirtyElement).hasChildren();
-//		} catch (JavaModelException ex) {
-//			// TODO Auto-generated catch block
-//			ex.printStackTrace();
-//		}
-		return hasChildren;
-	}
-	
-
-	public void setName(String name) {
-		super.setTagName(name);
-	}
-		
-	public void addAdapter(INodeAdapter adapter) {
-		adaptableDomNode.addAdapter(adapter);
-	}
-	
-	
-	public boolean contains(int testPosition) {
-		// TODO Auto-generated method stub
-		System.out.println("Umiplement method contains");
-		return false;
-	}
-	
-	
-	public boolean equals(Object o) {
-		return (o != null && o instanceof JsJfaceNode && ((JsJfaceNode) o).fDocPosition == this.fDocPosition);
-	}
-	
-// public static Object getInstance(Object parent, Position structureDocLocation
-// ){
-// //return new JsJfaceNode((JavaElement)parent.getParent(),
-// parent.getElementName(),structureDocLocation);
-// Vector interfaces = new Vector();
-// interfaces.addAll(Arrays.asList(parent.getClass().getInterfaces()));
-// JsJfaceNode me = new JsJfaceNode(parent,structureDocLocation);
-// interfaces.addAll(Arrays.asList(me.getClass().getInterfaces()));
-// Object proxy = null;
-// try {
-// proxy= Proxy.newProxyInstance(
-// parent.getClass().getClassLoader(),
-// (Class[])interfaces.toArray(new Class[]{}),me);
-// } catch (Exception e) {
-// // TODO Auto-generated catch block
-// System.out.println(e);
-// }
-// return proxy;
-// }
-//   
-	
-	public INodeAdapter getAdapterFor(Object type) {
-		return adaptableDomNode.getAdapterFor(type);
-	}
-	
-	
-	public Collection getAdapters() {
-		return adaptableDomNode.getAdapters();
-	}
-	
-	
-	public int getEndOffset() {
-		return fDocPosition.getOffset() + fDocPosition.getLength();
-	}
-	
-	
-	public INodeAdapter getExistingAdapter(Object type) {
-		// TODO Auto-generated method stub
-		return adaptableDomNode.getExistingAdapter(type);
-	}
-	
-	public synchronized IJavaElement getJavaElement() {
-		/*
-		 * since this may become 'stale' we need to rediscover our element every
-		 * time we're asked
-		 */
-		JsTranslation tran = getTranslation();
-		int startOffset = getStartOffset();
-		int endOffset = getLength();
-		if (typeName != null) {
-			IJavaElement myType = tran.getCompilationUnit().getType(typeName);
-			return myType;
-		}
-		IJavaElement elements[] = tran.getAllElementsInJsRange(startOffset, startOffset + endOffset);
-		if (elements != null) {
-			return elements[0];
-		} else {
-			System.out.println("error in JsJfaceNode... I couldn't retrieve my java element from the original page");
-			return null;
-		}
-	}
-	
-	
-	public int getLength() {
-		return fDocPosition.getLength();
-	}
-	
-	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.core.internal.document.NodeImpl#getOwnerDocument()
-	 */
-	
-
-	
-	
-
-	
-	
-	public int getStartOffset() {
-		return fDocPosition.getOffset();
-	}
-	
-// private Method[] getMethods(){
-// // returns the methods this class supports (as declared in interfaces)
-// Class[] interfaces = getClass().getInterfaces();
-// Vector vMethods = new Vector();
-// for(int i = 0;i<interfaces.length;i++){
-// Method methods[] = interfaces[i].getDeclaredMethods();
-// vMethods.addAll(Arrays.asList(methods));
-// }
-//        
-// return (Method[])vMethods.toArray();
-// }
-// public Object invoke(Object proxy, Method method, Object[] args) throws
-// Throwable {
-// Object result;
-// Method[] myMethods = getMethods();
-//        
-// try {
-// for(int i = 0;i<myMethods.length;i++){
-// if(myMethods[i]==method){
-// return method.invoke(this, args);
-// }
-// }
-// result = method.invoke(parentType, args);
-// } catch (InvocationTargetException e) {
-// throw e.getTargetException();
-// } catch (Exception e) {
-// throw new RuntimeException("unexpected invocation exception: " +
-// e.getMessage());
-// }
-//
-// return result;
-// }
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.core.internal.document.NodeImpl#getStructuredDocument()
-	 */
-	
-
-	
-	public JsTranslation getTranslation() {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJSPTranslation(true);
-	}
-	
-	
-	public void notify(int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		adaptableDomNode.notify(eventType, changedFeature, oldValue, newValue, pos);
-	}
-	
-	
-	public void removeAdapter(INodeAdapter adapter) {
-		adaptableDomNode.removeAdapter(adapter);
-	}
-	
-	public void setAdapterRegistry(FactoryRegistry registry) {
-		this.adapterRegistry = registry;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
deleted file mode 100644
index dea8299..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider;
-import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-import org.w3c.dom.Node;
-
-public class JFaceNodeAdapterForJs extends JFaceNodeAdapterForHTML {
-	public JFaceNodeAdapterForJs(JFaceNodeAdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-	
-	
-	public Object[] getChildren(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().getChildren(object);
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-// Object[] results = getJSElementsFromNode(node.getFirstChild());
-// IMember[] allResults = new IMember[results.length];
-// for(int i = 0;i<results.length;i++) {
-// if(results[i]==null) continue;
-// IMember member = ((IMember)results[i]);
-// allResults[i] = member;
-			// }
-			return getJSElementsFromNode(node.getFirstChild());
-		}
-		return super.getChildren(object);
-	}
-	
-	
-	public Object[] getElements(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().getElements(object);
-		}
-		return super.getElements(object);
-	}
-	
-	private JavaElementLabelProvider getJavaElementLabelProvider() {
-		return new JavaElementLabelProvider();
-	}
-	
-	private StandardJavaElementContentProvider getJavaElementProvider() {
-		return new StandardJavaElementContentProvider(true);
-	}
-	
-	private synchronized Object[] getJSElementsFromNode(Node node) {
-		if (node == null) {
-			return new Object[0];
-		}
-		int startOffset = 0;
-		int endOffset = 0;
-		int type = node.getNodeType();
-		IJavaElement[] result = null;
-		JsTranslation translation = null;
-		if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) {
-			startOffset = ((NodeImpl) node).getStartOffset();
-			endOffset = ((NodeImpl) node).getEndOffset();
-			translation = getTranslation(node);
-			result = translation.getAllElementsInJsRange(startOffset, endOffset);
-		}
-		return result;
-//			
-// if (result == null) return null;
-// Object[] newResults = new Object[result.length];
-// for (int i = 0; i < result.length; i++) {
-// int htmllength = 0;
-// int htmloffset = 0;
-// Position position = null;
-// try {
-// htmllength = ((SourceRefElement) (result[i])).getSourceRange().getLength();
-// htmloffset = translation.getJspOffset(((SourceRefElement)
-// (result[i])).getSourceRange().getOffset());
-// position = new Position(htmloffset, htmllength);
-// } catch (JavaModelException e) {
-// e.printStackTrace();
-// }
-// newResults[i] = getJsNode(node.getParentNode(), (IJavaElement) result[i],
-// position);
-// }
-// return newResults;
-	}
-	
-	
-	public Image getLabelImage(Object node) {
-		if (node instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getImage(node);
-		}
-		return super.getLabelImage(node);
-	}
-	
-	
-	public String getLabelText(Object node) {
-		if (node instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getText(node);
-		}
-		return super.getLabelText(node);
-	}
-	
-	
-	public Object getParent(Object element) {
-		if (element instanceof IJavaElement) {
-			return getJavaElementProvider().getParent(element);
-		}
-		return super.getParent(element);
-	}
-	
-	private JsTranslation getTranslation(Node node) {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJSPTranslation(true);
-	}
-	
-	
-	public boolean hasChildren(Object object) {
-		if (object instanceof IJavaElement) {
-			return getJavaElementProvider().hasChildren(object);
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-			Object[] results = getJSElementsFromNode(node.getFirstChild());
-			return (results != null && results.length > 0);
-		}
-		return super.hasChildren(object);
-	}
-	
-	private boolean isJSElementParent(Node node) {
-		return (node.getNodeName().equalsIgnoreCase("script"));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java
deleted file mode 100644
index 1cca95c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration;
-
-/**
- * @author childsb
- * 
- */
-public class JsContentOutlineConfig extends HTMLContentOutlineConfiguration {
-	public static final boolean USE_ADVANCED = false;
-	ILabelProvider fLabelProvider = null;
-	
-	public JsContentOutlineConfig() {}
-	
-	private ILabelProvider getJavaLabelProvider() {
-		if (fLabelProvider == null) {
-			fLabelProvider = new JsLabelProvider();
-		}
-		return fLabelProvider;
-	}
-	
-	
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (!JsContentOutlineConfig.USE_ADVANCED) {
-			return super.getLabelProvider(viewer);
-		}
-		return getJavaLabelProvider();
-	}
-	
-	
-	public IMenuListener getMenuListener(TreeViewer treeViewer) {
-		// if(!USE_ADVANCED)
-		// return super.getMenuListener(treeViewer);
-		return new JsMenuListener(treeViewer);
-	}
-	
-	
-	public ILabelProvider getStatusLineLabelProvider(TreeViewer treeViewer) {
-		if (!JsContentOutlineConfig.USE_ADVANCED) {
-			return super.getStatusLineLabelProvider(treeViewer);
-		}
-		return getJavaLabelProvider();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java
deleted file mode 100644
index 162ec4f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.IJavaElement;
-import org.eclipse.wst.jsdt.ui.JavaElementLabelProvider;
-
-/**
- * @author childsb copyright ibm 2007
- */
-public class JsLabelProvider extends XMLLabelProvider {
-	JavaElementLabelProvider fLabelProvider = null;
-	
-	
-	public Image getImage(Object o) {
-		if (o instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getImage(o);
-		}
-		return super.getImage(o);
-	}
-	
-	private JavaElementLabelProvider getJavaElementLabelProvider() {
-		if (fLabelProvider == null) {
-			fLabelProvider = new JavaElementLabelProvider();
-		}
-		return fLabelProvider;
-	}
-	
-	
-	public String getText(Object o) {
-		if (o instanceof IJavaElement) {
-			return getJavaElementLabelProvider().getText(o);
-		}
-		return super.getText(o);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
deleted file mode 100644
index 4a5ef71..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.internal.InternalHandlerUtil;
-import org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor;
-import org.eclipse.wst.jsdt.ui.IContextMenuConstants;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.IReleasable;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-
-/**
- * @author childsb
- * 
- */
-public class JsMenuListener extends XMLNodeActionManager implements IMenuListener, IReleasable {
-	public static final String EDIT_GROUP_ID = "group.edit";
-	CompilationUnitEditorActionContributor contrib;
-	private XMLNodeActionManager fActionManager;
-	private TreeViewer fTreeViewer;
-	ISelectionProvider selectionProvider;
-	
-	public JsMenuListener(TreeViewer viewer) {
-		super((IStructuredModel) viewer.getInput(), viewer);
-		contrib = new CompilationUnitEditorActionContributor();
-		fTreeViewer = viewer;
-//			
-// fActionGroups= new CompositeActionGroup(new ActionGroup[] {
-// new OpenViewActionGroup(getWorkbenchSite(), getSelectionProvider()),
-// new CCPActionGroup(getWorkbenchSite()),
-// new GenerateActionGroup(getWorkbenchSite()),
-// new RefactorActionGroup(getWorkbenchSite()),
-// new JavaSearchActionGroup(getWorkbenchSite())});
-	}
-	
-	public IAction[] getAllJsActions() {
-		return null;
-	}
-	
-	private IWorkbenchSite getWorkbenchSite() {
-		return InternalHandlerUtil.getActiveSite(fTreeViewer);
-	}
-	
-	public void menuAboutToShow(IMenuManager manager) {
-		ISelection selection = fTreeViewer.getSelection();
-		if (selection instanceof TreeSelection) {
-			TreeSelection tselect = (TreeSelection) selection;
-			Object[] elements = tselect.toArray();
-			int javaCount = 0;
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IJavaWebNode) {
-					javaCount++;
-				}
-			}
-			IContributionItem[] items = manager.getItems();
-// manager.add(new Separator(IContextMenuConstants.GROUP_NEW));
-// menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
-// menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
-// manager.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-// menu.add(new Separator(ICommonMenuConstants.GROUP_EDIT));
-// menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
-// menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
-// menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-// menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
-// menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
-// menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
-// menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
-			if (javaCount == elements.length && javaCount != 0) {
-				// see plugin.xml for object contributions that populate these
-				// menus
-				/*
-				 * Menu for:
-				 * 
-				 * Open Type Hierarchy Open Call Hierarchy Show In--> Script
-				 * Explorer Navigator
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SHOW));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-				/*
-				 * Menu for: Cut Copy Paste Delete
-				 */
-				manager.add(new Separator(JsMenuListener.EDIT_GROUP_ID));
-				manager.add(new GroupMarker(JsMenuListener.EDIT_GROUP_ID));
-				/*
-				 * Menu for:
-				 * 
-				 * Source--> Generate Element Comment
-				 * 
-				 * 
-				 * Refactor--> Rename Move Change Function Signature Inline
-				 * Introduce Indirection Infer Generic Type Arguments
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SOURCE));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SOURCE));
-				/*
-				 * Menu for:
-				 * 
-				 * Refrences--> Workspace Project Hierarchy Working Set
-				 * 
-				 * Declerations--> Workspace Project Hierarchy Working Set
-				 * 
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SEARCH));
-				/* all Java Elements */
-//					
-//					
-//					
-// JavaPlugin.createStandardGroups(manager);
-// String[] actionSets = JSDTActionSetUtil.getAllActionSets();
-//
-// IAction[] actions = JSDTActionSetUtil.getActionsFromSet(actionSets);
-// for(int i = 0;i<actions.length;i++) {
-// manager.add(actions[i]);
-// }
-// fActionGroups.setContext(new ActionContext(selection));
-// fActionGroups.fillContextMenu(manager);
-//					
-			} else if (javaCount == 0) {
-				fillContextMenu(manager, selection);
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.internal.IReleasable#release()
-	 */
-	public void release() {
-		fTreeViewer = null;
-		if (fActionManager != null) {
-			fActionManager.setModel(null);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
deleted file mode 100644
index 6eeb8cd..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.wst.jsdt.ui.StandardJavaElementContentProvider;
-
-/**
- * @author childsb
- * 
- */
-public class JsWebElementProvider extends StandardJavaElementContentProvider {}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java
deleted file mode 100644
index c527497..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * @author childsb
- * 
- */
-public class XMLLabelProvider extends JFaceNodeLabelProvider {
-	boolean fShowAttributes = false;
-	
-	
-	public String getText(Object o) {
-		StringBuffer text = new StringBuffer(super.getText(o));
-		if (o instanceof Node) {
-			Node node = (Node) o;
-			if ((node.getNodeType() == Node.ELEMENT_NODE) && fShowAttributes) {
-				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
-				if (node.hasAttributes()) {
-					Element element = (Element) node;
-					NamedNodeMap attributes = element.getAttributes();
-					Node idTypedAttribute = null;
-					Node requiredAttribute = null;
-					boolean hasId = false;
-					boolean hasName = false;
-					Node shownAttribute = null;
-					// try to get content model element
-					// declaration
-					CMElementDeclaration elementDecl = null;
-					ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-					if (mq != null) {
-						elementDecl = mq.getCMElementDeclaration(element);
-					}
-					// find an attribute of type (or just named)
-					// ID
-					if (elementDecl != null) {
-						int i = 0;
-						while ((i < attributes.getLength()) && (idTypedAttribute == null)) {
-							Node attr = attributes.item(i);
-							String attrName = attr.getNodeName();
-							CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) elementDecl.getAttributes().getNamedItem(attrName);
-							if (attrDecl != null) {
-								if ((attrDecl.getAttrType() != null) && (CMDataType.ID.equals(attrDecl.getAttrType().getDataTypeName()))) {
-									idTypedAttribute = attr;
-								} else if ((attrDecl.getUsage() == CMAttributeDeclaration.REQUIRED) && (requiredAttribute == null)) {
-									// as a backup, keep tabs on
-									// any required
-									// attributes
-									requiredAttribute = attr;
-								} else {
-									hasId = hasId || attrName.equals("id"); //$NON-NLS-1$
-									hasName = hasName || attrName.equals("name"); //$NON-NLS-1$
-								}
-							}
-							++i;
-						}
-					}
-					/*
-					 * If no suitable attribute was found, try using a
-					 * required attribute, if none, then prefer "id" or
-					 * "name", otherwise just use first attribute
-					 */
-					if (idTypedAttribute != null) {
-						shownAttribute = idTypedAttribute;
-					} else if (requiredAttribute != null) {
-						shownAttribute = requiredAttribute;
-					} else if (hasId) {
-						shownAttribute = attributes.getNamedItem("id"); //$NON-NLS-1$
-					} else if (hasName) {
-						shownAttribute = attributes.getNamedItem("name"); //$NON-NLS-1$
-					}
-					if (shownAttribute == null) {
-						shownAttribute = attributes.item(0);
-					}
-					// display the attribute and value (without quotes)
-					String attributeName = shownAttribute.getNodeName();
-					if ((attributeName != null) && (attributeName.length() > 0)) {
-						text.append(" " + attributeName); //$NON-NLS-1$
-						String attributeValue = shownAttribute.getNodeValue();
-						if ((attributeValue != null) && (attributeValue.length() > 0)) {
-							text.append("=" + StringUtils.strip(attributeValue)); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-		return text.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF
deleted file mode 100644
index a9a220d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG
deleted file mode 100644
index 68bf9c5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.standard.schemas/.cvsignore b/bundles/org.eclipse.wst.standard.schemas/.cvsignore
deleted file mode 100644
index acd4764..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-
-build.xml
diff --git a/bundles/org.eclipse.wst.standard.schemas/.project b/bundles/org.eclipse.wst.standard.schemas/.project
deleted file mode 100644
index c587d82..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.standard.schemas</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 21d0e95..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 14 22:44:45 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 47925bd..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed Jun 15 14:14:46 EDT 2005
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF
deleted file mode 100644
index a19268b..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.standard.schemas;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/bundles/org.eclipse.wst.standard.schemas/about.html b/bundles/org.eclipse.wst.standard.schemas/about.html
deleted file mode 100644
index 021ac10..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 16, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in ("Content"). Unless otherwise indicated below, the Content is
-provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is available at <a
-	href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-("Redistributor") and different terms and conditions may apply to your
-use of any object code in the Content. Check the Redistributor's license
-that was provided with the Content. If no such license exists, contact
-the Redistributor. Unless otherwise indicated below, the terms and
-conditions of the EPL still apply to any source code in the Content and
-such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the Redistributor's license for
-terms and conditions of use.</p>
-
-<h4>Open Mobile Alliance DTDs</h4>
-
-<p>The plug-in is accompanied by document type definitions
-(&quot;WAP DTDs&quot;) defined by the Wireless Application Protocol
-(WAP) Forum. The WAP Forum has now been consolidated into the Open
-Mobile Alliance (OMA). The WAP DTDs are the following files located in
-the plug-in:</p>
-<ul>
-	<li><strong>wml11.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/wml_1.1.xml" target="_blank">http://www.wapforum.org/DTD/wml_1.1.xml</a></li>
-	<li><strong>wml13.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/wml13.dtd" target="_blank">http://www.wapforum.org/DTD/wml13.dtd</a></li>
-	<li><strong>xhtml-mobile10-flat.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/xhtml-mobile10.dtd" target="_blank">http://www.wapforum.org/DTD/xhtml-mobile10.dtd</a></li>
-</ul>
-
-<p>Your use of the WAP DTDs is governed by the terms and conditions
-of the EPL.</p>
-
-<p>More information about the WAP and the OMA is available at <a
-	href="http://www.openmobilealliance.org/tech/affiliates/wap/wapindex.html">http://www.openmobilealliance.org/tech/affiliates/wap/wapindex.html</a>.</p>
-
-<h4>W3C DTDs</h4>
-
-<p>The plug-in is accompanied by document type definitions (&quot;
-W3C DTDs&quot;) defined by the the W3C Extensible HyperText Markup
-Language (XHTML) 1.1. XHTML is described at <a
-	href="http://www.w3.org/TR/xhtml11/">http://www.w3.org/TR/xhtml11/</a>.</p>
-The W3C DTDs are the following files located in the plug-in:
-<p>
-<ul>
-	<li><strong>xhtml11-flat.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" target="_blank">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</a></li>
-	<li><strong>xhtml1-frameset.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</a></li>
-	<li><strong>xhtml1-strict</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</a></li>
-	<li><strong>xhtml1-transitional.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</a></li>
-	<li><strong>xhtml-basic10-f.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd</a></li>
-	<li><strong>xhtml-lat1.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent</a></li>
-	<li><strong>xhtml-special.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent</a></li>
-	<li><strong>xhtml-symbol.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent</a></li>
-</ul>
-
-<p>As described in section 5.10 of the FAQ located at <a
-	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD"
-	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD</a>,
-your use of the W3C DTDs is governed by the terms and conditions of the
-W3C Software License a copy of which is included in the file <a
-	href="about_files/copyright-software-19980720.htm">about_files/copyright-software-19980720.htm</a>
-and is also available at <a
-	href="http://www.w3.org/Consortium/Legal/copyright-software-19980720"
-	target="_blank">http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>.</p>
-<h4>WSDL Schemas</h4>
-
-<p>The plug-in is accompanied by five schema files. Your use of the
-following files located in the xsd directory of the plug-in:</p>
-
-<ul>
-	<li><strong>http.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/http/" target="_blank">http://schemas.xmlsoap.org/wsdl/http/</a></li>
-	<li><strong>soap.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/soap/" target="_blank">http://schemas.xmlsoap.org/wsdl/soap/</a></li>
-	<li><strong>wsdl.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/" target="_blank">http://schemas.xmlsoap.org/wsdl/</a></li>
-	<li><strong>wsdl-mine.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/mime/" target="_blank">http://schemas.xmlsoap.org/wsdl/mime/</a></li>
-</ul>
-
-<p>is governed by the terms and conditions of the &quot;License for
-WSDL Schema Files&quot; a copy which is located in <a
-	href="about_files/wsdl-schema-files-license.txt">about_files/wsdl-schema-files-license.txt</a>.</p>
-
-<p>The following file located in the xsd directory of the plug-in:
-<p>
-<ul>
-	<li><strong>soap-enc.xsd</strong>
-</ul>
-
-<p>is governed by the terms and conditions of the W3C Software
-License as described in section 5.10 of the FAQ located at <a
-	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD"
-	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD</a>.
-A copy of the W3C Software License is located in <a
-	href="about_files/copyright-software-19980720.htm">about_files/copyright-software-19980720.htm</a>
-and is also avail
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm b/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm
deleted file mode 100644
index 502ac7d..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="copyright-software-19980720_files/base.css"><title>W3C IPR SOFTWARE NOTICE</title></head><body bgcolor="#ffffff" text="#000000">
-<h1>W3C<sup>®</sup> SOFTWARE NOTICE AND LICENSE</h1>
-
-<h3>Copyright © 1994-2002 <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/</h3>
-
-<p>This W3C work (including software, documents, or other related
-items) is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this work,
-you (the licensee) agree that you have read, understood, and will
-comply with the following terms and conditions:</p>
-
-<p>Permission to use, copy, modify, and distribute this software
-and its documentation, with or without modification,&nbsp; for any
-purpose and without fee or royalty is hereby granted, provided that
-you include the following on ALL copies of the software and
-documentation or portions thereof, including modifications, that
-you make:</p>
-
-<ol>
-<li>The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.</li>
-
-<li>Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright © [$date-of-software] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/"</li>
-
-<li>Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)</li>
-</ol>
-
-<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
-
-<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-SOFTWARE OR DOCUMENTATION.</p>
-
-<p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.</p>
-
-<p>____________________________________</p>
-
-<p>This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for
-the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about
-using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw. Other
-questions about this notice can be directed to <a href="mailto:site-policy@w3.org">site-policy@w3.org</a>.<br>
-&nbsp;</p>
-
-<p>&nbsp;</p>
-
-<address><a href="http://www.w3.org/Help/Webmaster.html">webmaster</a><br>
- (last updated $Date: 2007/05/15 02:42:24 $)</address>
-
-</body></html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css b/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css
deleted file mode 100644
index ce57ac6..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 1997-2003 W3C (MIT, ERCIM, Keio). All Rights Reserved.
-   The following software licensing rules apply:
-   http://www.w3.org/Consortium/Legal/copyright-software */
-
-/* $Id: base.css,v 1.1 2007/05/15 02:42:24 david_williams Exp $ */
-
-/* this style sheet defines the basic style for all W3C pages */
-/* you can point to this by adding:
-
-     <LINK rel="Stylesheet" href="/StyleSheets/base">
-
-
-   in the HEAD of your HTML document */
-
-body {
-  font-family: sans-serif;
-  color: black;
-  background: white;
-}
-
-a:link, a:active {
-  color: #00e;
-  background: transparent;
-}
-
-a:visited {
-  color: #529;
-  background: transparent;
-}
-
-div.intro {
-  margin-left: 5%;
-  margin-right: 5%;
-  font-style: italic
-}
-
-pre {
-  font-family: monospace
-}
-
-a:link img, a:visited img {
-   border-style: none
-}
-
-a img { color: white; }        /* hide the border in Netscape 4 */
-@media all {                   /* hide from Netscape 4 */
-  a img { color: inherit; }    /* undo the rule above */
-}
-
-ul.toc, ol.toc {
-  list-style: disc;
-  list-style: none;
-}
-
-div.issue {
-  padding: 0.5em;
-  border: none;
-  margin-right: 5%;
-}
-
-.hideme { display: none }
-
-@media print {
-
-  table {
-    page-break-inside: avoid
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt b/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt
deleted file mode 100644
index b95f81f..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-    http://schemas.xmlsoap.org/wsdl/http/
-    http://schemas.xmlsoap.org/wsdl/soap/
-    http://schemas.xmlsoap.org/wsdl/
-    http://schemas.xmlsoap.org/wsdl/mime/
-    
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
diff --git a/bundles/org.eclipse.wst.standard.schemas/build.properties b/bundles/org.eclipse.wst.standard.schemas/build.properties
deleted file mode 100644
index a8d1418..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/build.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               dtds/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               about_files/,\
-               xsd/
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = xsd/,\
-               plugin.xml,\
-               plugin.properties,\
-               dtds/,\
-               about_files/,\
-               about.html,\
-               META-INF/
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd
deleted file mode 100644
index b2b12bb..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd
+++ /dev/null
@@ -1,355 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-WML is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-          "http://www.wapforum.org/DTD/wml_1.1.xml">
-   <wml>
-   ...
-   </wml>
-
-Terms and conditions of use are available from the Wireless 
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % length  "CDATA">    <!-- [0-9]+ for pixels or [0-9]+"%" for
-                                    percentage length -->
-<!ENTITY % vdata   "CDATA">    <!-- attribute value possibly containing
-                                    variable references -->
-<!ENTITY % HREF    "%vdata;">  <!-- URI, URL or URN designating a hypertext
-                                    node. May contain variable references -->
-<!ENTITY % boolean      "(true|false)">
-<!ENTITY % number  "NMTOKEN">  <!-- a number, with format [0-9]+ -->
-<!ENTITY % coreattrs  "id    ID     #IMPLIED 
-                       class CDATA  #IMPLIED">
-
-
-
-<!ENTITY % emph    "em | strong | b | i | u | big | small">
-<!ENTITY % layout  "br">
-
-<!ENTITY % text     "#PCDATA | %emph;">
-
-<!-- flow covers "card-level" elements, such as text and images -->
-<!ENTITY % flow     "%text; | %layout; | img | anchor | a | table">
-
-<!-- Task types -->
-<!ENTITY % task   "go | prev | noop | refresh">
-
-<!-- Navigation and event elements -->
-<!ENTITY % navelmts "do | onevent">
-
-<!--================ Decks and Cards ================-->
-
-<!ELEMENT wml ( head?, template?, card+ )>
-<!ATTLIST wml
-  xml:lang        NMTOKEN        #IMPLIED
-  %coreattrs;
-  >
-
-<!-- card intrinsic events -->
-<!ENTITY % cardev
- "onenterforward  %HREF;          #IMPLIED
-  onenterbackward %HREF;          #IMPLIED
-  ontimer         %HREF;          #IMPLIED"
-  >
-
-<!-- card field types -->
-<!ENTITY % fields  "%flow; | input | select | fieldset">
-
-<!ELEMENT card (onevent*, timer?, (do | p)*)>
-<!ATTLIST card
-  title           %vdata;       #IMPLIED
-  newcontext      %boolean;     "false"
-  ordered         %boolean;     "true"
-  xml:lang        NMTOKEN       #IMPLIED
-  %cardev;
-  %coreattrs;
-  >
-
-<!--================ Event Bindings ================-->
-
-<!ELEMENT do (%task;)>
-<!ATTLIST do
-  type         CDATA       #REQUIRED
-  label        %vdata;     #IMPLIED
-  name         NMTOKEN     #IMPLIED
-  optional     %boolean;   "false"
-  xml:lang     NMTOKEN     #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT onevent (%task;)>
-<!ATTLIST onevent
-  type         CDATA       #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Deck-level declarations ================-->
-
-<!ELEMENT head ( access | meta )+>
-<!ATTLIST head
-  %coreattrs;
-  >
-
-<!ELEMENT template (%navelmts;)*>
-<!ATTLIST template
-  %cardev;
-  %coreattrs;
-  >
-
-<!ELEMENT access EMPTY>
-<!ATTLIST access
-  domain       CDATA       #IMPLIED
-  path         CDATA       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  http-equiv     CDATA      #IMPLIED
-  name           CDATA      #IMPLIED
-  forua          %boolean;  #IMPLIED
-  content        CDATA      #REQUIRED
-  scheme         CDATA      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tasks ================-->
-
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
-  href            %HREF;           #REQUIRED
-  sendreferer     %boolean;       "false"
-  method          (post|get)      "get"
-  accept-charset  CDATA           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT prev (setvar)*>
-<!ATTLIST prev
-  %coreattrs;
-  >
-
-<!ELEMENT refresh (setvar)*>
-<!ATTLIST refresh
-  %coreattrs;
-  >
-
-<!ELEMENT noop EMPTY>
-<!ATTLIST noop
-  %coreattrs;
-  >
-
-<!--================ postfield ================-->
- 
-<!ELEMENT postfield EMPTY>
-<!ATTLIST postfield
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ variables ================-->
-
-<!ELEMENT setvar EMPTY>
-<!ATTLIST setvar
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Card Fields ================-->
-
-<!ELEMENT select (optgroup|option)+>
-<!ATTLIST select
-  title        %vdata;           #IMPLIED
-  name         NMTOKEN           #IMPLIED
-  value        %vdata;           #IMPLIED
-  iname        NMTOKEN           #IMPLIED
-  ivalue       %vdata;           #IMPLIED
-  multiple     %boolean;         "false"
-  tabindex     %number;          #IMPLIED
-  xml:lang     NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT optgroup (optgroup|option)+ >
-<!ATTLIST optgroup
-  title      %vdata;    #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT option (#PCDATA | onevent)*>
-<!ATTLIST option
-  value      %vdata;    #IMPLIED
-  title      %vdata;    #IMPLIED
-  onpick     %HREF;     #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT input EMPTY>
-<!ATTLIST input
-  name       NMTOKEN           #REQUIRED
-  type       (text|password)   "text"
-  value      %vdata;           #IMPLIED
-  format     CDATA             #IMPLIED
-  emptyok    %boolean;         "false"
-  size       %number;          #IMPLIED
-  maxlength  %number;          #IMPLIED
-  tabindex   %number;          #IMPLIED
-  title      %vdata;           #IMPLIED
-  xml:lang   NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT fieldset (%fields; | do)* >
-<!ATTLIST fieldset
-  title           %vdata;      #IMPLIED
-  xml:lang        NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT timer EMPTY>
-<!ATTLIST timer
-  name       NMTOKEN           #IMPLIED
-  value      %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Images ================-->
-
-<!ENTITY % IAlign "(top|middle|bottom)" >
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  alt        %vdata;      #REQUIRED
-  src        %HREF;       #REQUIRED
-  localsrc   %vdata;      #IMPLIED
-  vspace     %length;     "0"
-  hspace     %length;     "0"
-  align      %IAlign;     "bottom"
-  height     %length;     #IMPLIED
-  width      %length;     #IMPLIED
-  xml:lang   NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Anchor ================-->
-
-<!ELEMENT anchor ( #PCDATA | br | img | go | prev | refresh )*>
-<!ATTLIST anchor
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
-  href         %HREF;       #REQUIRED
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tables ================-->
-
-<!ELEMENT table (tr)+>
-<!ATTLIST table
-  title       %vdata;    #IMPLIED
-  align       CDATA      #IMPLIED
-  columns     %number;   #REQUIRED
-  xml:lang    NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT tr (td)+>
-<!ATTLIST tr
-  %coreattrs;
-  >
-
-<!ELEMENT td ( %text; | %layout; | img | anchor | a )*>
-<!ATTLIST td
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Text layout and line breaks ================-->
-
-<!ELEMENT em     (%flow;)*>
-<!ATTLIST em
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT strong (%flow;)*>
-<!ATTLIST strong
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT b      (%flow;)*>
-<!ATTLIST b
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT i      (%flow;)*>
-<!ATTLIST i
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT u      (%flow;)*>
-<!ATTLIST u
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT big    (%flow;)*>
-<!ATTLIST big
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT small  (%flow;)*>
-<!ATTLIST small
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY % TAlign "(left|right|center)">
-<!ENTITY % WrapMode "(wrap|nowrap)" >
-<!ELEMENT p (%fields; | do)*>
-<!ATTLIST p
-  align       %TAlign;     "left"
-  mode        %WrapMode;   #IMPLIED
-  xml:lang    NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT br EMPTY>
-<!ATTLIST br
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY quot  "&#34;">     <!-- quotation mark -->
-<!ENTITY amp   "&#38;#38;"> <!-- ampersand -->
-<!ENTITY apos  "&#39;">     <!-- apostrophe -->
-<!ENTITY lt    "&#38;#60;"> <!-- less than -->
-<!ENTITY gt    "&#62;">     <!-- greater than -->
-<!ENTITY nbsp  "&#160;">    <!-- non-breaking space -->
-<!ENTITY shy   "&#173;">    <!-- soft hyphen (discretionary hyphen) -->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd
deleted file mode 100644
index c7d85b1..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd
deleted file mode 100644
index 5b3d25d..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd
+++ /dev/null
@@ -1,3086 +0,0 @@
-<!-- XHTML Basic 1.0 DTD  ...................................................... -->
-<!-- file: xhtml-basic10.dtd -->
-
-<!-- XHTML Basic 1.0 DTD
-
-     This is XHTML Basic, a proper subset of XHTML.
-
-     The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2000 World Wide Web Consortium
-        (Massachusetts Institute of Technology, Institut National de
-         Recherche en Informatique et en Automatique, Keio University).
-         All Rights Reserved.
-
-     Permission to use, copy, modify and distribute the XHTML Basic DTD
-     and its accompanying documentation for any purpose and without fee is
-     hereby granted in perpetuity, provided that the above copyright notice
-     and this paragraph appear in all copies.  The copyright holders make
-     no representation about the suitability of the DTD for any purpose.
-
-     It is provided "as is" without expressed or implied warranty.
-
-        Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
-                    Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
--->
-<!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
-
-     This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
-     PUBLIC: "-//W3C//DTD XHTML Basic 1.0//EN"
-     SYSTEM: "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
--->
-<!ENTITY % XHTML.version  "-//W3C//DTD XHTML Basic 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the FPI in the DOCTYPE declaration, with the xmlns attribute
-     on the document element to identify the default namespace:
-
-         <?xml version="1.0"?>
-         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
-             "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-               xml:lang="en" >
-         ...
-         </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Bidirectional Text features
-     This feature-test entity is used to declare elements
-     and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi  "IGNORE" >
-
-<?doc type="doctype" role="title" { XHTML Basic 1.0 } ?>
-
-<!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!ENTITY % xhtml-events.module   "IGNORE" >
-<!ENTITY % xhtml-bdo.module      "%XHTML.bidi;" >
-
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-            "xhtml-basic10-model-1.mod" >
-
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "INCLUDE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Architecture Module  ...................................... -->
-<!-- file: xhtml-arch-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- This optional module includes declarations that enable XHTML to be used
-     as a base architecture according to the 'Architectural Forms Definition
-     Requirements' (Annex A.3, ISO/IEC 10744, 2nd edition). For more information
-     on use of architectural forms, see the HyTime web site at:
-
-         http://www.hytime.org/
--->
-
-<?IS10744 ArcBase xhtml ?>
-
-<!NOTATION xhtml PUBLIC "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN" >
-
-<!-- Entity declaration for associated Architectural DTD
--->
-<!ENTITY xhtml-arch.dtd
-      PUBLIC "-//W3C//DTD XHTML Architecture 1.1//EN"
-             "xhtml11-arch.dtd" >
-
-<?IS10744:arch xhtml
-    public-id       =  "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN"
-    dtd-public-id   =  "-//W3C//DTD XHTML 1.1//EN"
-    dtd-system-id   =  "xhtml11.dtd"
-    doc-elem-form   =  "html"
-    form-att        =  "html"
-    renamer-att     =  "htnames"
-    suppressor-att  =  "htsupp"
-    data-ignore-att =  "htign"
-    auto            =  "ArcAuto"
-    options         =  "HtModReq HtModOpt"
-    HtModReq        =  "Framework Text Hypertext Lists Structure"
-    HtModOpt        =  "Standard"
-?>
-
-<!-- end of xhtml-arch-1.mod -->
-]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from 
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml 
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata 
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC1766] -->
-<!NOTATION languageCode 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC1766] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing 
-       for XHTML and extensions.
-    
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one. 
-     Included in the XHTML distribution is a template module 
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should 
-        inherit '%NS.prefixed;' from the DTD driver, so that unless 
-        overridden, the default behaviour follows the overall DTD 
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing 
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration 
-        attributes for namespaces embedded in XHTML. The default 
-        is an empty string.  XLink should be included here if used 
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether 
-     prefixing is active. 
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all 
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-%xhtml-events.mod;]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML Basic 1.0 Document Model Module  .................................... -->
-<!-- file: xhtml-basic10-model-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML Basic Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head  .............. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %meta.qname; | %link.qname; | %object.qname; )*" >
-
-<!-- Miscellaneous Elements  ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements  ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class "" >
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- Block Elements  ......................... -->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- All Content Elements  ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %Form.class;
-      %Block.extra;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml-basic10-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
-
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-
-
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core 
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes 
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!-- end of div.attlist -->]]>
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA 
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute 
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-]]>
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "xhtml-basic-table-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module  ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Tables
-
-        table, caption, tr, th, td
-
-     This table module declares elements and attributes defining
-     a table model based fundamentally on features found in the
-     widely-deployed HTML 3.2 table model.  While this module
-     mimics the content model and table attributes of HTML 3.2
-     tables, the element types declared herein also includes all
-     HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right )                #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom )               #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row | col  )           #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-]]>
-
-<!-- Forms Module  ............................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "xhtml-basic-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module  ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Forms
-
-     This forms module is based on the HTML 3.2 forms model, with
-     the WAI-requested addition of the label element. While this 
-     module essentially mimics the content model and attributes of 
-     HTML 3.2 forms, the element types declared herein also include
-     all HTML 4 common attributes.
-
-        form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname; 
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
-     "( #PCDATA 
-      | %input.qname; | %select.qname; | %textarea.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %InlSpecial.class;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio 
-      | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      size         CDATA                    #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content  "( %option.qname; )+" >
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-]]>
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by stylesheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-]]>
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-]]>
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-]]>
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element, 
-     used to provide named property values for the applet
-     and object elements. 
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib; 
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-]]>
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes,
-     used to embed external objects as part of XHTML pages. In the
-     document, place param elements prior to the object elements 
-     that require their content.
-
-     Note that use of this module requires instantiation of the 
-     Param Element Module prior to this module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-]]>
-
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and 
-     their attributes.
-
-     Note that the content model of the head element type is redeclared 
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used 
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib; 
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib; 
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information 
-     on how to extend XHTML using XML namespaces 
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib; 
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-
-<!-- end of XHTML Basic 1.0 DTD  ........................................... -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent
deleted file mode 100644
index 92198ed..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd
deleted file mode 100644
index 1611503..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd
+++ /dev/null
@@ -1,3216 +0,0 @@
-<!-- XHTML Mobile 1.0 DTD  ...................................................... -->
-<!-- file: xhtml-mobile10.dtd -->
-<!-- 
-     This is XHTML Mobile profile, a proper subset of XHTML.
-     
-     	@Wireless Application Protocol Forum, Ltd. 2001.
-
-	Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd. 
-	Web site (http://www.wapforum.org/what/copyright.htm).
-    
--->
-<!-- This is the driver file for version 1.0 of the XHTML Mobile DTD.
-
-     This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
-     PUBLIC: "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-     SYSTEM: "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"
--->
-<!ENTITY % XHTML.version  "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- For example, if you are using XHTML Mobile 1.0 directly, use
-     the FPI in the DOCTYPE declaration, with the xmlns attribute
-     on the document element to identify the default namespace:
-
-         <?xml version="1.0"?>
-         <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-             "http://www.wapforum.org/DTD/xhtml-mobile10.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-               xml:lang="en" >
-         ...
-         </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module  ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Style
-
-     This module declares the 'style' attribute, used to support inline
-     style markup. This module must be instantiated prior to the XHTML
-     Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
-     "style        CDATA                    #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
-     "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-
-
-<!-- Document Model ........................................ -->
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//WAPFORUM//ENTITIES XHTML Mobile 1.0 Document Model 1.0//EN"
-            "http://www.wapforum.org/DTD/xhtml-mobile10-model-1.mod" >
-
-<!-- XHTML Framework ........................................ -->
-<!ENTITY % XHTML.bidi  "IGNORE" >
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "IGNORE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-#2000-10-22: added qname declarations for ruby elements
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
-       for XHTML and extensions.
-
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-%xhtml-events.mod;]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML Mobile 1.0 Document Model Module  .................................... -->
-<!-- file: xhtml-mobile10-model-1.mod
-
-     This is XHTML Mobile, a proper subset of XHTML.
-     	@Wireless Application Protocol Forum, Ltd. 2001.
-
-	Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd. 
-	Web site (http://www.wapforum.org/what/copyright.htm).
-    
--->
-<!-- XHTML Mobile Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head  .............. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %meta.qname; | %link.qname; | %object.qname; | %style.qname; )*" >
-
-<!-- Miscellaneous Elements  ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements  ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
-     "| %i.qname; | %b.qname; | %big.qname; | %small.qname; " >
-
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- Block Elements  ......................... -->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %Table.class;
-      %Block.extra;
-      %Misc.class;"
->
-
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- All Content Elements  ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %Form.class;
-      %Block.extra;
-      | %Inline.class;
-      %Misc.class;"
->
-
-
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml-mobile10-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Latin 1 Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-lat1.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-lat1
-           PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-                  "xhtml-lat1.ent" >
-       %xhtml-lat1;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
--->
-
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;" ><!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;" ><!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;" ><!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;" ><!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;" ><!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;" ><!-- broken bar = broken vertical bar, U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;" ><!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;" ><!-- diaeresis = spacing diaeresis, U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;" ><!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;" ><!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;" ><!-- left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;" ><!-- not sign, U+00AC ISOnum -->
-<!ENTITY shy    "&#173;" ><!-- soft hyphen = discretionary hyphen, U+00AD ISOnum -->
-<!ENTITY reg    "&#174;" ><!-- registered sign = registered trade mark sign, U+00AE ISOnum -->
-<!ENTITY macr   "&#175;" ><!-- macron = spacing macron = overline = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;" ><!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;" ><!-- plus-minus sign = plus-or-minus sign, U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;" ><!-- superscript two = superscript digit two = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;" ><!-- superscript three = superscript digit three = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;" ><!-- acute accent = spacing acute, U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;" ><!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;" ><!-- pilcrow sign = paragraph sign, U+00B6 ISOnum -->
-<!ENTITY middot "&#183;" ><!-- middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;" ><!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;" ><!-- superscript one = superscript digit one, U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;" ><!-- masculine ordinal indicator, U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;" ><!-- right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;" ><!-- vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;" ><!-- vulgar fraction one half = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;" ><!-- vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;" ><!-- inverted question mark = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;" ><!-- latin capital A with grave = latin capital A grave, U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;" ><!-- latin capital A with acute, U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;" ><!-- latin capital A with circumflex, U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;" ><!-- latin capital A with tilde, U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;" ><!-- latin capital A with diaeresis, U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;" ><!-- latin capital A with ring above = latin capital A ring, U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;" ><!-- latin capital AE = latin capital ligature AE, U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;" ><!-- latin capital C with cedilla, U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;" ><!-- latin capital E with grave, U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;" ><!-- latin capital E with acute, U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;" ><!-- latin capital E with circumflex, U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;" ><!-- latin capital E with diaeresis, U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;" ><!-- latin capital I with grave, U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;" ><!-- latin capital I with acute, U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;" ><!-- latin capital I with circumflex, U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;" ><!-- latin capital I with diaeresis, U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;" ><!-- latin capital ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;" ><!-- latin capital N with tilde, U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;" ><!-- latin capital O with grave, U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;" ><!-- latin capital O with acute, U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;" ><!-- latin capital O with circumflex, U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;" ><!-- latin capital O with tilde, U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;" ><!-- latin capital O with diaeresis, U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;" ><!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;" ><!-- latin capital O with stroke = latin capital O slash, U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;" ><!-- latin capital U with grave, U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;" ><!-- latin capital U with acute, U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;" ><!-- latin capital U with circumflex, U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;" ><!-- latin capital U with diaeresis, U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;" ><!-- latin capital Y with acute, U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;" ><!-- latin capital THORN, U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;" ><!-- latin small sharp s = ess-zed, U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;" ><!-- latin small a with grave = latin small a grave, U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;" ><!-- latin small a with acute, U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;" ><!-- latin small a with circumflex, U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;" ><!-- latin small a with tilde, U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;" ><!-- latin small a with diaeresis, U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;" ><!-- latin small a with ring above = latin small a ring, U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;" ><!-- latin small ae = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;" ><!-- latin small c with cedilla, U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;" ><!-- latin small e with grave, U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;" ><!-- latin small e with acute, U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;" ><!-- latin small e with circumflex, U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;" ><!-- latin small e with diaeresis, U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;" ><!-- latin small i with grave, U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;" ><!-- latin small i with acute, U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;" ><!-- latin small i with circumflex, U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;" ><!-- latin small i with diaeresis, U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;" ><!-- latin small eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;" ><!-- latin small n with tilde, U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;" ><!-- latin small o with grave, U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;" ><!-- latin small o with acute, U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;" ><!-- latin small o with circumflex, U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;" ><!-- latin small o with tilde, U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;" ><!-- latin small o with diaeresis, U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;" ><!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;" ><!-- latin small o with stroke, = latin small o slash, U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;" ><!-- latin small u with grave, U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;" ><!-- latin small u with acute, U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;" ><!-- latin small u with circumflex, U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;" ><!-- latin small u with diaeresis, U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;" ><!-- latin small y with acute, U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;" ><!-- latin small thorn with, U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;" ><!-- latin small y with diaeresis, U+00FF ISOlat1 -->
-<!-- end of xhtml-lat1.ent -->
-
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- ...................................................................... -->
-<!-- ISO Math, Greek and Symbolic Character Entity Set for XHTML .......... -->
-<!-- file: xhtml-symbol.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-symbol
-           PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-                  "xhtml-symbol.ent" >
-       %xhtml-symbol;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 [SGML] list) do not clash with
-     any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
-     numbers are given for each character, in hex. Entity values are
-     decimal conversions of the ISO 10646 values and refer to the
-     document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;" ><!-- latin small f with hook = function
-                              = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;" ><!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;" ><!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;" ><!-- greek capital letter delta, U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;" ><!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;" ><!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;" ><!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;" ><!-- greek capital letter theta, U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;" ><!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;" ><!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;" ><!-- greek capital letter lambda, U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;" ><!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;" ><!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;" ><!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;" ><!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;" ><!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;" ><!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;" ><!-- greek capital letter sigma, U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;" ><!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;" ><!-- greek capital letter upsilon,
-                              U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;" ><!-- greek capital letter phi, U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;" ><!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;" ><!-- greek capital letter psi, U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;" ><!-- greek capital letter omega, U+03A9 ISOgrk3 -->
-<!ENTITY alpha    "&#945;" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;" ><!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;" ><!-- greek small letter final sigma, U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;" ><!-- greek small letter theta symbol, U+03D1 NEW -->
-<!ENTITY upsih    "&#978;" ><!-- greek upsilon with hook symbol, U+03D2 NEW -->
-<!ENTITY piv      "&#982;" ><!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;" ><!-- bullet = black small circle, U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;" ><!-- horizontal ellipsis = three dot leader, U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;" ><!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;" ><!-- double prime = seconds = inches, U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;" ><!-- overline = spacing overscore, U+203E NEW -->
-<!ENTITY frasl    "&#8260;" ><!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;" ><!-- script capital P = power set = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;" ><!-- blackletter capital I = imaginary part, U+2111 ISOamso -->
-<!ENTITY real     "&#8476;" ><!-- blackletter capital R = real part symbol, U+211C ISOamso -->
-<!ENTITY trade    "&#8482;" ><!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;" ><!-- alef symbol = first transfinite cardinal, U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef, U+05D0 although
-     the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;" ><!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;" ><!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;" ><!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;" ><!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;" ><!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;" ><!-- downwards arrow with corner leftwards
-                               = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;" ><!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;" ><!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;" ><!-- rightwards double arrow, U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;" ><!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;" ><!-- left right double arrow, U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;" ><!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;" ><!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;" ><!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;" ><!-- empty set = null set = diameter, U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;" ><!-- nabla = backward difference, U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;" ><!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;" ><!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;" ><!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;" ><!-- n-ary product = product sign, U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;" ><!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;" ><!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;" ><!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;" ><!-- square root = radical sign, U+221A ISOtech -->
-<!ENTITY prop     "&#8733;" ><!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;" ><!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;" ><!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;" ><!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;" ><!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;" ><!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;" ><!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;" ><!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;" ><!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;" ><!-- tilde operator = varies with = similar to, U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;" ><!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;" ><!-- almost equal to = asymptotic to, U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;" ><!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;" ><!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;" ><!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;" ><!-- greater-than or equal to, U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;" ><!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;" ><!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  -->
-<!ENTITY nsub     "&#8836;" ><!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;" ><!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;" ><!-- superset of or equal to, U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;" ><!-- circled plus = direct sum, U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;" ><!-- circled times = vector product, U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;" ><!-- up tack = orthogonal to = perpendicular, U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;" ><!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;" ><!-- left ceiling = apl upstile, U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;" ><!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;" ><!-- left floor = apl downstile, U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;" ><!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;" ><!-- left-pointing angle bracket = bra, U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than'
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;" ><!-- right-pointing angle bracket = ket, U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than'
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;" ><!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;" ><!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;" ><!-- black club suit = shamrock, U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;" ><!-- black heart suit = valentine, U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;" ><!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- end of xhtml-symbol.ent -->
-
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Special Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-special.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-special
-           PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-                  "xhtml-special.ent" >
-       %xhtml-special;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
-
-     Revisions:
-2000-10-28: added &apos; and altered XML Predefined Entities for compatibility
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 [SGML] list) do not clash with
-     any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
-     numbers are given for each character, in hex. Entity values are
-     decimal conversions of the ISO 10646 values and refer to the
-     document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY lt      "&#38;&#60;" ><!-- less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;" ><!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY amp     "&#38;&#38;" ><!-- ampersand, U+0026 ISOnum -->
-<!ENTITY apos    "&#39;" ><!-- apostrophe, U+0027 ISOnum -->
-<!ENTITY quot    "&#34;" ><!-- quotation mark = APL quote, U+0022 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;" ><!-- latin capital ligature OE, U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;" ><!-- latin small ligature oe, U+0153 ISOlat2 -->
-
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;" ><!-- latin capital letter S with caron, U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;" ><!-- latin small letter s with caron, U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;" ><!-- latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;" ><!-- modifier letter circumflex accent, U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;" ><!-- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;" ><!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;" ><!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;" ><!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;" ><!-- zero width non-joiner, U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;" ><!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;" ><!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;" ><!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;" ><!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;" ><!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;" ><!-- left single quotation mark, U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;" ><!-- right single quotation mark, U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;" ><!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;" ><!-- left double quotation mark, U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;" ><!-- right double quotation mark, U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;" ><!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;" ><!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;" ><!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;" ><!-- per mille sign, U+2030 ISOtech -->
-
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY lsaquo  "&#8249;" ><!-- single left-pointing angle quotation mark, U+2039 ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;" ><!-- single right-pointing angle quotation mark, U+203A ISO proposed -->
-<!ENTITY euro    "&#8364;" ><!-- euro sign, U+20AC NEW -->
-
-<!-- end of xhtml-special.ent -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-
-
-<!-- XHTML Core Modules ........................................ -->
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-<!-- Extend lists with value and start attributes --> 
-<!ATTLIST %li.qname;
-      value        %Number.datatype;         #IMPLIED
->
-<!ATTLIST %ol.qname;
-      start        %Number.datatype;        #IMPLIED
->
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module  ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Tables
-
-        table, caption, tr, th, td
-
-     This table module declares elements and attributes defining
-     a table model based fundamentally on features found in the
-     widely-deployed HTML 3.2 table model.  While this module
-     mimics the content model and table attributes of HTML 3.2
-     tables, the element types declared herein also includes all
-     HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right )                #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom )               #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row | col  )           #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-
-
-<!-- Forms Module  ............................................... 
-	XHTML basic forms module extended with optgroup and fieldset
--->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
-	%Common.attrib; 
-	label %Text.datatype; #REQUIRED
->
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
-	%Common.attrib; 
->
-<!ENTITY % form.content "( %BlkNoForm.mix; | %fieldset.qname; )+">
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module  ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Forms
-
-     This forms module is based on the HTML 3.2 forms model, with
-     the WAI-requested addition of the label element. While this 
-     module essentially mimics the content model and attributes of 
-     HTML 3.2 forms, the element types declared herein also include
-     all HTML 4 common attributes.
-
-        form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname; 
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
-     "( #PCDATA 
-      | %input.qname; | %select.qname; | %textarea.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %InlSpecial.class;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio 
-      | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      size         CDATA                    #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content  "( %option.qname; )+" >
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-
-
-<!-- Stylesheets Module  ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  ................................... -->
-<!-- file: xhtml-style-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Style Sheets
-
-        style
-
-     This module declares the style element type and its attributes,
-     used to embed style sheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information .................... -->
-
-<!ENTITY % style.element  "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content  "( #PCDATA )" >
-<!ENTITY % style.qname  "style" >
-<!ELEMENT %style.qname;  %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist  "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
-      %XHTML.xmlns.attrib;
-      %title.attrib;
-      %I18n.attrib;
-      type         %ContentType.datatype;   #REQUIRED
-      media        %MediaDesc.datatype;     #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element,
-     used to provide named property values for the applet
-     and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
-
-     Note that use of this module requires instantiation of the Param
-     Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-
-
-<!-- Document Structure Module  ..................................... -->
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and
-     their attributes.
-
-     Note that the content model of the head element type is redeclared
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- 		"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module  ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Presentational Elements
-
-        hr
-
-     This module declares the elements and their attributes used to
-     support block-level presentational markup.
--->
-
-<!ENTITY % hr.element  "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content  "EMPTY" >
-<!ENTITY % hr.qname  "hr" >
-<!ELEMENT %hr.qname;  %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist  "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
-      %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-
-
-<!-- ========================================== -->
-<!-- 
-	Inline Presentation: b, big, i, small		
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-		"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module  .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
-        b, big, i, small, sub, sup, tt
-
-     This module declares the elements and their attributes used to
-     support inline-level presentational markup.
--->
-
-<!ENTITY % b.element  "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname  "b" >
-<!ELEMENT %b.qname;  %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist  "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
-      %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element  "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname  "big" >
-<!ELEMENT %big.qname;  %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist  "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
-      %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element  "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname  "i" >
-<!ELEMENT %i.qname;  %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist  "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
-      %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element  "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname  "small" >
-<!ELEMENT %small.qname;  %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist  "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
-      %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element  "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname  "sub" >
-<!ELEMENT %sub.qname;  %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist  "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
-      %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element  "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname  "sup" >
-<!ELEMENT %sup.qname;  %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist  "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
-      %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element  "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname  "tt" >
-<!ELEMENT %tt.qname;  %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist  "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
-      %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-
-
-<!-- end of XHTML Mobile 1.0 DTD  ........................................... -->
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent
deleted file mode 100644
index cf709d1..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent
deleted file mode 100644
index 16f876b..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent
+++ /dev/null
@@ -1,242 +0,0 @@
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd
deleted file mode 100644
index 5d3f791..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd
+++ /dev/null
@@ -1,1225 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Frameset DTD
-
-   This is the same as HTML 4.0 Frameset except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo |object | applet | img | map | iframe">
-
-<!ENTITY % fontstyle "tt | i | b | big | small | u
-                      | s | strike |font | basefont">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, frameset)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- only one noframes element permitted per document -->
-
-<!ELEMENT frameset (frameset|frame|noframes)*>
-<!ATTLIST frameset
-  %coreattrs;
-  rows        %MultiLengths; #IMPLIED
-  cols        %MultiLengths; #IMPLIED
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  >
-
-<!-- reserved frame names start with "_" otherwise starts with letter -->
-
-<!-- tiled window within frameset -->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  noresize    (noresize)     #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  >
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes (body)>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-   %attrs;
-  cite        %URI;          #IMPLIED
-   >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form |%inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=":"
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd
deleted file mode 100644
index fdb11a0..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd
+++ /dev/null
@@ -1,988 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Strict DTD
-
-   This is the same as HTML 4.0 Strict except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo | object | img | map">
-
-<!ENTITY % fontstyle "tt | i | b | big | small">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl">
-<!ENTITY % blocktext "pre | hr | blockquote | address">
-
-<!ENTITY % block
-     "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, big, small, sup or sup -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Block; excluding form -->
-
-<!ENTITY % form.content "(%block; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form and form controls -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-    table | %special; | %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Block;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Block;>
-<!ATTLIST body
-  %attrs;
-  onload          %Script;   #IMPLIED
-  onunload        %Script;   #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-   %attrs;
-   >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-   %attrs;
-   >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-   %attrs;
-   >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-   %attrs;
-   >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-   %attrs;
-   >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-   %attrs;
-   >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  >
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  >
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  xml:space (preserve) #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Block;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
-   Note that in this DTD there is no name attribute. That
-   is only available in the transitional and frameset DTD.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form and form controls
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd
deleted file mode 100644
index 1fc9ee2..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd
+++ /dev/null
@@ -1,1196 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Transitional DTD
-
-   This is the same as HTML 4.0 Transitional except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo | object | applet | img | map | iframe">
-
-<!ENTITY % fontstyle "tt | i | b | big | small | u
-                      | s | strike |font | basefont">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes %Flow;>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Length;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        CDATA          #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd
deleted file mode 100644
index 33a8517..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd
+++ /dev/null
@@ -1,4513 +0,0 @@
-<!-- ....................................................................... -->
-<!-- XHTML 1.1 DTD  ........................................................ -->
-<!-- file: xhtml11.dtd
--->
-
-<!-- XHTML 1.1 DTD
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-
-     The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2000 World Wide Web Consortium
-        (Massachusetts Institute of Technology, Institut National de
-         Recherche en Informatique et en Automatique, Keio University).
-         All Rights Reserved.
-
-     Permission to use, copy, modify and distribute the XHTML DTD and its 
-     accompanying documentation for any purpose and without fee is hereby 
-     granted in perpetuity, provided that the above copyright notice and 
-     this paragraph appear in all copies.  The copyright holders make no 
-     representation about the suitability of the DTD for any purpose.
-
-     It is provided "as is" without expressed or implied warranty.
-
-        Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
--->
-<!-- This is the driver file for version 1.1 of the XHTML DTD.
-
-     Please use this formal public identifier to identify it:
-
-         "-//W3C//DTD XHTML 1.1//EN"
--->
-<!ENTITY % XHTML.version  "-//W3C//DTD XHTML 1.1//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- For example, if you are using XHTML 1.1 directly, use the FPI
-     in the DOCTYPE declaration, with the xmlns attribute on the
-     document element to identify the default namespace:
-
-       <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
-       <html xmlns="http://www.w3.org/1999/xhtml"
-             xml:lang="en">
-       ...
-       </html>
-
-     Revisions:
-     (none)
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Bidirectional Text features
-     This feature-test entity is used to declare elements
-     and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi  "INCLUDE" >
-
-<?doc type="doctype" role="title" { XHTML 1.1 } ?>
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Pre-Framework Redeclaration placeholder  .................... -->
-<!-- this serves as a location to insert markup declarations
-     into the DTD prior to the framework declarations.
--->
-<!ENTITY % xhtml-prefw-redecl.module "IGNORE" >
-<![%xhtml-prefw-redecl.module;[
-%xhtml-prefw-redecl.mod;
-<!-- end of xhtml-prefw-redecl.module -->]]>
-
-<!ENTITY % xhtml-events.module "INCLUDE" >
-
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module  ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Style
-
-     This module declares the 'style' attribute, used to support inline
-     style markup. This module must be instantiated prior to the XHTML
-     Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
-     "style        CDATA                    #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
-     "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-]]>
-
-<!-- declare Document Model module instantiated in framework
--->
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "xhtml11-model-1.mod" >
-
-<!-- Modular Framework Module (required) ......................... -->
-<!ENTITY % xhtml-framework.module "INCLUDE" >
-<![%xhtml-framework.module;[
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "IGNORE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-#2000-10-22: added qname declarations for ruby elements
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
-       for XHTML and extensions.
-
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Intrinsic Events Module  ....................................... -->
-<!-- file: xhtml-events-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Intrinsic Event Attributes
-
-     These are the event attributes defined in HTML 4.0,
-     Section 18.2.3 "Intrinsic Events". This module must be
-     instantiated prior to the Attributes Module but after
-     the Datatype Module in the Modular Framework module.
-
-    "Note: Authors of HTML documents are advised that changes
-     are likely to occur in the realm of intrinsic events
-     (e.g., how scripts are bound to events). Research in
-     this realm is carried on by members of the W3C Document
-     Object Model Working Group (see the W3C Web site at
-     http://www.w3.org/ for more information)."
--->
-<!-- NOTE: Because the ATTLIST declarations in this module occur
-     before their respective ELEMENT declarations in other
-     modules, there may be a dependency on this module that
-     should be considered if any of the parameter entities used
-     for element type names (eg., %a.qname;) are redeclared.
--->
-
-<!ENTITY % Events.attrib
-     "onclick      %Script.datatype;        #IMPLIED
-      ondblclick   %Script.datatype;        #IMPLIED
-      onmousedown  %Script.datatype;        #IMPLIED
-      onmouseup    %Script.datatype;        #IMPLIED
-      onmouseover  %Script.datatype;        #IMPLIED
-      onmousemove  %Script.datatype;        #IMPLIED
-      onmouseout   %Script.datatype;        #IMPLIED
-      onkeypress   %Script.datatype;        #IMPLIED
-      onkeydown    %Script.datatype;        #IMPLIED
-      onkeyup      %Script.datatype;        #IMPLIED"
->
-
-<!-- additional attributes on anchor element
--->
-<!ATTLIST %a.qname;
-     onfocus      %Script.datatype;         #IMPLIED
-     onblur       %Script.datatype;         #IMPLIED
->
-
-<!-- additional attributes on form element
--->
-<!ATTLIST %form.qname;
-      onsubmit     %Script.datatype;        #IMPLIED
-      onreset      %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on label element
--->
-<!ATTLIST %label.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on input element
--->
-<!ATTLIST %input.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onselect     %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on select element
--->
-<!ATTLIST %select.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on textarea element
--->
-<!ATTLIST %textarea.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onselect     %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on button element
--->
-<!ATTLIST %button.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on body element
--->
-<!ATTLIST %body.qname;
-      onload       %Script.datatype;        #IMPLIED
-      onunload     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on area element
--->
-<!ATTLIST %area.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- end of xhtml-events-1.mod -->
-]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML 1.1 Document Model Module  ...................................... -->
-<!-- file: xhtml11-model-1.mod
-
-     This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML 1.1 Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
-
-     XHTML has three basic content models:
-
-         %Inline.mix;  character-level elements
-         %Block.mix;   block-like elements, eg., paragraphs and lists
-         %Flow.mix;    any block or inline elements
-
-     Any parameter entities declared in this module may be used
-     to create element content models, but the above three are
-     considered 'global' (insofar as that term applies here).
-
-     The reserved word '#PCDATA' (indicating a text string) is now
-     included explicitly with each element declaration that is
-     declared as mixed content, as XML requires that this token
-     occur first in a content model specification.
--->
-<!-- Extending the Model
-
-     While in some cases this module may need to be rewritten to
-     accommodate changes to the document model, minor extensions
-     may be accomplished by redeclaring any of the three *.extra;
-     parameter entities to contain extension element types as follows:
-
-         %Misc.extra;    whose parent may be any block or
-                         inline element.
-
-         %Inline.extra;  whose parent may be any inline element.
-
-         %Block.extra;   whose parent may be any block element.
-
-     If used, these parameter entities must be an OR-separated
-     list beginning with an OR separator ("|"), eg., "| a | b | c"
-
-     All block and inline *.class parameter entities not part
-     of the *struct.class classes begin with "| " to allow for
-     exclusion from mixes.
--->
-
-<!-- ..............  Optional Elements in head  .................. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %script.qname; | %style.qname; | %meta.qname;
-      | %link.qname; | %object.qname; )*"
->
-
-<!-- .................  Miscellaneous Elements  .................. -->
-
-<!-- ins and del are used to denote editing changes
--->
-<!ENTITY % Edit.class "| %ins.qname; | %del.qname;" >
-
-<!-- script and noscript are used to contain scripts
-     and alternative content
--->
-<!ENTITY % Script.class "| %script.qname; | %noscript.qname;" >
-
-<!ENTITY % Misc.extra "" >
-
-<!-- These elements are neither block nor inline, and can
-     essentially be used anywhere in the document body.
--->
-<!ENTITY % Misc.class
-     "%Edit.class;
-      %Script.class;
-      %Misc.extra;"
->
-
-<!-- ....................  Inline Elements  ...................... -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
-     "| %tt.qname; | %i.qname; | %b.qname; | %big.qname;
-      | %small.qname; | %sub.qname; | %sup.qname;" >
-
-<!ENTITY % I18n.class "| %bdo.qname;" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class
-     "| %img.qname; | %map.qname;
-      | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname; | %button.qname;" >
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Ruby.class "| %ruby.qname;" >
-
-<!-- %Inline.class; includes all inline elements,
-     used as a component in mixes
--->
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Ruby.class;
-      %Inline.extra;"
->
-
-<!-- %InlNoRuby.class; includes all inline elements
-     except ruby, used as a component in mixes
--->
-<!ENTITY % InlNoRuby.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!-- %NoRuby.content; includes all inlines except ruby
--->
-<!ENTITY % NoRuby.content
-     "( #PCDATA
-      | %InlNoRuby.class;
-      %Misc.class; )*"
->
-
-<!-- %InlNoAnchor.class; includes all non-anchor inlines,
-     used as a component in mixes
--->
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Ruby.class;
-      %Inline.extra;"
->
-
-<!-- %InlNoAnchor.mix; includes all non-anchor inlines
--->
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!-- %Inline.mix; includes all inline elements, including %Misc.class;
--->
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- .....................  Block Elements  ...................... -->
-
-<!-- In the HTML 4.0 DTD, heading and list elements were included
-     in the %block; parameter entity. The %Heading.class; and
-     %List.class; parameter entities must now be included explicitly
-     on element declarations where desired.
--->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;" >
-
-<!ENTITY % List.class "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;" >
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!-- %Block.class; includes all block elements,
-     used as an component in mixes
--->
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!-- %Block.mix; includes all block elements plus %Misc.class;
--->
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- ................  All Content Elements  .................. -->
-
-<!-- %Flow.mix; includes all text content, block and inline
--->
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml11-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
-
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
-
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-]]>
-
-<!-- Post-Framework Redeclaration placeholder  ................... -->
-<!-- this serves as a location to insert markup declarations
-     into the DTD following the framework declarations.
--->
-<!ENTITY % xhtml-postfw-redecl.module "IGNORE" >
-<![%xhtml-postfw-redecl.module;[
-%xhtml-postfw-redecl.mod;
-<!-- end of xhtml-postfw-redecl.module -->]]>
-
-<!-- Text Module (Required)  ..................................... -->
-<!ENTITY % xhtml-text.module "INCLUDE" >
-<![%xhtml-text.module;[
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-]]>
-
-<!-- Hypertext Module (required) ................................. -->
-<!ENTITY % xhtml-hypertext.module "INCLUDE" >
-<![%xhtml-hypertext.module;[
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-]]>
-
-<!-- Lists Module (required)  .................................... -->
-<!ENTITY % xhtml-list.module "INCLUDE" >
-<![%xhtml-list.module;[
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-]]>
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Edit Module  ................................................ -->
-<!ENTITY % xhtml-edit.module "INCLUDE" >
-<![%xhtml-edit.module;[
-<!ENTITY % xhtml-edit.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Editing Elements Module  ....................................... -->
-<!-- file: xhtml-edit-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Editing Elements
-
-        ins, del
-
-     This module declares element types and attributes used to indicate
-     inserted and deleted content while editing a document.
--->
-
-<!-- ins: Inserted Text  ............................... -->
-
-<!ENTITY % ins.element  "INCLUDE" >
-<![%ins.element;[
-<!ENTITY % ins.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % ins.qname  "ins" >
-<!ELEMENT %ins.qname;  %ins.content; >
-<!-- end of ins.element -->]]>
-
-<!ENTITY % ins.attlist  "INCLUDE" >
-<![%ins.attlist;[
-<!ATTLIST %ins.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
-      datetime     %Datetime.datatype;      #IMPLIED
->
-<!-- end of ins.attlist -->]]>
-
-<!-- del: Deleted Text  ................................ -->
-
-<!ENTITY % del.element  "INCLUDE" >
-<![%del.element;[
-<!ENTITY % del.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % del.qname  "del" >
-<!ELEMENT %del.qname;  %del.content; >
-<!-- end of del.element -->]]>
-
-<!ENTITY % del.attlist  "INCLUDE" >
-<![%del.attlist;[
-<!ATTLIST %del.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
-      datetime     %Datetime.datatype;      #IMPLIED
->
-<!-- end of del.attlist -->]]>
-
-<!-- end of xhtml-edit-1.mod -->
-]]>
-
-<!-- BIDI Override Module  ....................................... -->
-<!ENTITY % xhtml-bdo.module "%XHTML.bidi;" >
-<![%xhtml-bdo.module;[
-<!ENTITY % xhtml-bdo.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML BDO Element Module ............................................. -->
-<!-- file: xhtml-bdo-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML BDO Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Bidirectional Override (bdo) Element
-
-     This modules declares the element 'bdo', used to override the
-     Unicode bidirectional algorithm for selected fragments of text.
-
-     DEPENDENCIES:
-     Relies on the conditional section keyword %XHTML.bidi; declared
-     as "INCLUDE". Bidirectional text support includes both the bdo
-     element and the 'dir' attribute.
--->
-
-<!ENTITY % bdo.element  "INCLUDE" >
-<![%bdo.element;[
-<!ENTITY % bdo.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % bdo.qname  "bdo" >
-<!ELEMENT %bdo.qname;  %bdo.content; >
-<!-- end of bdo.element -->]]>
-
-<!ENTITY % bdo.attlist  "INCLUDE" >
-<![%bdo.attlist;[
-<!ATTLIST %bdo.qname;
-      %Core.attrib;
-      xml:lang     %LanguageCode.datatype;  #IMPLIED
-      dir          ( ltr | rtl )            #REQUIRED
->
-]]>
-
-<!-- end of xhtml-bdo-1.mod -->
-]]>
-
-<!-- Ruby Module  ................................................ -->
-<!ENTITY % Ruby.common.attlists "INCLUDE" >
-<!ENTITY % Ruby.common.attrib "%Common.attrib;" >
-<!ENTITY % xhtml-ruby.module "INCLUDE" >
-<![%xhtml-ruby.module;[
-<!ENTITY % xhtml-ruby.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Ruby 1.0//EN"
-            "http://www.w3.org/TR/ruby/xhtml-ruby-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Ruby Module .................................................... -->
-<!-- file: xhtml-ruby-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1999-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This module is based on the W3C Ruby Annotation Specification:
-
-        http://www.w3.org/TR/ruby
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Ruby 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/ruby/xhtml-ruby-1.mod"
-
-     ...................................................................... -->
-
-<!-- Ruby Elements
-
-        ruby, rbc, rtc, rb, rt, rp
-
-     This module declares the elements and their attributes used to
-     support ruby annotation markup.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % ruby.qname  "ruby" >
-<!ENTITY % rbc.qname  "rbc" >
-<!ENTITY % rtc.qname  "rtc" >
-<!ENTITY % rb.qname  "rb" >
-<!ENTITY % rt.qname  "rt" >
-<!ENTITY % rp.qname  "rp" >
-
-<!-- rp fallback is included by default.
--->
-<!ENTITY % Ruby.fallback "INCLUDE" >
-<!ENTITY % Ruby.fallback.mandatory "IGNORE" >
-
-<!-- Complex ruby is included by default; it may be 
-     overridden by other modules to ignore it.
--->
-<!ENTITY % Ruby.complex "INCLUDE" >
-
-<!-- Fragments for the content model of the ruby element -->
-<![%Ruby.fallback;[
-<![%Ruby.fallback.mandatory;[
-<!ENTITY % Ruby.content.simple 
-     "( %rb.qname;, %rp.qname;, %rt.qname;, %rp.qname; )"
->
-]]>
-<!ENTITY % Ruby.content.simple 
-     "( %rb.qname;, ( %rt.qname; | ( %rp.qname;, %rt.qname;, %rp.qname; ) ) )"
->
-]]>
-<!ENTITY % Ruby.content.simple "( %rb.qname;, %rt.qname; )" >
-
-<![%Ruby.complex;[
-<!ENTITY % Ruby.content.complex 
-     "| ( %rbc.qname;, %rtc.qname;, %rtc.qname;? )"
->
-]]>
-<!ENTITY % Ruby.content.complex "" >
-
-<!-- Content models of the rb and the rt elements are intended to
-     allow other inline-level elements of its parent markup language,
-     but it should not include ruby descendent elements. The following
-     parameter entity %NoRuby.content; can be used to redefine
-     those content models with minimum effort.  It's defined as
-     '( #PCDATA )' by default.
--->
-<!ENTITY % NoRuby.content "( #PCDATA )" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- ruby element ...................................... -->
-
-<!ENTITY % ruby.element  "INCLUDE" >
-<![%ruby.element;[
-<!ENTITY % ruby.content
-     "( %Ruby.content.simple; %Ruby.content.complex; )"
->
-<!ELEMENT %ruby.qname;  %ruby.content; >
-<!-- end of ruby.element -->]]>
-
-<![%Ruby.complex;[
-<!-- rbc (ruby base component) element ................. -->
-
-<!ENTITY % rbc.element  "INCLUDE" >
-<![%rbc.element;[
-<!ENTITY % rbc.content
-     "(%rb.qname;)+"
->
-<!ELEMENT %rbc.qname;  %rbc.content; >
-<!-- end of rbc.element -->]]>
-
-<!-- rtc (ruby text component) element ................. -->
-
-<!ENTITY % rtc.element  "INCLUDE" >
-<![%rtc.element;[
-<!ENTITY % rtc.content
-     "(%rt.qname;)+"
->
-<!ELEMENT %rtc.qname;  %rtc.content; >
-<!-- end of rtc.element -->]]>
-]]>
-
-<!-- rb (ruby base) element ............................ -->
-
-<!ENTITY % rb.element  "INCLUDE" >
-<![%rb.element;[
-<!-- %rb.content; uses %NoRuby.content; as its content model,
-     which is '( #PCDATA )' by default. It may be overridden
-     by other modules to allow other inline-level elements
-     of its parent markup language, but it should not include
-     ruby descendent elements.
--->
-<!ENTITY % rb.content "%NoRuby.content;" >
-<!ELEMENT %rb.qname;  %rb.content; >
-<!-- end of rb.element -->]]>
-
-<!-- rt (ruby text) element ............................ -->
-
-<!ENTITY % rt.element  "INCLUDE" >
-<![%rt.element;[
-<!-- %rt.content; uses %NoRuby.content; as its content model,
-     which is '( #PCDATA )' by default. It may be overridden
-     by other modules to allow other inline-level elements
-     of its parent markup language, but it should not include
-     ruby descendent elements.
--->
-<!ENTITY % rt.content "%NoRuby.content;" >
-
-<!ELEMENT %rt.qname;  %rt.content; >
-<!-- end of rt.element -->]]>
-
-<!-- rbspan attribute is used for complex ruby only ...... -->
-<![%Ruby.complex;[
-<!ENTITY % rt.attlist  "INCLUDE" >
-<![%rt.attlist;[
-<!ATTLIST %rt.qname;
-      rbspan         %Number.datatype;      "1"
->
-<!-- end of rt.attlist -->]]>
-]]>
-
-<!-- rp (ruby parenthesis) element ..................... -->
-
-<![%Ruby.fallback;[
-<!ENTITY % rp.element  "INCLUDE" >
-<![%rp.element;[
-<!ENTITY % rp.content
-     "( #PCDATA )"
->
-<!ELEMENT %rp.qname;  %rp.content; >
-<!-- end of rp.element -->]]>
-]]>
-
-<!-- Ruby Common Attributes
-
-     The following optional ATTLIST declarations provide an easy way
-     to define common attributes for ruby elements.  These declarations
-     are ignored by default.
-
-     Ruby elements are intended to have common attributes of its
-     parent markup language.  For example, if a markup language defines
-     common attributes as a parameter entity %attrs;, you may add
-     those attributes by just declaring the following parameter entities
-
-         <!ENTITY % Ruby.common.attlists  "INCLUDE" >
-         <!ENTITY % Ruby.common.attrib  "%attrs;" >
-
-     before including the Ruby module.
--->
-
-<!ENTITY % Ruby.common.attlists  "IGNORE" >
-<![%Ruby.common.attlists;[
-<!ENTITY % Ruby.common.attrib  "" >
-
-<!-- common attributes for ruby ........................ -->
-
-<!ENTITY % Ruby.common.attlist  "INCLUDE" >
-<![%Ruby.common.attlist;[
-<!ATTLIST %ruby.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Ruby.common.attlist -->]]>
-
-<![%Ruby.complex;[
-<!-- common attributes for rbc ......................... -->
-
-<!ENTITY % Rbc.common.attlist  "INCLUDE" >
-<![%Rbc.common.attlist;[
-<!ATTLIST %rbc.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rbc.common.attlist -->]]>
-
-<!-- common attributes for rtc ......................... -->
-
-<!ENTITY % Rtc.common.attlist  "INCLUDE" >
-<![%Rtc.common.attlist;[
-<!ATTLIST %rtc.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rtc.common.attlist -->]]>
-]]>
-
-<!-- common attributes for rb .......................... -->
-
-<!ENTITY % Rb.common.attlist  "INCLUDE" >
-<![%Rb.common.attlist;[
-<!ATTLIST %rb.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rb.common.attlist -->]]>
-
-<!-- common attributes for rt .......................... -->
-
-<!ENTITY % Rt.common.attlist  "INCLUDE" >
-<![%Rt.common.attlist;[
-<!ATTLIST %rt.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rt.common.attlist -->]]>
-
-<![%Ruby.fallback;[
-<!-- common attributes for rp .......................... -->
-
-<!ENTITY % Rp.common.attlist  "INCLUDE" >
-<![%Rp.common.attlist;[
-<!ATTLIST %rp.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rp.common.attlist -->]]>
-]]>
-]]>
-
-<!-- end of xhtml-ruby-1.mod -->
-]]>
-
-<!-- Presentation Module  ........................................ -->
-<!ENTITY % xhtml-pres.module "INCLUDE" >
-<![%xhtml-pres.module;[
-<!ENTITY % xhtml-pres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Presentation Module ............................................ -->
-<!-- file: xhtml-pres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Presentational Elements
-
-     This module defines elements and their attributes for
-     simple presentation-related markup.
--->
-
-<!ENTITY % xhtml-inlpres.module "INCLUDE" >
-<![%xhtml-inlpres.module;[
-<!ENTITY % xhtml-inlpres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-            "xhtml-inlpres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module  .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
-        b, big, i, small, sub, sup, tt
-
-     This module declares the elements and their attributes used to
-     support inline-level presentational markup.
--->
-
-<!ENTITY % b.element  "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname  "b" >
-<!ELEMENT %b.qname;  %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist  "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
-      %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element  "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname  "big" >
-<!ELEMENT %big.qname;  %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist  "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
-      %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element  "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname  "i" >
-<!ELEMENT %i.qname;  %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist  "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
-      %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element  "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname  "small" >
-<!ELEMENT %small.qname;  %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist  "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
-      %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element  "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname  "sub" >
-<!ELEMENT %sub.qname;  %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist  "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
-      %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element  "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname  "sup" >
-<!ELEMENT %sup.qname;  %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist  "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
-      %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element  "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname  "tt" >
-<!ELEMENT %tt.qname;  %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist  "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
-      %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkpres.module "INCLUDE" >
-<![%xhtml-blkpres.module;[
-<!ENTITY % xhtml-blkpres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-            "xhtml-blkpres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module  ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Presentational Elements
-
-        hr
-
-     This module declares the elements and their attributes used to
-     support block-level presentational markup.
--->
-
-<!ENTITY % hr.element  "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content  "EMPTY" >
-<!ENTITY % hr.qname  "hr" >
-<!ELEMENT %hr.qname;  %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist  "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
-      %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-]]>
-
-<!-- end of xhtml-pres-1.mod -->
-]]>
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by stylesheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-]]>
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-]]>
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-]]>
-
-<!-- Scripting Module  ........................................... -->
-<!ENTITY % xhtml-script.module "INCLUDE" >
-<![%xhtml-script.module;[
-<!ENTITY % xhtml-script.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Scripting Module  ..................................... -->
-<!-- file: xhtml-script-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Scripting
-
-        script, noscript
-
-     This module declares element types and attributes used to provide
-     support for executable scripts as well as an alternate content
-     container where scripts are not supported.
--->
-
-<!-- script: Scripting Statement ....................... -->
-
-<!ENTITY % script.element  "INCLUDE" >
-<![%script.element;[
-<!ENTITY % script.content  "( #PCDATA )" >
-<!ENTITY % script.qname  "script" >
-<!ELEMENT %script.qname;  %script.content; >
-<!-- end of script.element -->]]>
-
-<!ENTITY % script.attlist  "INCLUDE" >
-<![%script.attlist;[
-<!ATTLIST %script.qname;
-      %XHTML.xmlns.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #REQUIRED
-      src          %URI.datatype;           #IMPLIED
-      defer        ( defer )                #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of script.attlist -->]]>
-
-<!-- noscript: No-Script Alternate Content ............. -->
-
-<!ENTITY % noscript.element  "INCLUDE" >
-<![%noscript.element;[
-<!ENTITY % noscript.content
-     "( %Block.mix; )+"
->
-<!ENTITY % noscript.qname  "noscript" >
-<!ELEMENT %noscript.qname;  %noscript.content; >
-<!-- end of noscript.element -->]]>
-
-<!ENTITY % noscript.attlist  "INCLUDE" >
-<![%noscript.attlist;[
-<!ATTLIST %noscript.qname;
-      %Common.attrib;
->
-<!-- end of noscript.attlist -->]]>
-
-<!-- end of xhtml-script-1.mod -->
-]]>
-
-<!-- Style Sheets Module  ......................................... -->
-<!ENTITY % xhtml-style.module "INCLUDE" >
-<![%xhtml-style.module;[
-<!ENTITY % xhtml-style.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  .................................... -->
-<!-- file: xhtml-style-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Style Sheets
-
-        style
-
-     This module declares the style element type and its attributes,
-     used to embed stylesheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information ..................... -->
-
-<!ENTITY % style.element  "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content  "( #PCDATA )" >
-<!ENTITY % style.qname  "style" >
-<!ELEMENT %style.qname;  %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist  "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
-      %XHTML.xmlns.attrib;
-      %title.attrib;
-      %I18n.attrib;
-      type         %ContentType.datatype;   #REQUIRED
-      media        %MediaDesc.datatype;     #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-]]>
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-]]>
-
-<!-- Client-side Image Map Module  ............................... -->
-<!ENTITY % xhtml-csismap.module "INCLUDE" >
-<![%xhtml-csismap.module;[
-<!ENTITY % xhtml-csismap.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Client-side Image Map Module  .................................. -->
-<!-- file: xhtml-csismap-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Client-side Image Maps
-
-        area, map
-
-     This module declares elements and attributes to support client-side
-     image maps. This requires that the Image Module (or a module
-     declaring the img element type) be included in the DTD.
-
-     These can be placed in the same document or grouped in a
-     separate document, although the latter isn't widely supported
--->
-
-<!ENTITY % area.element  "INCLUDE" >
-<![%area.element;[
-<!ENTITY % area.content  "EMPTY" >
-<!ENTITY % area.qname  "area" >
-<!ELEMENT %area.qname;  %area.content; >
-<!-- end of area.element -->]]>
-
-<!ENTITY % Shape.datatype "( rect | circle | poly | default )">
-<!ENTITY % Coords.datatype "CDATA" >
-
-<!ENTITY % area.attlist  "INCLUDE" >
-<![%area.attlist;[
-<!ATTLIST %area.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      shape        %Shape.datatype;         'rect'
-      coords       %Coords.datatype;        #IMPLIED
-      nohref       ( nohref )               #IMPLIED
-      alt          %Text.datatype;          #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of area.attlist -->]]>
-
-<!-- modify anchor attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %a.qname;
-      shape        %Shape.datatype;         'rect'
-      coords       %Coords.datatype;        #IMPLIED
->
-
-<!-- modify img attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %img.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- modify form input attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %input.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- modify object attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %object.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- 'usemap' points to the 'id' attribute of a <map> element,
-     which must be in the same document; support for external
-     document maps was not widely supported in HTML and is
-     eliminated in XHTML.
-
-     It is considered an error for the element pointed to by
-     a usemap IDREF to occur in anything but a <map> element.
--->
-
-<!ENTITY % map.element  "INCLUDE" >
-<![%map.element;[
-<!ENTITY % map.content
-     "(( %Block.mix; ) | %area.qname; )+"
->
-<!ENTITY % map.qname  "map" >
-<!ELEMENT %map.qname;  %map.content; >
-<!-- end of map.element -->]]>
-
-<!ENTITY % map.attlist  "INCLUDE" >
-<![%map.attlist;[
-<!ATTLIST %map.qname;
-      %XHTML.xmlns.attrib;
-      id           ID                       #REQUIRED
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;
-      %I18n.attrib;
-      %Events.attrib;
->
-<!-- end of map.attlist -->]]>
-
-<!-- end of xhtml-csismap-1.mod -->
-]]>
-
-<!-- Server-side Image Map Module  ............................... -->
-<!ENTITY % xhtml-ssismap.module "INCLUDE" >
-<![%xhtml-ssismap.module;[
-<!ENTITY % xhtml-ssismap.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Server-side Image Map Module  .................................. -->
-<!-- file: xhtml-ssismap-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod"
-
-     Revisions:
-#2000-10-22: added declaration for 'ismap' on <input>
-     ....................................................................... -->
-
-<!-- Server-side Image Maps
-
-     This adds the 'ismap' attribute to the img and input elements
-     to support server-side processing of a user selection.
--->
-
-<!ATTLIST %img.qname;
-      ismap        ( ismap )                #IMPLIED
->
-
-<!ATTLIST %input.qname;
-      ismap        ( ismap )                #IMPLIED
->
-
-<!-- end of xhtml-ssismap-1.mod -->
-]]>
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element,
-     used to provide named property values for the applet
-     and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-]]>
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
-
-     Note that use of this module requires instantiation of the Param
-     Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-]]>
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Table Module  .................................................. -->
-<!-- file: xhtml-table-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Tables
-
-        table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
-
-     This module declares element types and attributes used to provide
-     table markup similar to HTML 4.0, including features that enable
-     better accessibility for non-visual user agents.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % thead.qname  "thead" >
-<!ENTITY % tfoot.qname  "tfoot" >
-<!ENTITY % tbody.qname  "tbody" >
-<!ENTITY % colgroup.qname  "colgroup" >
-<!ENTITY % col.qname  "col" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- The frame attribute specifies which parts of the frame around
-     the table should be rendered. The values are not the same as
-     CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % frame.attrib
-     "frame        ( void
-                   | above
-                   | below
-                   | hsides
-                   | lhs
-                   | rhs
-                   | vsides
-                   | box
-                   | border )               #IMPLIED"
->
-
-<!-- The rules attribute defines which rules to draw between cells:
-
-     If rules is absent then assume:
-
-       "none" if border is absent or border="0" otherwise "all"
--->
-<!ENTITY % rules.attrib
-     "rules        ( none
-                   | groups
-                   | rows
-                   | cols
-                   | all )                  #IMPLIED"
->
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right
-                   | justify
-                   | char )                 #IMPLIED
-      char         %Character.datatype;     #IMPLIED
-      charoff      %Length.datatype;        #IMPLIED"
->
-
-<!-- vertical alignment attribute for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom
-                   | baseline )             #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row
-                   | col
-                   | rowgroup
-                   | colgroup )             #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, ( %col.qname;* | %colgroup.qname;* ),
-      (( %thead.qname;?, %tfoot.qname;?, %tbody.qname;+ ) | ( %tr.qname;+ )))"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      border       %Pixels.datatype;        #IMPLIED
-      %frame.attrib;
-      %rules.attrib;
-      cellspacing  %Length.datatype;        #IMPLIED
-      cellpadding  %Length.datatype;        #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- thead: Table Header ............................... -->
-
-<!-- Use thead to duplicate headers when breaking table
-     across page boundaries, or for static headers when
-     tbody sections are rendered in scrolling panel.
--->
-
-<!ENTITY % thead.element  "INCLUDE" >
-<![%thead.element;[
-<!ENTITY % thead.content  "( %tr.qname; )+" >
-<!ELEMENT %thead.qname;  %thead.content; >
-<!-- end of thead.element -->]]>
-
-<!ENTITY % thead.attlist  "INCLUDE" >
-<![%thead.attlist;[
-<!ATTLIST %thead.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of thead.attlist -->]]>
-
-<!-- tfoot: Table Footer ............................... -->
-
-<!-- Use tfoot to duplicate footers when breaking table
-     across page boundaries, or for static footers when
-     tbody sections are rendered in scrolling panel.
--->
-
-<!ENTITY % tfoot.element  "INCLUDE" >
-<![%tfoot.element;[
-<!ENTITY % tfoot.content  "( %tr.qname; )+" >
-<!ELEMENT %tfoot.qname;  %tfoot.content; >
-<!-- end of tfoot.element -->]]>
-
-<!ENTITY % tfoot.attlist  "INCLUDE" >
-<![%tfoot.attlist;[
-<!ATTLIST %tfoot.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tfoot.attlist -->]]>
-
-<!-- tbody: Table Body ................................. -->
-
-<!-- Use multiple tbody sections when rules are needed
-     between groups of table rows.
--->
-
-<!ENTITY % tbody.element  "INCLUDE" >
-<![%tbody.element;[
-<!ENTITY % tbody.content  "( %tr.qname; )+" >
-<!ELEMENT %tbody.qname;  %tbody.content; >
-<!-- end of tbody.element -->]]>
-
-<!ENTITY % tbody.attlist  "INCLUDE" >
-<![%tbody.attlist;[
-<!ATTLIST %tbody.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tbody.attlist -->]]>
-
-<!-- colgroup: Table Column Group ...................... -->
-
-<!-- colgroup groups a set of col elements. It allows you
-     to group several semantically-related columns together.
--->
-
-<!ENTITY % colgroup.element  "INCLUDE" >
-<![%colgroup.element;[
-<!ENTITY % colgroup.content  "( %col.qname; )*" >
-<!ELEMENT %colgroup.qname;  %colgroup.content; >
-<!-- end of colgroup.element -->]]>
-
-<!ENTITY % colgroup.attlist  "INCLUDE" >
-<![%colgroup.attlist;[
-<!ATTLIST %colgroup.qname;
-      %Common.attrib;
-      span         %Number.datatype;        '1'
-      width        %MultiLength.datatype;   #IMPLIED
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of colgroup.attlist -->]]>
-
-<!-- col: Table Column ................................. -->
-
-<!-- col elements define the alignment properties for
-     cells in one or more columns.
-
-     The width attribute specifies the width of the
-     columns, e.g.
-
-       width="64"        width in screen pixels
-       width="0.5*"      relative width of 0.5
-
-     The span attribute causes the attributes of one
-     col element to apply to more than one column.
--->
-
-<!ENTITY % col.element  "INCLUDE" >
-<![%col.element;[
-<!ENTITY % col.content  "EMPTY" >
-<!ELEMENT %col.qname;  %col.content; >
-<!-- end of col.element -->]]>
-
-<!ENTITY % col.attlist  "INCLUDE" >
-<![%col.attlist;[
-<!ATTLIST %col.qname;
-      %Common.attrib;
-      span         %Number.datatype;        '1'
-      width        %MultiLength.datatype;   #IMPLIED
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of col.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-table-1.mod -->
-]]>
-
-<!-- Forms Module  ............................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Forms Module  .................................................. -->
-<!-- file: xhtml-form-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Forms
-
-        form, label, input, select, optgroup, option,
-        textarea, fieldset, legend, button
-
-     This module declares markup to provide support for online
-     forms, based on the features found in HTML 4.0 forms.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % optgroup.qname  "optgroup" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-<!ENTITY % fieldset.qname  "fieldset" >
-<!ENTITY % legend.qname  "legend" >
-<!ENTITY % button.qname  "button" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %Table.class;
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix;
-      | %fieldset.qname; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
-      accept-charset %Charsets.datatype;    #IMPLIED
-      accept       %ContentTypes.datatype;  #IMPLIED
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!-- Each label must not contain more than ONE field
--->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!ENTITY % label.content
-     "( #PCDATA
-      | %input.qname; | %select.qname; | %textarea.qname; | %button.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %Inline.extra;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio | submit
-      | reset | file | hidden | image | button )"
->
-<!-- attribute 'name' required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      readonly     ( readonly )             #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      alt          %Text.datatype;          #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      accept       %ContentTypes.datatype;  #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content
-     "( %optgroup.qname; | %option.qname; )+"
->
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- optgroup: Option Group ............................ -->
-
-<!ENTITY % optgroup.element  "INCLUDE" >
-<![%optgroup.element;[
-<!ENTITY % optgroup.content  "( %option.qname; )+" >
-<!ELEMENT %optgroup.qname;  %optgroup.content; >
-<!-- end of optgroup.element -->]]>
-
-<!ENTITY % optgroup.attlist  "INCLUDE" >
-<![%optgroup.attlist;[
-<!ATTLIST %optgroup.qname;
-      %Common.attrib;
-      disabled     ( disabled )             #IMPLIED
-      label        %Text.datatype;          #REQUIRED
->
-<!-- end of optgroup.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      label        %Text.datatype;          #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      disabled     ( disabled )             #IMPLIED
-      readonly     ( readonly )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- fieldset: Form Control Group ...................... -->
-
-<!-- #PCDATA is to solve the mixed content problem,
-     per specification only whitespace is allowed
--->
-
-<!ENTITY % fieldset.element  "INCLUDE" >
-<![%fieldset.element;[
-<!ENTITY % fieldset.content
-     "( #PCDATA | %legend.qname; | %Flow.mix; )*"
->
-<!ELEMENT %fieldset.qname;  %fieldset.content; >
-<!-- end of fieldset.element -->]]>
-
-<!ENTITY % fieldset.attlist  "INCLUDE" >
-<![%fieldset.attlist;[
-<!ATTLIST %fieldset.qname;
-      %Common.attrib;
->
-<!-- end of fieldset.attlist -->]]>
-
-<!-- legend: Fieldset Legend ........................... -->
-
-<!ENTITY % legend.element  "INCLUDE" >
-<![%legend.element;[
-<!ENTITY % legend.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %legend.qname;  %legend.content; >
-<!-- end of legend.element -->]]>
-
-<!ENTITY % legend.attlist  "INCLUDE" >
-<![%legend.attlist;[
-<!ATTLIST %legend.qname;
-      %Common.attrib;
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of legend.attlist -->]]>
-
-<!-- button: Push Button ............................... -->
-
-<!ENTITY % button.element  "INCLUDE" >
-<![%button.element;[
-<!ENTITY % button.content
-     "( #PCDATA
-      | %BlkNoForm.mix;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %InlSpecial.class;
-      %Inline.extra; )*"
->
-<!ELEMENT %button.qname;  %button.content; >
-<!-- end of button.element -->]]>
-
-<!ENTITY % button.attlist  "INCLUDE" >
-<![%button.attlist;[
-<!ATTLIST %button.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      type         ( button | submit | reset ) 'submit'
-      disabled     ( disabled )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of button.attlist -->]]>
-
-<!-- end of xhtml-form-1.mod -->
-]]>
-
-<!-- Legacy Markup ............................................... -->
-<!ENTITY % xhtml-legacy.module "IGNORE" >
-<![%xhtml-legacy.module;[
-<!ENTITY % xhtml-legacy.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
-%xhtml-legacy.mod;]]>
-
-<!-- Document Structure Module (required)  ....................... -->
-<!ENTITY % xhtml-struct.module "INCLUDE" >
-<![%xhtml-struct.module;[
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and
-     their attributes.
-
-     Note that the content model of the head element type is redeclared
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-]]>
-
-<!-- end of XHTML 1.1 DTD  ................................................. -->
-<!-- ....................................................................... -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/plugin.properties b/bundles/org.eclipse.wst.standard.schemas/plugin.properties
deleted file mode 100644
index d748df4..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/plugin.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-
-documentType.displayName.0 = XHTML 1.0 Strict
-documentType.displayName.1 = XHTML 1.0 Transitional
-documentType.displayName.2 = XHTML 1.0 Frameset
-documentType.displayName.3 = XHTML Basic 1.0
-documentType.displayName.4 = XHTML 1.1
-documentType.displayName.5 = XHTML MP 1.0
-documentType.displayName.6 = WML 1.3
-Bundle-Name.0 = Standard Schemas and DTDs
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/plugin.xml b/bundles/org.eclipse.wst.standard.schemas/plugin.xml
deleted file mode 100644
index 4c40c32..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/plugin.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-    <!--==========================================-->
-    <!-- Catalog Contributions                    -->
-    <!-- Register well known Web DTDs and XSDs    -->
-    <!--==========================================-->
-
-    <!-- new form -->
-
-    <!-- 
-        See https://bugs.eclipse.org/bugs/show_bug.cgi?id=100481
-        you may have to comment out following extension if used 
-        in development environment. 
-        
-    -->
-
-    <extension point="org.eclipse.wst.xml.core.catalogContributions">
-        <catalogContribution id="default">
-
-
-            <public
-                publicId="-//WAPFORUM//DTD WML 1.1//EN"
-                uri="dtds/wml11.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
-                uri="dtds/xhtml1-strict.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
-                uri="dtds/xhtml1-transitional.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            </public>
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Frameset//EN"
-                uri="dtds/xhtml1-frameset.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML Basic 1.0//EN"
-                uri="dtds/xhtml-basic10-f.dtd"
-                webURL="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.1//EN"
-                uri="dtds/xhtml11-flat.dtd"
-                webURL="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-            </public>
-
-            <public
-                publicId="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-                uri="dtds/xhtml-mobile10-flat.dtd"
-                webURL="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-            </public>
-
-            <public
-                publicId="-//WAPFORUM//DTD WML 1.3//EN"
-                uri="dtds/wml13.dtd"
-                webURL="http://www.wapforum.org/DTD/wml13.dtd">
-            </public>
-
-        
-
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/"
-                uri="xsd/wsdl.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/soap/"
-                uri="xsd/soap.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/http/"
-                uri="xsd/http.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/mime/"
-                uri="xsd/wsdl-mime.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/soap/encoding/"
-                uri="xsd/soapenc.xsd" />
-
-
-            <!-- these are removed from the catalog, since they are -not- 
-            the same as those in the xsd.ui plugin, which 
-            point to the org.eclipse.xsd versions
-            <uri
-                name="http://www.w3.org/2001/XMLSchema"
-                uri="dtdsAndSchemas/XMLSchema.dtd" />
-                
-            <system
-                systemId="http://www.w3.org/2001/xml.xsd"
-                uri="dtdsAndSchemas/xml.xsd" />
-             -->
-        </catalogContribution>
-
-    </extension>
-
-
-
-
-    <extension point="org.eclipse.wst.sse.core.documentTypes">
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.0"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.0 Strict//EN"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.1"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.0 Transitional//EN"
-            defaultXHTML="true"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.2"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="true"
-            publicID="-//W3C//DTD XHTML 1.0 Frameset//EN"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.3"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML Basic 1.0//EN"
-            systemID="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.4"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.1//EN"
-            systemID="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.5"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-            systemID="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-        </documentType>
-        <documentType
-            elementName="wml"
-            displayName="%documentType.displayName.6"
-            namespaceURI=""
-            isWML="true"
-            hasFrameset="false"
-            publicID="-//WAPFORUM//DTD WML 1.3//EN"
-            defaultWML="true"
-            systemID="http://www.wapforum.org/DTD/wml13.dtd">
-        </documentType>
-    </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd
deleted file mode 100644
index d9466f6..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/http/wsdl-http.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
-
-  --> 
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
-
-	<import namespace = "http://schemas.xmlsoap.org/wsdl/"/>
-
-   	<element name="address" type="http:addressType"/>
-
-   	<complexType name="addressType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-
-   			<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
-   	</complexType>
-
-   	<element name="binding" type="http:bindingType"/>
-   	<complexType name="bindingType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-
-			<sequence/>
-	      		<attribute name="verb" type="NMTOKEN" use="required"/>
-		</extension>
-		</complexContent>
-   	</complexType>
-
-   	<element name="operation" type="http:operationType"/>
-   	<complexType name="operationType">
-		<complexContent>
-
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-	      		<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
-	</complexType>
-
-   	<element name="urlEncoded">
-      		<complexType/>  		
-   	</element>
-
-   	<element name="urlReplacement">
-      		<complexType/>
-     	</element>
-</schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd
deleted file mode 100644
index 3ef8527..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap/" >
-
-  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
-
-  <xs:simpleType name="encodingStyle" >
-    <xs:annotation>
-      <xs:documentation>
-      "encodingStyle" indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value "http://schemas.xmlsoap.org/soap/encoding/" indicates the pattern described in SOAP specification
-      </xs:documentation>
-    </xs:annotation>
-
-    <xs:list itemType="xs:anyURI" />
-  </xs:simpleType>
-
-  <xs:element name="binding" type="soap:tBinding" />
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="transport" type="xs:anyURI" use="required" />
-        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
-
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="tStyleChoice" >
-    <xs:restriction base="xs:string" >
-      <xs:enumeration value="rpc" />
-      <xs:enumeration value="document" />
-    </xs:restriction>
-
-  </xs:simpleType>
-
-  <xs:element name="operation" type="soap:tOperation" />
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
-        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
-      </xs:extension>
-
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="body" type="soap:tBody" />
-  <xs:attributeGroup name="tBodyAttributes" >
-    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />	   
-    <xs:attribute name="use" type="soap:useChoice" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
-  </xs:attributeGroup>
-  <xs:complexType name="tBody" >
-
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="parts" type="xs:NMTOKENS" use="optional" />
-        <xs:attributeGroup ref = "soap:tBodyAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="useChoice" >
-    <xs:restriction base="xs:string" >
-
-      <xs:enumeration value="literal" />
-      <xs:enumeration value="encoded" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="fault" type="soap:tFault" />
-  <xs:complexType name="tFaultRes" abstract="true" >
-    <xs:complexContent>
-      <xs:restriction base="soap:tBody" >
-
-	    <xs:attribute ref="wsdl:required" use="optional" /> 
-        <xs:attribute name="parts" type="xs:NMTOKENS" use="prohibited" />
-		<xs:attributeGroup ref="soap:tBodyAttributes" />
-      </xs:restriction>
-    </xs:complexContent>  	
-  </xs:complexType>
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="soap:tFaultRes">
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <xs:element name="header" type="soap:tHeader" />
-  <xs:attributeGroup name="tHeaderAttributes" >
-    <xs:attribute name="message" type="xs:QName" use="required" />
-    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
-    <xs:attribute name="use" type="soap:useChoice" use="required" />
-
-    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />      
-  </xs:attributeGroup>
-  <xs:complexType name="tHeader" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:sequence>
-          <xs:element ref="soap:headerfault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-
-		<xs:attributeGroup ref="soap:tHeaderAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="headerfault" type="soap:tHeaderFault" />
-  <xs:complexType name="tHeaderFault" >
-	<xs:attributeGroup ref="soap:tHeaderAttributes" />
-  </xs:complexType>
-
-  <xs:element name="address" type="soap:tAddress" />
-  <xs:complexType name="tAddress" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd
deleted file mode 100644
index 5ec80dc..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- Schema for the SOAP/1.1 encoding
-
-Portions © 2001 DevelopMentor. 
-© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
- 
-This document is governed by the W3C Software License [1] as described in the FAQ [2].
-[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
-By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-
-1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
-
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
-
-3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
-
-Original W3C files; http://www.w3.org/2001/06/soap-encoding
-Changes made: 
-     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
-     - reverted root to only allow 0 and 1 as lexical values
-	 - removed default value from root attribute declaration
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
-           targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
-        
- <xs:attribute name="root" >
-   <xs:annotation>
-     <xs:documentation>
-	   'root' can be used to distinguish serialization roots from other
-       elements that are present in a serialization but are not roots of
-       a serialized value graph 
-	 </xs:documentation>
-   </xs:annotation>
-   <xs:simpleType>
-
-     <xs:restriction base='xs:boolean'>
-	   <xs:pattern value='0|1' />
-	 </xs:restriction>
-   </xs:simpleType>
- </xs:attribute>
-
-  <xs:attributeGroup name="commonAttributes" >
-    <xs:annotation>
-	  <xs:documentation>
-
-	    Attributes common to all elements that function as accessors or 
-        represent independent (multi-ref) values.  The href attribute is
-        intended to be used in a manner like CONREF.  That is, the element
-        content should be empty iff the href attribute appears
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:attribute name="id" type="xs:ID" />
-    <xs:attribute name="href" type="xs:anyURI" />
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:attributeGroup>
-
-  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
-       
-  <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
-
-   
-  <xs:simpleType name="arrayCoordinate" >
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-          
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="offset" type="tns:arrayCoordinate" />
-  
-  <xs:attributeGroup name="arrayAttributes" >
-    <xs:attribute ref="tns:arrayType" />
-    <xs:attribute ref="tns:offset" />
-  </xs:attributeGroup>    
-  
-  <xs:attribute name="position" type="tns:arrayCoordinate" /> 
-  
-  <xs:attributeGroup name="arrayMemberAttributes" >
-
-    <xs:attribute ref="tns:position" />
-  </xs:attributeGroup>    
-
-  <xs:group name="Array" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-	</xs:sequence>
-  </xs:group>
-
-  <xs:element name="Array" type="tns:Array" />
-  <xs:complexType name="Array" >
-
-    <xs:annotation>
-	  <xs:documentation>
-	   'Array' is a complex type for accessors identified by position 
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:group ref="tns:Array" minOccurs="0" />
-    <xs:attributeGroup ref="tns:arrayAttributes" />
-    <xs:attributeGroup ref="tns:commonAttributes" />
-  </xs:complexType> 
-
-  <!-- 'Struct' is a complex type for accessors identified by name. 
-       Constraint: No element may be have the same name as any other,
-       nor may any element have a maxOccurs > 1. -->
-
-   
-  <xs:element name="Struct" type="tns:Struct" />
-
-  <xs:group name="Struct" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-	</xs:sequence>
-  </xs:group>
-
-  <xs:complexType name="Struct" >
-    <xs:group ref="tns:Struct" minOccurs="0" />
-
-    <xs:attributeGroup ref="tns:commonAttributes"/>
-  </xs:complexType> 
-
-  <!-- 'Base64' can be used to serialize binary data using base64 encoding
-       as defined in RFC2045 but without the MIME line length limitation. -->
-
-  <xs:simpleType name="base64" >
-    <xs:restriction base="xs:base64Binary" />
-  </xs:simpleType>
-
- <!-- Element declarations corresponding to each of the simple types in the 
-      XML Schemas Specification. -->
-
-  <xs:element name="duration" type="tns:duration" />
-
-  <xs:complexType name="duration" >
-    <xs:simpleContent>
-      <xs:extension base="xs:duration" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="dateTime" type="tns:dateTime" />
-
-  <xs:complexType name="dateTime" >
-    <xs:simpleContent>
-      <xs:extension base="xs:dateTime" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-
-
-  <xs:element name="NOTATION" type="tns:NOTATION" />
-  <xs:complexType name="NOTATION" >
-    <xs:simpleContent>
-      <xs:extension base="xs:QName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-
-  <xs:element name="time" type="tns:time" />
-
-  <xs:complexType name="time" >
-    <xs:simpleContent>
-      <xs:extension base="xs:time" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="date" type="tns:date" />
-
-  <xs:complexType name="date" >
-    <xs:simpleContent>
-      <xs:extension base="xs:date" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gYearMonth" type="tns:gYearMonth" />
-
-  <xs:complexType name="gYearMonth" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gYearMonth" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gYear" type="tns:gYear" />
-
-  <xs:complexType name="gYear" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gYear" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gMonthDay" type="tns:gMonthDay" />
-
-  <xs:complexType name="gMonthDay" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gMonthDay" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gDay" type="tns:gDay" />
-
-  <xs:complexType name="gDay" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gDay" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gMonth" type="tns:gMonth" />
-
-  <xs:complexType name="gMonth" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gMonth" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-  <xs:element name="boolean" type="tns:boolean" />
-  <xs:complexType name="boolean" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:boolean" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="base64Binary" type="tns:base64Binary" />
-  <xs:complexType name="base64Binary" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:base64Binary" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="hexBinary" type="tns:hexBinary" />
-  <xs:complexType name="hexBinary" >
-
-    <xs:simpleContent>
-     <xs:extension base="xs:hexBinary" >
-       <xs:attributeGroup ref="tns:commonAttributes" />
-     </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="float" type="tns:float" />
-  <xs:complexType name="float" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:float" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="double" type="tns:double" />
-  <xs:complexType name="double" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:double" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="anyURI" type="tns:anyURI" />
-  <xs:complexType name="anyURI" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="QName" type="tns:QName" />
-  <xs:complexType name="QName" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:QName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  
-  <xs:element name="string" type="tns:string" />
-  <xs:complexType name="string" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:string" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="normalizedString" type="tns:normalizedString" />
-  <xs:complexType name="normalizedString" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:normalizedString" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="token" type="tns:token" />
-  <xs:complexType name="token" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:token" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="language" type="tns:language" />
-  <xs:complexType name="language" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:language" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="Name" type="tns:Name" />
-  <xs:complexType name="Name" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:Name" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
-  <xs:complexType name="NMTOKEN" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NMTOKEN" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NCName" type="tns:NCName" />
-  <xs:complexType name="NCName" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NCName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
-  <xs:complexType name="NMTOKENS" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NMTOKENS" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ID" type="tns:ID" />
-  <xs:complexType name="ID" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ID" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="IDREF" type="tns:IDREF" />
-  <xs:complexType name="IDREF" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:IDREF" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ENTITY" type="tns:ENTITY" />
-  <xs:complexType name="ENTITY" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ENTITY" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="IDREFS" type="tns:IDREFS" />
-  <xs:complexType name="IDREFS" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:IDREFS" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ENTITIES" type="tns:ENTITIES" />
-  <xs:complexType name="ENTITIES" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ENTITIES" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="decimal" type="tns:decimal" />
-  <xs:complexType name="decimal" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:decimal" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="integer" type="tns:integer" />
-  <xs:complexType name="integer" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:integer" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
-  <xs:complexType name="nonPositiveInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:nonPositiveInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="negativeInteger" type="tns:negativeInteger" />
-  <xs:complexType name="negativeInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:negativeInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="long" type="tns:long" />
-  <xs:complexType name="long" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:long" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="int" type="tns:int" />
-  <xs:complexType name="int" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:int" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="short" type="tns:short" />
-  <xs:complexType name="short" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:short" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="byte" type="tns:byte" />
-  <xs:complexType name="byte" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:byte" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
-  <xs:complexType name="nonNegativeInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedLong" type="tns:unsignedLong" />
-  <xs:complexType name="unsignedLong" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedLong" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedInt" type="tns:unsignedInt" />
-  <xs:complexType name="unsignedInt" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedInt" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedShort" type="tns:unsignedShort" />
-  <xs:complexType name="unsignedShort" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedShort" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedByte" type="tns:unsignedByte" />
-  <xs:complexType name="unsignedByte" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedByte" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="positiveInteger" type="tns:positiveInteger" />
-  <xs:complexType name="positiveInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:positiveInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="anyType" />
-</xs:schema>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd
deleted file mode 100644
index f57a532..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- 
-Copyright 2001-2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/mime/2004-08-24.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
-  --> 
-<schema targetNamespace="http://schemas.xmlsoap.org/wsdl/mime/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/">
-	<import namespace="http://schemas.xmlsoap.org/wsdl/"/>
-	<element name="content" type="mime:contentType"/>
-	<complexType name="contentType">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence/>
-				<attribute name="type" type="string" use="optional"/>
-				<attribute name="part" type="NMTOKEN" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="multipartRelated" type="mime:multipartRelatedType"/>
-	<complexType name="multipartRelatedType">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence>
-					<element ref="mime:part" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="part" type="mime:tPart"/>
-	<complexType name="tPart">
-		<sequence>
-			<any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="optional"/>
-	</complexType>
-   	<element name="mimeXml" type = "mime:tMimeXml"/>
-   	<complexType name="tMimeXml">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence/>
-				<attribute name="part" type="NMTOKEN" use="optional"/>
-			</extension>
-		</complexContent>
-   	</complexType>
-</schema>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd
deleted file mode 100644
index 9981d63..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
-           elementFormDefault="qualified" >
-   
-  <xs:complexType mixed="true" name="tDocumentation" >
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="tDocumented" >
-    <xs:annotation>
-      <xs:documentation>
-      This type is extended by  component types to allow them to be documented
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-
- <!-- implemented resolution of swa124 -->
- <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow attributes from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax" />   
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
- <!-- implemented resolution of swa124 -->
-  <xs:complexType name="tExtensibleDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow elements from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax" />   
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="definitions" type="wsdl:tDefinitions" >
-    <xs:key name="message" >
-      <xs:selector xpath="wsdl:message" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="portType" >
-      <xs:selector xpath="wsdl:portType" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="binding" >
-      <xs:selector xpath="wsdl:binding" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="service" >
-      <xs:selector xpath="wsdl:service" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="import" >
-      <xs:selector xpath="wsdl:import" />
-      <xs:field xpath="@namespace" />
-    </xs:key>
-  </xs:element>
-
-  <xs:group name="anyTopLevelOptionalElement" >
-    <xs:annotation>
-      <xs:documentation>
-      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="import" type="wsdl:tImport" />
-      <xs:element name="types" type="wsdl:tTypes" />                     
-      <xs:element name="message"  type="wsdl:tMessage" >
-        <xs:unique name="part" >
-          <xs:selector xpath="wsdl:part" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-      </xs:element>
-      <xs:element name="portType" type="wsdl:tPortType" />
-      <xs:element name="binding"  type="wsdl:tBinding" />
-      <xs:element name="service"  type="wsdl:tService" >
-        <xs:unique name="port" >
-          <xs:selector xpath="wsdl:port" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-	  </xs:element>
-    </xs:choice>
-  </xs:group>
-
-  <!-- implemented resolution of er015 and UPA fix. ASK -->
-  <xs:complexType name="tDefinitions">
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented">
-        <xs:sequence minOccurs="0">
-          <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
-            <xs:any namespace="##other" processContents="lax"/>
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="targetNamespace" type="xs:anyURI" use=
-"optional"/>
-        <xs:attribute name="name" type="xs:NCName" use="optional"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tImport" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tTypes" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" />
-    </xs:complexContent>   
-  </xs:complexType>
-     
-  <xs:complexType name="tMessage" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPart" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="element" type="xs:QName" use="optional" />
-        <xs:attribute name="type" type="xs:QName" use="optional" />    
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPortType" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-   
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-	    <xs:sequence>
-          <xs:choice>
-            <xs:group ref="wsdl:request-response-or-one-way-operation" />
-            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-    
-  <xs:group name="request-response-or-one-way-operation" >
-    <xs:sequence>
-      <xs:element name="input" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="output" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:group name="solicit-response-or-notification-operation" >
-    <xs:sequence>
-      <xs:element name="output" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="input" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-	  </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-        
-  <xs:complexType name="tParam" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName"  use="required" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="type" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-    
-  <xs:complexType name="tBindingOperationMessage" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="tBindingOperationFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tBindingOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tService" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tPort" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="binding" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="required" type="xs:boolean" />
-  <xs:complexType name="tExtensibilityElement" abstract="true" >
-    <xs:attribute ref="wsdl:required" use="optional" />
-  </xs:complexType>
-
-</xs:schema>
diff --git a/development/org.eclipse.wst.sse.unittests/.classpath b/development/org.eclipse.wst.sse.unittests/.classpath
deleted file mode 100644
index bfb3353..0000000
--- a/development/org.eclipse.wst.sse.unittests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/development/org.eclipse.wst.sse.unittests/.cvsignore b/development/org.eclipse.wst.sse.unittests/.cvsignore
deleted file mode 100644
index 9fc9cb0..0000000
--- a/development/org.eclipse.wst.sse.unittests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-ssejunit.jar
-temp.folder
diff --git a/development/org.eclipse.wst.sse.unittests/.project b/development/org.eclipse.wst.sse.unittests/.project
deleted file mode 100644
index e6f5109..0000000
--- a/development/org.eclipse.wst.sse.unittests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.unittests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF b/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5ade2b1..0000000
--- a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.unittests; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: .
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.unittests,
- org.eclipse.wst.sse.unittests.minortools
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.tests.encoding,
- org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.ui.tests,
- org.eclipse.wst.css.ui.tests.performance,
- org.eclipse.wst.dtd.ui.tests,
- org.eclipse.wst.html.core.tests,
- org.eclipse.wst.html.tests.encoding,
- org.eclipse.wst.html.ui.tests,
- org.eclipse.wst.html.ui.tests.performance,
- org.eclipse.wst.sse.core.tests,
- org.eclipse.wst.sse.ui.tests,
- org.eclipse.wst.sse.ui.tests.performance,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.xml.ui.tests.performance,
- org.eclipse.wst.xml.validation.tests,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.javascript.ui,
- org.eclipse.wst.xsd.validation.tests,
- org.eclipse.wst.css.ui.tests,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.ui.tests,
- org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.ui.tests,
- org.eclipse.jst.jsp.ui.tests.performance,
- org.eclipse.wst.validation
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Eclipse-LazyStart: false
diff --git a/development/org.eclipse.wst.sse.unittests/build.properties b/development/org.eclipse.wst.sse.unittests/build.properties
deleted file mode 100644
index 6b91e1d..0000000
--- a/development/org.eclipse.wst.sse.unittests/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
-source.. = src/
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif b/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.properties b/development/org.eclipse.wst.sse.unittests/plugin.properties
deleted file mode 100644
index 8c4370b..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# 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
-#     
-###############################################################################
-XML_Source_Page_Editor.name=XML Source Page Editor
-JavaScript_Source_Page_Editor.name=JavaScript Source Page Editor
-
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Unit Tests
-additionalTests=Additional TestCases and TestSuites
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.xml b/development/org.eclipse.wst.sse.unittests/plugin.xml
deleted file mode 100644
index 9b9ee19..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-        <extension point="org.eclipse.ui.editors">
-                <editor
-                        name="%XML_Source_Page_Editor.name"
-                        icon="icons/sourceEditor.gif"
-                        contributorClass="org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML"
-                        class="org.eclipse.wst.sse.ui.StructuredTextEditor"
-                        symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-                        id="org.eclipse.core.runtime.xml.source">
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.core.runtime.xml" />
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.wst.xml.core.xmlsource" />
-                </editor>
-        </extension>
-        	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%JavaScript_Source_Page_Editor.name"
-			icon="icons/sourceEditor.gif"
-			extensions="js"
-			contributorClass="org.eclipse.wst.javascript.ui.internal.actions.ActionContributorJS"
-			class="org.eclipse.wst.javascript.ui.internal.editor.JSEditor"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-			id="org.eclipse.wst.javascript.core.javascriptsource.source">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.javascript.core.javascriptsource" />
-		</editor>
-	</extension>
-
-	<extension-point id="additionalTests" name="%additionalTests"/>
-
-</plugin>
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
deleted file mode 100644
index b311943..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004,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.sse.unittests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestSuite;
-import org.eclipse.wst.css.core.tests.CSSCoreTestSuite;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite;
-import org.eclipse.wst.css.ui.tests.CSSUITestSuite;
-import org.eclipse.wst.dtd.ui.tests.DTDUITestSuite;
-import org.eclipse.wst.html.core.tests.HTMLCoreTestSuite;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite;
-import org.eclipse.wst.html.ui.tests.HTMLUITestSuite;
-import org.eclipse.wst.sse.core.tests.SSEModelTestSuite;
-import org.eclipse.wst.sse.ui.tests.SSEUITestSuite;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite;
-import org.eclipse.wst.xml.tests.encoding.EncodingTestSuite;
-import org.eclipse.wst.xml.ui.tests.XMLUITestSuite;
-import org.eclipse.wst.xml.validation.tests.internal.AllXMLTests;
-import org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests;
-
-public class MasterListTestSuite extends TestSuite {
-
-	public MasterListTestSuite() {
-		super("All Tests");
-
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		addTest(SSEModelTestSuite.suite());
-		addTest(SSEModelXMLTestSuite.suite());
-		addTest(CSSCoreTestSuite.suite());
-		addTest(HTMLCoreTestSuite.suite());
-		addTest(JSPCoreTestSuite.suite());
-
-		addTest(AllXMLTests.suite());
-
-		addTest(EncodingTestSuite.suite());
-		addTest(CSSEncodingTestSuite.suite());
-		addTest(HTMLEncodingTestSuite.suite());
-		addTest(JSPEncodingTestSuite.suite());
-
-		addTest(CSSUITestSuite.suite());
-		addTest(HTMLUITestSuite.suite());
-		addTest(SSEUITestSuite.suite());
-		addTest(XMLUITestSuite.suite());
-		addTest(DTDUITestSuite.suite());
-		addTest(JSPUITestSuite.suite());
-
-		addTest(AllXSDTests.suite());
-
-		// addTest(RegressionBucket.suite());
-		// addTest(AllTestCases.suite());
-
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.sse.unittests.additionalSuites");
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getName().equals("suite")) {
-				TestSuite suite;
-				try {
-					suite = (TestSuite) elements[i].createExecutableExtension("class");
-					addTest(suite);
-				}
-				catch (CoreException e) {
-					Platform.getLog(Platform.getBundle("org.eclipse.wst.sse.unittests")).log(e.getStatus());
-				}
-			}
-			else if (elements[i].getName().equals("test")) {
-				Test test;
-				try {
-					test = (Test) elements[i].createExecutableExtension("class");
-					addTest(new TestSuite(test.getClass()));
-				}
-				catch (CoreException e) {
-					Platform.getLog(Platform.getBundle("org.eclipse.wst.sse.unittests")).log(e.getStatus());
-				}
-			}
-		}
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-		// other than to signal to create an instance of this class.
-		// The rest it automatic from the tests added in constructor.
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
deleted file mode 100644
index 8491014..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.sse.unittests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.performance.JSPUIPerformanceTests;
-import org.eclipse.wst.css.ui.tests.performance.CSSUIPerformanceTestSuite;
-import org.eclipse.wst.html.ui.tests.performance.HTMLUIPerformanceTestSuite;
-import org.eclipse.wst.sse.ui.tests.performance.SSEUIPerformanceTestSuite;
-import org.eclipse.wst.xml.ui.tests.performance.XMLUIPerformanceTestSuite;
-
-/*****************************************************************************
- * Copyright (c) 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
- * 
- ****************************************************************************/
-
-public class MasterPerformanceTestSuite extends TestSuite {
-
-	public MasterPerformanceTestSuite() {
-		super("All Tests");
-
-		addTest(JSPUIPerformanceTests.suite());
-		addTest(CSSUIPerformanceTestSuite.suite());
-		addTest(HTMLUIPerformanceTestSuite.suite());
-		addTest(SSEUIPerformanceTestSuite.suite());
-		addTest(XMLUIPerformanceTestSuite.suite());
-
-
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java
deleted file mode 100644
index 939c544..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.sse.unittests;
-
-import java.util.Locale;
-
-/**
- * TestTurkish
- * See http://www.i18nguy.com/unicode/turkish-i18n.html
- */
-
-public class TestTurkish {
-	public static void main(String[] args) {
-		String turkishLowerCase = "\u0131" + "\u0069";
-		String turkishUpperCase = "\u0130" + "\u0049";
-		Locale[] locales = Locale.getAvailableLocales();
-		for (int i = 0; i < locales.length; i++) {
-			// System.out.println(locales[i]);
-		}
-		Locale turkishLocale = new Locale("TR");
-		String testUppercase = turkishLowerCase.toUpperCase(turkishLocale);
-		System.out.println(turkishUpperCase.equals(testUppercase));
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java
deleted file mode 100644
index 578fc46..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.sse.unittests.minortools;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * TestString
- */
-
-public class TestString {
-
-	public static void main(String[] args) {
-
-
-		String xml = "<?xml version=\"1.0\" encoding=\"UTF-16\"?><message><sourceUri></sourceUri><body></body></message>";
-
-
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(false);
-		factory.setValidating(false);
-		try {
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			Document document = builder.parse(new InputSource(new StringReader(xml)));
-			if (document != null) {
-				System.out.print(document.hasChildNodes());
-			}
-			System.out.println(document);
-		}
-		catch (ParserConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
deleted file mode 100644
index aa2e238..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.sse.unittests.minortools;
-
-
-
-public class TestStringUtils {
-
-	/**
-	 * TestStringUtils constructor comment.
-	 */
-	private TestStringUtils() {
-		super();
-	}
-
-	/**
-	 * Replace matching literal portions of a string with another string
-	 */
-	public static String replace(String aString, String source, String target) {
-		if (aString == null)
-			return null;
-		String normalString = ""; //$NON-NLS-1$
-		int length = aString.length();
-		int position = 0;
-		int previous = 0;
-		int spacer = source.length();
-		while (position + spacer - 1 < length && aString.indexOf(source, position) > -1) {
-			position = aString.indexOf(source, previous);
-			normalString = normalString + aString.substring(previous, position) + target;
-			position += spacer;
-			previous = position;
-		}
-		normalString = normalString + aString.substring(position, aString.length());
-
-		return normalString;
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
deleted file mode 100644
index 61ed9c5..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.sse.unittests.minortools;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.wst.xml.core.tests.util.CommonXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-
-/**
- * Modifies plugin.xml and fragment.xml files to not require specific versions
- * of their plugin dependencies.
- * 
- * @author nitin
- */
-public class VersionRemover {
-
-	char[] charbuff = new char[2048];
-	StringBuffer s = null;
-
-	public VersionRemover() {
-		super();
-	}
-
-
-
-	public static void main(String[] args) {
-		if (args.length < 1)
-			new VersionRemover().visit(new File("d:/target"));
-		else
-			new VersionRemover().visit(new File(args[0]));
-	}
-
-
-
-	protected void visit(File file) {
-		// Skip directories like org.eclipse.*, org.apache.*, and org.junit.*
-		if (file.isDirectory() && !file.getName().startsWith("org.eclipse.") && !file.getName().startsWith("org.apache") && !file.getName().startsWith("org.junit")) {
-			String[] contents = file.list();
-			for (int i = 0; i < contents.length; i++)
-				visit(new File(file.getAbsolutePath() + '/' + contents[i]));
-		}
-		else {
-			fixupFile(file);
-		}
-	}
-
-	protected void fixupFile(File file) {
-		// only load and fixup files named plugin.xml or fragment.xml under eclipse\plugins\XXXXXXX.*
-		if (!(file.getName().equalsIgnoreCase("plugin.xml") || file.getName().equalsIgnoreCase("fragment.xml")) || file.getAbsolutePath().indexOf("eclipse\\plugins\\XXXXXXX.") == -1)
-			return;
-		//		System.out.println(file.getAbsolutePath());
-		try {
-			Document doc = CommonXML.getDocumentBuilder().parse(file);
-			NodeList imports = null;
-			if (file.getName().equalsIgnoreCase("plugin.xml"))
-				imports = doc.getElementsByTagName("import");
-			else if (file.getName().equalsIgnoreCase("fragment.xml"))
-				imports = doc.getElementsByTagName("fragment");
-			boolean changed = false;
-			for (int i = 0; i < imports.getLength(); i++) {
-				Node importNode = imports.item(i);
-				if (importNode.getNodeName().equalsIgnoreCase("import") && importNode.getAttributes().getNamedItem("version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("version");
-				}
-				if (importNode.getAttributes().getNamedItem("plugin-version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("plugin-version");
-				}
-				if (importNode.getAttributes().getNamedItem("match") != null) {
-					importNode.getAttributes().removeNamedItem("match");
-					changed = true;
-				}
-			}
-			if (changed) {
-				FileOutputStream ostream = new FileOutputStream(file.getAbsolutePath());
-				CommonXML.serialize(doc, ostream);
-				ostream.close();
-				System.out.println("Modified " + file.getAbsolutePath());
-			}
-		}
-		catch (SAXException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-		catch (IOException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage b/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage
deleted file mode 100644
index 0f1eaa0..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage
+++ /dev/null
Binary files differ
diff --git a/development/org.eclipse.wst.sse.unittests/tet.jsp b/development/org.eclipse.wst.sse.unittests/tet.jsp
deleted file mode 100644
index 191b21e..0000000
--- a/development/org.eclipse.wst.sse.unittests/tet.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"

-	pageEncoding="UTF-8"%>

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

-<title>content of lowercase title tags</title>

-<tıtle>content of lowercase title tags (no diaresis over i)</tıtle>

-<title>content of uppercase tags</title>

-<title></title>

-<title></title>

-<title></title>

-<title></title>

-</head>

-<body>

-<i></i>

-<i></i>

-<i></i>

-<i></i>

-</body>

-</html>

diff --git a/development/org.eclipse.wst.sse.unittests/turkishCase.jpage b/development/org.eclipse.wst.sse.unittests/turkishCase.jpage
deleted file mode 100644
index ba96e61..0000000
--- a/development/org.eclipse.wst.sse.unittests/turkishCase.jpage
+++ /dev/null
@@ -1,3 +0,0 @@
-
-String s = "\u0131"+"\u0069";
-s.toUpperCase();
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore b/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.project b/docs/org.eclipse.jst.jsp.ui.infopop/.project
deleted file mode 100644
index 01be1bc..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
deleted file mode 100644
index bac1fef..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Rename Resource</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
deleted file mode 100644
index 780835a..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="jspsource_source_HelpId">
-<description>The JSP source page editor lets you edit a JavaServer Pages file. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Making content assist work for JSP files" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html"/>
-</context>
-
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Refactor Rename</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Refactor Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml b/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml
deleted file mode 100644
index 1d085e2..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-	<context id="jspw0010">
-		<description>
-			Select the JSP template checkbox to create your JSP file based on a default template. You can choose to have your JSP created with HTML, XHTML, or XHTML with XML markup. If you do not select a template, your newly created JSP file will be completely blank.
-		</description>
-	</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index a703c2c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.infopop; singleton:=true
-Bundle-Version: 1.0.3.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/about.html b/docs/org.eclipse.jst.jsp.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
deleted file mode 100644
index 33cb6c7..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = EditorJspContexts.xml,\
-               EditorJspContexts2.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF/,\
-               META-INF/,\
-               EditorJspContexts2.xml,\
-               EditorJspContexts.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               plugin.properties
-src.includes = build.properties
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
deleted file mode 100644
index 138c44e..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = JSP tools infopops
-
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
deleted file mode 100644
index 3d1b116..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorJspContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
-       <contexts file="EditorJspContexts2.xml" plugin="org.eclipse.jst.jsp.core"/>
-       <contexts file="JspWizContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/.cvsignore b/docs/org.eclipse.wst.doc.user/.cvsignore
deleted file mode 100644
index 183c840..0000000
--- a/docs/org.eclipse.wst.doc.user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.doc.user_1.0.0.jar
diff --git a/docs/org.eclipse.wst.doc.user/.project b/docs/org.eclipse.wst.doc.user/.project
deleted file mode 100644
index 94c75b9..0000000
--- a/docs/org.eclipse.wst.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c3bac2..0000000
--- a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.doc.user; singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.doc.user/about.html b/docs/org.eclipse.wst.doc.user/about.html
deleted file mode 100644
index 86cd081..0000000
--- a/docs/org.eclipse.wst.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.user/book.css b/docs/org.eclipse.wst.doc.user/book.css
deleted file mode 100644
index 0df2553..0000000
--- a/docs/org.eclipse.wst.doc.user/book.css
+++ /dev/null
@@ -1,203 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-P.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-size: 10.000000pt;
-	font-weight: medium;
-	font-style: Regular;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New";
-}
-
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 9.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-
-P.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 11.000000pt;
-	font-weight: medium;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Arial";
-}
-
-EM.UILabel {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-
-EM.CodeName {
-	font-weight: Bold;
-	font-style: Regular;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New";
-}
-
-/* following font face declarations need to be removed for DBCS */
-body,h1,h2,h3,h4,h5,h6,p,table,td,caption,th,ul,ol,dl,li,dd,dt {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #000000
-}
-
-pre {
-	font-family: Courier, monospace
-}
-
-/* end font face declarations */
-	/* following font size declarations should be OK for DBCS */
-body,h1,h2,h3,h4,h5,h6,p,table,td,caption,th,ul,ol,dl,li,dd,dt {
-	font-size: 10pt;
-}
-
-pre {
-	font-size: 10pt
-}
-
-/* end font size declarations */
-body {
-	background: #FFFFFF
-}
-
-h1 {
-	font-size: 18pt;
-	margin-top: 5;
-	margin-bottom: 1
-}
-
-h2 {
-	font-size: 14pt;
-	margin-top: 25;
-	margin-bottom: 3
-}
-
-h3 {
-	font-size: 11pt;
-	margin-top: 20;
-	margin-bottom: 3
-}
-
-h4 {
-	font-size: 10pt;
-	margin-top: 20;
-	margin-bottom: 3;
-	font-style: italic
-}
-
-p {
-	margin-top: 10px;
-	margin-bottom: 10px
-}
-
-pre {
-	margin-left: 6;
-	font-size: 9pt
-}
-
-a:link {
-	color: #0000FF
-}
-
-a:hover {
-	color: #000080
-}
-
-a:visited {
-	text-decoration: underline
-}
-
-ul {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-li {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-li p {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-ol {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-dl {
-	margin-top: 0;
-	margin-bottom: 10
-}
-
-dt {
-	margin-top: 0;
-	margin-bottom: 0;
-	font-weight: bold
-}
-
-dd {
-	margin-top: 0;
-	margin-bottom: 0
-}
-
-strong {
-	font-weight: bold
-}
-
-em {
-	font-style: italic
-}
-
-var {
-	font-style: italic
-}
-
-div.revision {
-	border-left-style: solid;
-	border-left-width: thin;
-	border-left-color: #7B68EE;
-	padding-left: 5
-}
-
-th {
-	font-weight: bold
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/build.properties b/docs/org.eclipse.wst.doc.user/build.properties
deleted file mode 100644
index 3d270e9..0000000
--- a/docs/org.eclipse.wst.doc.user/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = about.html,\
-               common.css,\
-               commonltr.css,\
-               images/,\
-               META-INF/,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               toc.xml,\
-               topics/,\
-               book.css,\
-               commonrtl.css
diff --git a/docs/org.eclipse.wst.doc.user/common.css b/docs/org.eclipse.wst.doc.user/common.css
deleted file mode 100644
index 2f4f3f2..0000000
--- a/docs/org.eclipse.wst.doc.user/common.css
+++ /dev/null
@@ -1,1197 +0,0 @@
-body {
-	font-family: Arial, sans-serif;
-	font-size: 0.8em;
-	background-color: #ffffff;
-	color: Black;
-	margin-right: 5em;
-	margin-bottom: 1em;
-}
-
-.ibmfilepath {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-.ibmcommand {
-	font-weight: bold;
-}
-
-.ibmemphasis {
-	font-style: italic;
-}
-
-.mv,.pk,.pkdef,.pv {
-	font-family: monospace;
-	font-size: 100%;
-	padding-top: 0em;
-	padding-right: .3em;
-	padding-bottom: 0em;
-	padding-left: .3em;
-}
-
-tt,samp {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-BODY.nav {
-	background-color: #FFFFFF;
-	border-right: 0.2em ridge black;
-	font-size: 0.95em;
-}
-
-.base {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: normal;
-	text-decoration: none;
-	background-color: #ffffff;
-}
-
-TABLE {
-	color: black;
-	width: 90%;
-	border-collapse: collapse;
-	border-color: Black;
-	background: white;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	margin-left: 0em;
-	margin-right: 0em;
-}
-
-.tbldesc {
-	font-style: italic;
-}
-
-TH {
-	font-weight: bold;
-	font-size: 0.7em;
-	color: black;
-	background-color: #dadada;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TH.base {
-	font-weight: bold;
-	color: black;
-	border: 1 solid #606060;
-	background-color: #dcdada;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TD {
-	font-size: 0.7em;
-	color: black;
-	background-color: white;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-CITE {
-	font-style: italic;
-}
-
-EM {
-	font-style: italic;
-}
-
-STRONG {
-	font-weight: bold;
-}
-
-caption {
-	text-align: left;
-	font-style: italic;
-}
-
-DT {
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-DD {
-	margin-left: 1.0em;
-}
-
-PRE,pre.cgraphic {
-	font-family: monospace;
-	font-size: 12px;
-	background-color: #dadada;
-	padding: 5px;
-}
-
-.italic {
-	font-style: italic;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.underlined {
-	text-decoration: underline;
-}
-
-.bold-italic,.boldItalic {
-	font-weight: bold;
-	font-style: italic;
-}
-
-.smallCaps,.smallcaps {
-	text-transform: uppercase;
-	font-size: smaller;
-	font-variant: small-caps;
-}
-
-.italic-underlined {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.bold-underlined {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.bold-italic-underlined {
-	font-weight: bold;
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.smallcaps-underlined {
-	font-variant: small-caps;
-	text-decoration: underline;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.inlinedef {
-	font-style: italic;
-}
-
-.sidebar {
-	background: #cccccc;
-}
-
-A:link {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:visited {
-	color: #996699;
-	text-decoration: underline;
-}
-
-A:active {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:hover {
-	color: #996699;;
-	text-decoration: underline;
-}
-
-a.toclink:link {
-	text-decoration: none;
-}
-
-a.toclink:active {
-	text-decoration: none;
-}
-
-a.toclink:visited {
-	text-decoration: none;
-}
-
-a.toclink:hover {
-	text-decoration: underline;
-}
-
-a.ptoclink:link {
-	text-decoration: none;
-}
-
-a.ptoclink:active {
-	text-decoration: none;
-}
-
-a.ptoclink:visited {
-	text-decoration: none;
-}
-
-a.ptoclink:hover {
-	text-decoration: underline;
-}
-
-a.indexlink:link {
-	text-decoration: none;
-}
-
-a.indexlink:active {
-	text-decoration: none;
-}
-
-a.indexlink:visited {
-	text-decoration: none;
-}
-
-a.indexlink:hover {
-	text-decoration: underline;
-}
-
-a.figurelist:link {
-	text-decoration: none;
-}
-
-a.figurelist:active {
-	text-decoration: none;
-}
-
-a.figurelist:visited {
-	text-decoration: none;
-}
-
-a.figurelist:hover {
-	text-decoration: underline;
-}
-
-a.tablelist:link {
-	text-decoration: none;
-}
-
-a.tablelist:active {
-	text-decoration: none;
-}
-
-a.tablelist:visited {
-	text-decoration: none;
-}
-
-a.tablelist:hover {
-	text-decoration: underline;
-}
-
-a.boldgreylink:link {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:visited {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:hover {
-	text-decoration: underline;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-.runningheader {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter a:link {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:active {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:visited {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:hover {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: underline;
-}
-
-#breadcrumb,.breadcrumb,span.breadcrumbs {
-	font-size: 0.75em;
-}
-
-.fastpath {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.fastpathtitle {
-	font-weight: bold;
-}
-
-.toc {
-	font-size: small;
-}
-
-.nested0 {
-	margin-top: 0em;
-}
-
-.p {
-	margin-top: 1em;
-}
-
-span.figcap {
-	font-style: italic;
-}
-
-span.figdesc {
-	font-style: italic;
-}
-
-div.figbox {
-	
-}
-
-div.figrules {
-	
-}
-
-div.fignone {
-	
-}
-
-.fignone {
-	
-}
-
-.figborder {
-	
-}
-
-.figsides {
-	
-}
-
-.figtop {
-	
-}
-
-.figbottom {
-	
-}
-
-.figtopbot {
-	
-}
-
-.parentlink {
-	
-}
-
-.prevlink {
-	
-}
-
-.nextlink {
-	
-}
-
-.relconceptshd {
-	
-}
-
-.reltaskshd {
-	
-}
-
-.relrefhd {
-	
-}
-
-.synnone {
-	
-}
-
-.synborder {
-	
-}
-
-.synsides {
-	
-}
-
-.syntop {
-	
-}
-
-.synbottom {
-	
-}
-
-.syntopbot {
-	
-}
-
-.skip {
-	margin-top: 1em;
-}
-
-.skipspace {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.ulchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.olchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-ul,ol {
-	margin-top: 0.1em;
-	padding-top: 0.1em;
-}
-
-ul.simple {
-	list-style-type: none;
-}
-
-ul.indexlist {
-	list-style-type: none;
-}
-
-OL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-UL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-OL LI DIV P {
-	list-style-type: decimal;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-UL LI DIV P {
-	list-style-type: disc;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-* [compact="yes"]>li {
-	margin-top: 0 em;
-}
-
-* [compact="no"]>li {
-	margin-top: 0.5em;
-}
-
-hr {
-	margin-bottom: 0em;
-	margin-top: 0em;
-	padding-top: 0em;
-	padding-bottom: 0em;
-	width: 90%;
-	color: #cccccc;
-	text-align: center;
-}
-
-H1,.title,.pagetitle,.topictitle1 {
-	font-size: 1.5em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.5em;
-	word-spacing: 0.1em;
-}
-
-H2,.subtitle,.pagesubtitle,.topictitle2 {
-	font-size: 1.25em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.0em;
-	padding-bottom: 0.0em;
-}
-
-H3,.boldtitle,.topictitle3 {
-	font-size: 1.0em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	padding-bottom: 0.1em;
-}
-
-H4,.topictitle4 {
-	font-size: 0.9em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.1em;
-	padding-bottom: 0.1em;
-}
-
-h5,.topictitle5 {
-	font-size: 0.8em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-h6,.topictitle6 {
-	font-size: 0.7em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-div.headtitle {
-	font-size: 1em;
-	font-weight: bold;
-	margin-left: 0em;
-}
-
-div.head0 {
-	font-size: 0.9em;
-	font-weight: bold;
-	margin-left: 0em;
-	margin-top: 0.5em;
-}
-
-div.head1 {
-	font-size: 0.8em;
-	font-weight: bold;
-	margin-left: 1em;
-	padding-top: 0.5em;
-}
-
-div.head2 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 2em;
-}
-
-div.head3 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 3em;
-}
-
-div.head4 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 4em;
-}
-
-div.head5 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 5em;
-}
-
-div.head6 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 6em;
-}
-
-div.head7 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 7em;
-}
-
-div.head8 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 8em;
-}
-
-div.head9 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 9em;
-}
-
-.tip {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.tiptitle {
-	font-weight: bold;
-}
-
-.firstcol {
-	font-weight: bold;
-}
-
-.ptocH1 {
-	font-size: x-small;
-}
-
-.ptocH2 {
-	font-size: x-small;
-}
-
-.stitle {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.nte {
-	
-}
-
-.xxlines {
-	white-space: pre;
-	font-size: 0.95em;
-}
-
-.sectiontitle {
-	margin-top: 1em;
-	margin-bottom: 0em;
-	color: black;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-div.imageleft {
-	text-align: left;
-}
-
-div.imagecenter {
-	text-align: center;
-}
-
-div.imageright {
-	text-align: right;
-}
-
-div.imagejustify {
-	text-align: justify;
-}
-
-div.mmobj {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjleft {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-div.mmobjcenter {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjright {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-pre.screen {
-	padding: 1em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-	border: thin solid Black;
-	font-size: 100%;
-}
-
-.prereq {
-	margin-left: 1.5em;
-}
-
-.defListHead {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.mv {
-	font-style: italic;
-}
-
-span.md {
-	text-decoration: line-through;
-}
-
-.pk,span.pk {
-	font-weight: bold;
-}
-
-span.pkdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.pv {
-	font-style: italic;
-}
-
-span.pvdef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-span.kwd {
-	font-weight: bold;
-}
-
-span.kdwdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.parmListKwd {
-	font-weight: bold;
-}
-
-.parmListVar {
-	font-style: italic;
-}
-
-span.oper {
-	font-style: normal;
-}
-
-span.operdef {
-	text-decoration: underline;
-}
-
-VAR,span.var {
-	font-style: italic;
-}
-
-span.vardef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-div.msg {
-	padding: 0.2em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-}
-
-div.msgnum {
-	float: left;
-	font-weight: bold;
-	margin-bottom: 1em;
-	margin-right: 1em;
-}
-
-div.msgtext {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-div.msgitemtitle {
-	font-weight: bold;
-}
-
-p.msgitem {
-	margin-top: 0em;
-}
-
-.attention,div.attention {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.attentiontitle,span.attentiontitle {
-	font-weight: bold;
-}
-
-.cautiontitle,div.cautiontitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.caution,div.caution {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.danger,div.danger {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 1em;
-}
-
-.dangertitle,div.dangertitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.important {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.importanttitle {
-	font-weight: bold;
-}
-
-.remember {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.remembertitle {
-	font-weight: bold;
-}
-
-.restriction {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.restrictiontitle {
-	font-weight: bold;
-}
-
-div.warningtitle {
-	font-weight: bold;
-}
-
-div.warningbody {
-	margin-left: 2em
-}
-
-.note {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.notetitle,div.notetitle {
-	font-weight: bold;
-}
-
-div.notebody {
-	margin-left: 2em;
-}
-
-div.notelisttitle {
-	font-weight: bold;
-}
-
-div.fnnum {
-	float: left;
-}
-
-div.fntext {
-	margin-left: 2em;
-}
-
-div.stepl {
-	margin-left: 2em;
-}
-
-div.steplnum {
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-left: 5em;
-}
-
-div.steplnum {
-	font-style: italic;
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-bottom: 0.5em;
-	margin-left: 3em;
-}
-
-div.ledi {
-	margin-left: 3em;
-}
-
-div.ledesc {
-	margin-left: 3em;
-}
-
-span.pblktitle {
-	font-weight: bold;
-}
-
-div.pblklblbox {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	margin-top: 0.2em;
-}
-
-span.ednoticestitle {
-	font-weight: bold;
-}
-
-span.uicontrol {
-	font-weight: bold;
-}
-
-span.term {
-	font-weight: bold;
-}
-
-span.idxshow {
-	color: green;
-}
-
-div.code {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-span.refkey {
-	font-weight: bold;
-	color: white;
-	background-color: black;
-}
-
-tt.apl {
-	font-style: italic;
-}
-
-div.qualifstart {
-	padding: 0.1em 0.5em 0.5em 0.5em;
-	border-top: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-div.qualifend {
-	padding: 0.5em 0.5em 0.1em 0.5em;
-	border-bottom: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-.noshade {
-	background-color: transparent;
-}
-
-.xlight {
-	background-color: #DADADA;
-}
-
-.light {
-	background-color: #B0B0B0;
-}
-
-.medium {
-	background-color: #8C8C8C;
-}
-
-.dark {
-	background-color: #6E6E6E;
-}
-
-.xdark {
-	background-color: #585858;
-}
-
-.light-yellow {
-	background-color: #FFFFCC;
-}
-
-.khaki {
-	background-color: #CCCC99;
-}
-
-.medium-blue {
-	background-color: #6699CC;
-}
-
-.light-blue {
-	background-color: #CCCCFF;
-}
-
-.mid-grey {
-	background-color: #CCCCCC;
-}
-
-.light-grey {
-	background-color: #DADADA;
-}
-
-.lightest-grey {
-	background-color: #E6E6E6;
-}
-
-#changed {
-	position: absolute;
-	left: 0.2em;
-	color: #7B68EE;
-	background-color: #FFFFFF;
-	font-style: normal;
-	font-weight: bold;
-}
-
-INPUT.buttons {
-	font-size: 0.75em;
-	border-top: 0.2em outset #B1B1B1;
-	border-right: 0.2em outset #000000;
-	border-bottom: 0.2em outset #000000;
-	border-left: 0.2em outset #B1B1B1;
-	background-color: #E2E2E2;
-	margin-bottom: 0.2em;
-}
-
-.cgraphic {
-	font-size: 90%;
-	color: black;
-}
-
-.aix,.hpux,.sun,.unix,.win2,.winnt,.win,.zos,.linux,.os390,.os400,.c,.cplusplus,.cobol,.fortran,.java,.macosx,.os2,.pl1,.rpg
-	{
-	background-repeat: no-repeat;
-	background-position: top left;
-	margin-top: 0.5em;
-	text-indent: 55px;
-}
-
-.aix {
-	background-image: url(ngaix.gif);
-}
-
-.hpux {
-	background-image: url(nghpux.gif);
-}
-
-.sun {
-	background-image: url(ngsolaris.gif);
-}
-
-.unix {
-	background-image: url(ngunix.gif);
-}
-
-.win2 {
-	background-image: url(ng2000.gif);
-}
-
-.winxp {
-	background-image: url(ngxp.gif);
-}
-
-.winnt {
-	background-image: url(ngnt.gif);
-}
-
-.win {
-	background-image: url(ngwin.gif);
-}
-
-.zos {
-	background-image: url(ngzos.gif);
-}
-
-.linux {
-	background-image: url(nglinux.gif);
-}
-
-.os390 {
-	background-image: url(ng390.gif);
-}
-
-.os400 {
-	background-image: url(ng400.gif);
-}
-
-.c {
-	background-image: url(ngc.gif);
-}
-
-.cplusplus {
-	background-image: url(ngcpp.gif);
-}
-
-.cobol {
-	background-image: url(ngcobol.gif);
-}
-
-.fortran {
-	background-image: url(ngfortran.gif);
-}
-
-.java {
-	background-image: url(ngjava.gif);
-}
-
-.macosx {
-	background-image: url(ngmacosx.gif);
-}
-
-.os2 {
-	background-image: url(ngos2.gif);
-}
-
-.pl1 {
-	background-image: url(ngpl1.gif);
-}
-
-.rpg {
-	background-image: url(ngrpg.gif);
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/commonltr.css b/docs/org.eclipse.wst.doc.user/commonltr.css
deleted file mode 100644
index e6a8195..0000000
--- a/docs/org.eclipse.wst.doc.user/commonltr.css
+++ /dev/null
@@ -1,1306 +0,0 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-bottom: 1em }
-.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-left : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}	
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-/* copied from common.css */
-body {
-	font-family: Arial, sans-serif;
-	font-size: 0.8em;
-	background-color: #ffffff;
-	color: Black;
-	margin-right: 5em;
-	margin-bottom: 1em;
-}
-
-.ibmfilepath {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-.ibmcommand {
-	font-weight: bold;
-}
-
-.ibmemphasis {
-	font-style: italic;
-}
-
-.mv,.pk,.pkdef,.pv {
-	font-family: monospace;
-	font-size: 100%;
-	padding-top: 0em;
-	padding-right: .3em;
-	padding-bottom: 0em;
-	padding-left: .3em;
-}
-
-tt,samp {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-BODY.nav {
-	background-color: #FFFFFF;
-	border-right: 0.2em ridge black;
-	font-size: 0.95em;
-}
-
-.base {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: normal;
-	text-decoration: none;
-	background-color: #ffffff;
-}
-
-TABLE {
-	color: black;
-	width: 90%;
-	border-collapse: collapse;
-	border-color: Black;
-	background: white;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	margin-left: 0em;
-	margin-right: 0em;
-}
-
-.tbldesc {
-	font-style: italic;
-}
-
-TH {
-	font-weight: bold;
-	font-size: 0.7em;
-	color: black;
-	background-color: #dadada;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TH.base {
-	font-weight: bold;
-	color: black;
-	border: 1 solid #606060;
-	background-color: #dcdada;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TD {
-	font-size: 0.7em;
-	color: black;
-	background-color: white;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-CITE {
-	font-style: italic;
-}
-
-EM {
-	font-style: italic;
-}
-
-STRONG {
-	font-weight: bold;
-}
-
-caption {
-	text-align: left;
-	font-style: italic;
-}
-
-DT {
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-DD {
-	margin-left: 1.0em;
-}
-
-PRE,pre.cgraphic {
-	font-family: monospace;
-	font-size: 12px;
-	background-color: #dadada;
-	padding: 5px;
-}
-
-.italic {
-	font-style: italic;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.underlined {
-	text-decoration: underline;
-}
-
-.bold-italic,.boldItalic {
-	font-weight: bold;
-	font-style: italic;
-}
-
-.smallCaps,.smallcaps {
-	text-transform: uppercase;
-	font-size: smaller;
-	font-variant: small-caps;
-}
-
-.italic-underlined {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.bold-underlined {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.bold-italic-underlined {
-	font-weight: bold;
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.smallcaps-underlined {
-	font-variant: small-caps;
-	text-decoration: underline;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.inlinedef {
-	font-style: italic;
-}
-
-.sidebar {
-	background: #cccccc;
-}
-
-A:link {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:visited {
-	color: #996699;
-	text-decoration: underline;
-}
-
-A:active {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:hover {
-	color: #996699;;
-	text-decoration: underline;
-}
-
-a.toclink:link {
-	text-decoration: none;
-}
-
-a.toclink:active {
-	text-decoration: none;
-}
-
-a.toclink:visited {
-	text-decoration: none;
-}
-
-a.toclink:hover {
-	text-decoration: underline;
-}
-
-a.ptoclink:link {
-	text-decoration: none;
-}
-
-a.ptoclink:active {
-	text-decoration: none;
-}
-
-a.ptoclink:visited {
-	text-decoration: none;
-}
-
-a.ptoclink:hover {
-	text-decoration: underline;
-}
-
-a.indexlink:link {
-	text-decoration: none;
-}
-
-a.indexlink:active {
-	text-decoration: none;
-}
-
-a.indexlink:visited {
-	text-decoration: none;
-}
-
-a.indexlink:hover {
-	text-decoration: underline;
-}
-
-a.figurelist:link {
-	text-decoration: none;
-}
-
-a.figurelist:active {
-	text-decoration: none;
-}
-
-a.figurelist:visited {
-	text-decoration: none;
-}
-
-a.figurelist:hover {
-	text-decoration: underline;
-}
-
-a.tablelist:link {
-	text-decoration: none;
-}
-
-a.tablelist:active {
-	text-decoration: none;
-}
-
-a.tablelist:visited {
-	text-decoration: none;
-}
-
-a.tablelist:hover {
-	text-decoration: underline;
-}
-
-a.boldgreylink:link {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:visited {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:hover {
-	text-decoration: underline;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-.runningheader {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter a:link {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:active {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:visited {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:hover {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: underline;
-}
-
-#breadcrumb,.breadcrumb,span.breadcrumbs {
-	font-size: 0.75em;
-}
-
-.fastpath {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.fastpathtitle {
-	font-weight: bold;
-}
-
-.toc {
-	font-size: small;
-}
-
-.nested0 {
-	margin-top: 0em;
-}
-
-.p {
-	margin-top: 1em;
-}
-
-span.figcap {
-	font-style: italic;
-}
-
-span.figdesc {
-	font-style: italic;
-}
-
-div.figbox {
-	
-}
-
-div.figrules {
-	
-}
-
-div.fignone {
-	
-}
-
-.fignone {
-	
-}
-
-.figborder {
-	
-}
-
-.figsides {
-	
-}
-
-.figtop {
-	
-}
-
-.figbottom {
-	
-}
-
-.figtopbot {
-	
-}
-
-.parentlink {
-	
-}
-
-.prevlink {
-	
-}
-
-.nextlink {
-	
-}
-
-.relconceptshd {
-	
-}
-
-.reltaskshd {
-	
-}
-
-.relrefhd {
-	
-}
-
-.synnone {
-	
-}
-
-.synborder {
-	
-}
-
-.synsides {
-	
-}
-
-.syntop {
-	
-}
-
-.synbottom {
-	
-}
-
-.syntopbot {
-	
-}
-
-.skip {
-	margin-top: 1em;
-}
-
-.skipspace {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.ulchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.olchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-ul,ol {
-	margin-top: 0.1em;
-	padding-top: 0.1em;
-}
-
-ul.simple {
-	list-style-type: none;
-}
-
-ul.indexlist {
-	list-style-type: none;
-}
-
-OL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-UL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-OL LI DIV P {
-	list-style-type: decimal;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-UL LI DIV P {
-	list-style-type: disc;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-* [compact="yes"]>li {
-	margin-top: 0 em;
-}
-
-* [compact="no"]>li {
-	margin-top: 0.5em;
-}
-
-hr {
-	margin-bottom: 0em;
-	margin-top: 0em;
-	padding-top: 0em;
-	padding-bottom: 0em;
-	width: 90%;
-	color: #cccccc;
-	text-align: center;
-}
-
-H1,.title,.pagetitle,.topictitle1 {
-	font-size: 1.5em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.5em;
-	word-spacing: 0.1em;
-}
-
-H2,.subtitle,.pagesubtitle,.topictitle2 {
-	font-size: 1.25em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.0em;
-	padding-bottom: 0.0em;
-}
-
-H3,.boldtitle,.topictitle3 {
-	font-size: 1.0em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	padding-bottom: 0.1em;
-}
-
-H4,.topictitle4 {
-	font-size: 0.9em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.1em;
-	padding-bottom: 0.1em;
-}
-
-h5,.topictitle5 {
-	font-size: 0.8em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-h6,.topictitle6 {
-	font-size: 0.7em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-div.headtitle {
-	font-size: 1em;
-	font-weight: bold;
-	margin-left: 0em;
-}
-
-div.head0 {
-	font-size: 0.9em;
-	font-weight: bold;
-	margin-left: 0em;
-	margin-top: 0.5em;
-}
-
-div.head1 {
-	font-size: 0.8em;
-	font-weight: bold;
-	margin-left: 1em;
-	padding-top: 0.5em;
-}
-
-div.head2 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 2em;
-}
-
-div.head3 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 3em;
-}
-
-div.head4 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 4em;
-}
-
-div.head5 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 5em;
-}
-
-div.head6 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 6em;
-}
-
-div.head7 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 7em;
-}
-
-div.head8 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 8em;
-}
-
-div.head9 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 9em;
-}
-
-.tip {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.tiptitle {
-	font-weight: bold;
-}
-
-.firstcol {
-	font-weight: bold;
-}
-
-.ptocH1 {
-	font-size: x-small;
-}
-
-.ptocH2 {
-	font-size: x-small;
-}
-
-.stitle {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.nte {
-	
-}
-
-.xxlines {
-	white-space: pre;
-	font-size: 0.95em;
-}
-
-.sectiontitle {
-	margin-top: 1em;
-	margin-bottom: 0em;
-	color: black;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-div.imageleft {
-	text-align: left;
-}
-
-div.imagecenter {
-	text-align: center;
-}
-
-div.imageright {
-	text-align: right;
-}
-
-div.imagejustify {
-	text-align: justify;
-}
-
-div.mmobj {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjleft {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-div.mmobjcenter {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjright {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-pre.screen {
-	padding: 1em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-	border: thin solid Black;
-	font-size: 100%;
-}
-
-.prereq {
-	margin-left: 1.5em;
-}
-
-.defListHead {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.mv {
-	font-style: italic;
-}
-
-span.md {
-	text-decoration: line-through;
-}
-
-.pk,span.pk {
-	font-weight: bold;
-}
-
-span.pkdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.pv {
-	font-style: italic;
-}
-
-span.pvdef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-span.kwd {
-	font-weight: bold;
-}
-
-span.kdwdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.parmListKwd {
-	font-weight: bold;
-}
-
-.parmListVar {
-	font-style: italic;
-}
-
-span.oper {
-	font-style: normal;
-}
-
-span.operdef {
-	text-decoration: underline;
-}
-
-VAR,span.var {
-	font-style: italic;
-}
-
-span.vardef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-div.msg {
-	padding: 0.2em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-}
-
-div.msgnum {
-	float: left;
-	font-weight: bold;
-	margin-bottom: 1em;
-	margin-right: 1em;
-}
-
-div.msgtext {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-div.msgitemtitle {
-	font-weight: bold;
-}
-
-p.msgitem {
-	margin-top: 0em;
-}
-
-.attention,div.attention {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.attentiontitle,span.attentiontitle {
-	font-weight: bold;
-}
-
-.cautiontitle,div.cautiontitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.caution,div.caution {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.danger,div.danger {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 1em;
-}
-
-.dangertitle,div.dangertitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.important {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.importanttitle {
-	font-weight: bold;
-}
-
-.remember {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.remembertitle {
-	font-weight: bold;
-}
-
-.restriction {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.restrictiontitle {
-	font-weight: bold;
-}
-
-div.warningtitle {
-	font-weight: bold;
-}
-
-div.warningbody {
-	margin-left: 2em
-}
-
-.note {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.notetitle,div.notetitle {
-	font-weight: bold;
-}
-
-div.notebody {
-	margin-left: 2em;
-}
-
-div.notelisttitle {
-	font-weight: bold;
-}
-
-div.fnnum {
-	float: left;
-}
-
-div.fntext {
-	margin-left: 2em;
-}
-
-div.stepl {
-	margin-left: 2em;
-}
-
-div.steplnum {
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-left: 5em;
-}
-
-div.steplnum {
-	font-style: italic;
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-bottom: 0.5em;
-	margin-left: 3em;
-}
-
-div.ledi {
-	margin-left: 3em;
-}
-
-div.ledesc {
-	margin-left: 3em;
-}
-
-span.pblktitle {
-	font-weight: bold;
-}
-
-div.pblklblbox {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	margin-top: 0.2em;
-}
-
-span.ednoticestitle {
-	font-weight: bold;
-}
-
-span.term {
-	font-weight: bold;
-}
-
-span.idxshow {
-	color: green;
-}
-
-div.code {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-span.refkey {
-	font-weight: bold;
-	color: white;
-	background-color: black;
-}
-
-tt.apl {
-	font-style: italic;
-}
-
-div.qualifstart {
-	padding: 0.1em 0.5em 0.5em 0.5em;
-	border-top: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-div.qualifend {
-	padding: 0.5em 0.5em 0.1em 0.5em;
-	border-bottom: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-.noshade {
-	background-color: transparent;
-}
-
-.xlight {
-	background-color: #DADADA;
-}
-
-.light {
-	background-color: #B0B0B0;
-}
-
-.medium {
-	background-color: #8C8C8C;
-}
-
-.dark {
-	background-color: #6E6E6E;
-}
-
-.xdark {
-	background-color: #585858;
-}
-
-.light-yellow {
-	background-color: #FFFFCC;
-}
-
-.khaki {
-	background-color: #CCCC99;
-}
-
-.medium-blue {
-	background-color: #6699CC;
-}
-
-.light-blue {
-	background-color: #CCCCFF;
-}
-
-.mid-grey {
-	background-color: #CCCCCC;
-}
-
-.light-grey {
-	background-color: #DADADA;
-}
-
-.lightest-grey {
-	background-color: #E6E6E6;
-}
-
-#changed {
-	position: absolute;
-	left: 0.2em;
-	color: #7B68EE;
-	background-color: #FFFFFF;
-	font-style: normal;
-	font-weight: bold;
-}
-
-INPUT.buttons {
-	font-size: 0.75em;
-	border-top: 0.2em outset #B1B1B1;
-	border-right: 0.2em outset #000000;
-	border-bottom: 0.2em outset #000000;
-	border-left: 0.2em outset #B1B1B1;
-	background-color: #E2E2E2;
-	margin-bottom: 0.2em;
-}
-
-.cgraphic {
-	font-size: 90%;
-	color: black;
-}
-
-.aix,.hpux,.sun,.unix,.win2,.winnt,.win,.zos,.linux,.os390,.os400,.c,.cplusplus,.cobol,.fortran,.java,.macosx,.os2,.pl1,.rpg
-	{
-	background-repeat: no-repeat;
-	background-position: top left;
-	margin-top: 0.5em;
-	text-indent: 55px;
-}
-
-.aix {
-	background-image: url(ngaix.gif);
-}
-
-.hpux {
-	background-image: url(nghpux.gif);
-}
-
-.sun {
-	background-image: url(ngsolaris.gif);
-}
-
-.unix {
-	background-image: url(ngunix.gif);
-}
-
-.win2 {
-	background-image: url(ng2000.gif);
-}
-
-.winxp {
-	background-image: url(ngxp.gif);
-}
-
-.winnt {
-	background-image: url(ngnt.gif);
-}
-
-.win {
-	background-image: url(ngwin.gif);
-}
-
-.zos {
-	background-image: url(ngzos.gif);
-}
-
-.linux {
-	background-image: url(nglinux.gif);
-}
-
-.os390 {
-	background-image: url(ng390.gif);
-}
-
-.os400 {
-	background-image: url(ng400.gif);
-}
-
-.c {
-	background-image: url(ngc.gif);
-}
-
-.cplusplus {
-	background-image: url(ngcpp.gif);
-}
-
-.cobol {
-	background-image: url(ngcobol.gif);
-}
-
-.fortran {
-	background-image: url(ngfortran.gif);
-}
-
-.java {
-	background-image: url(ngjava.gif);
-}
-
-.macosx {
-	background-image: url(ngmacosx.gif);
-}
-
-.os2 {
-	background-image: url(ngos2.gif);
-}
-
-.pl1 {
-	background-image: url(ngpl1.gif);
-}
-
-.rpg {
-	background-image: url(ngrpg.gif);
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/commonrtl.css b/docs/org.eclipse.wst.doc.user/commonrtl.css
deleted file mode 100644
index 2350b01..0000000
--- a/docs/org.eclipse.wst.doc.user/commonrtl.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-top: 1em; margin-bottom: 1em }
-.linklistwithchild { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-right : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
deleted file mode 100644
index 398dbe4..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
deleted file mode 100644
index 95f6b44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
deleted file mode 100644
index 9064bb8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
deleted file mode 100644
index eca4347..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
deleted file mode 100644
index 5d87d0c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
deleted file mode 100644
index c334bbf..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
deleted file mode 100644
index a94614e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/image99L.jpg b/docs/org.eclipse.wst.doc.user/images/image99L.jpg
deleted file mode 100644
index 506abdb..0000000
--- a/docs/org.eclipse.wst.doc.user/images/image99L.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg b/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
deleted file mode 100644
index be7350e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg b/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
deleted file mode 100644
index d2f625c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg b/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
deleted file mode 100644
index ff98f42..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg b/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
deleted file mode 100644
index 67077f8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg b/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
deleted file mode 100644
index 9ee0430..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/note.gif b/docs/org.eclipse.wst.doc.user/images/note.gif
deleted file mode 100644
index f6260db..0000000
--- a/docs/org.eclipse.wst.doc.user/images/note.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
deleted file mode 100644
index 25f260f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
deleted file mode 100644
index 9955ed3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl.gif b/docs/org.eclipse.wst.doc.user/images/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif b/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
deleted file mode 100644
index 9f074e8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
deleted file mode 100644
index ebcd1c7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
deleted file mode 100644
index be74d57..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
deleted file mode 100644
index 15d6071..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
deleted file mode 100644
index 9c56342..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
deleted file mode 100644
index 8dc34a3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
deleted file mode 100644
index 57ddb29..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
deleted file mode 100644
index 50553f6..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
deleted file mode 100644
index f48165e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
deleted file mode 100644
index 8a36a66..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
deleted file mode 100644
index cc68a44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
deleted file mode 100644
index 2092605..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
deleted file mode 100644
index f3b4f6f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
deleted file mode 100644
index 518c606..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
deleted file mode 100644
index a66b6e7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
deleted file mode 100644
index 2a187da..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
deleted file mode 100644
index b9622ef..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
deleted file mode 100644
index 6e253b8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
deleted file mode 100644
index dfb7523..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
deleted file mode 100644
index ef61772..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
deleted file mode 100644
index 664eecc..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/notices.html b/docs/org.eclipse.wst.doc.user/notices.html
deleted file mode 100644
index 58b6069..0000000
--- a/docs/org.eclipse.wst.doc.user/notices.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1"
-	TYPE="text/css">
-<title>Legal Notices</title>
-</head>
-<body>
-
-<h3><a NAME="Notices"></a>Notices</h3>
-<p>The material in this guide is Copyright (c) IBM Corporation and
-others 2000, 2007.</p>
-<p><a href="about.html">Terms and conditions regarding the use of this
-guide.</a></p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.doc.user/plugin.properties b/docs/org.eclipse.wst.doc.user/plugin.properties
deleted file mode 100644
index 6163b89..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName   = Master User Doc TOC
-providerName = Eclipse.org
diff --git a/docs/org.eclipse.wst.doc.user/plugin.xml b/docs/org.eclipse.wst.doc.user/plugin.xml
deleted file mode 100644
index 0aa617f..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true" />
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.doc.user/toc.xml b/docs/org.eclipse.wst.doc.user/toc.xml
deleted file mode 100644
index 5213a43..0000000
--- a/docs/org.eclipse.wst.doc.user/toc.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 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
-	*******************************************************************************/ -->
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-<toc label="Web Application Development User Guide"
-	topic="topics/overview.html">
-
-	<topic label="Creating Web applications">
-		<link
-			toc="../org.eclipse.wst.webtools.doc.user/webtools_toc.xml" />
-	</topic>
-	<topic label="Creating J2EE and enterprise applications">
-		<link toc="../org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml" />
-		<link toc="../org.eclipse.jst.ejb.doc.user/ejb_toc.xml" />
-	</topic>
-	<topic label="Editing markup language files"
-		href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html">
-		<link toc="../org.eclipse.wst.sse.doc.user/sse_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml" />
-	</topic>
-	<!-- <link toc="../org.eclipse.wst.xml.doc.user/xml_toc.xml"/>-->
-	<topic label="Developing Web service applications">
-		<link toc="../org.eclipse.jst.ws.doc.user/webservice_toc.xml" />
-	</topic>
-	<topic label="Using the server tools">
-  		<link toc="../org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml" />
-	</topic>
-	<topic label="Limitations and Known Issues" href="topics/limitations.html" />
-	<topic label="Legal" href="notices.html" />
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/topics/limitations.html b/docs/org.eclipse.wst.doc.user/topics/limitations.html
deleted file mode 100644
index e3c110f..0000000
--- a/docs/org.eclipse.wst.doc.user/topics/limitations.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css"
-	href="../../org.eclipse.wst.doc.user/common.css" >
-<title>Web Tools Project Limitations and Known Issues</title>
-</head>
-<body>
-<h1>Web Tools Project Limitations and Known Issues</h1>
-<p>The following are limitations and known issues:</p>
-<dl>
-<dt class="dlterm"><b>When using XDoclet the generation does not appear to run.</b></dt>
-<dd><p>Cause: XDoclet has some limitations with long path names.</p>
-<p>Solution: You should install Eclipse and the Web Tools Platform into a directory with a short
-path.</p>
-</dd>
-<dt class="dlterm"><b>When creating a Web service you may see a message similar to the following one:</b></dt>
-<dd><p><samp>org.apache.axis.utils.JavaUtils isAttachmentSupported
-WARNING: Unable to find required classes (javax.activation.DataHandler and 
-javax.mail.internet.MimeMultipart). Attachment support is disabled.
-</samp></p>
-<p>Cause: Attachment support is disabled.</p>
-<p>Solution: The Apache Axis tools should auto-detect the javax.activation classes provided you add 
-<samp>activation.jar</samp> to the build path of the project to which you are generating your Web service or client. 
-For services, you will also need to make sure <samp>activation.jar</samp> is available to the Tomcat JRE, either by 
-including it in the server's global classpath or by placing a copy of activation.jar into the target Web 
-project's <samp>lib/</samp> directory.
-</p>
-</dd>
-</dl>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/topics/overview.html b/docs/org.eclipse.wst.doc.user/topics/overview.html
deleted file mode 100644
index eab51be..0000000
--- a/docs/org.eclipse.wst.doc.user/topics/overview.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css"
-	href="../../org.eclipse.wst.doc.user/common.css" >
-<title>Web Tools Project Overview</title>
-</head>
-<body>
-<h1>Web Tools Project Overview</h1>
-<p>The Web Tools Project aims to provide common infrastructure available
-to any Eclipse-based development environment targeting Web-enabled
-applications.</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore b/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.project b/docs/org.eclipse.wst.dtd.ui.infopop/.project
deleted file mode 100644
index df2f69d..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
deleted file mode 100644
index 0cf4da1..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="webx0020">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a document type definition (DTD) file.
-
-The line delimiters are Ctrl-J (UNIX), Ctrl-M (Mac), or Ctrl-M Ctrl-J (Windows).</description>
-</context>
-<context id="webx0021">
-<description>This page lets you customize the syntax highlighting that the document type definition (DTD) editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.</description>
-<topic href="../org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html" label="Setting source highlighting styles"/>
-</context>
-<context id="webx0022">
-<description>Templates are a chunk of predefined code that you can insert into a DTD file when it is created.
-
-Click <b>New</b> if you want to create a completely new template.
-
-Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist.
-
-If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the <b>date</b> variable indicates the current date will be inserted.
-
-You can edit, remove, import, or export a template by using the same Preferences page.
-
-If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the <b>Templates</b> preferences page.</description>
-<topic href="../org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html" label="Working with DTD templates"/>
-<topic href="../org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html" label="Creating DTD files"/>
-</context>
-<context id="dtdw0010">
-<description>Click the <b>Use DTD Template</b> check box if you want to use a DTD template as the initial content in your new DTD page. A list of available DTD templates is listed - select the one you want to use. A preview of your DTD file is shown once you select a DTD template.</description>
-<topic href="../org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html" label="Working with DTD templates"/>
-<topic href="../org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html" label="Creating DTD files"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
deleted file mode 100644
index 3a44d26..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="dtdsource_source_HelpId">
-<description>The DTD editor lets you edit a document type definition.
-
-The editor provides text editing features such as syntax highlighting and unlimited undo and redo.
-</description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index c8829c7..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.dtd.ui.infopop; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/about.html b/docs/org.eclipse.wst.dtd.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
deleted file mode 100644
index 784ca85..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               EditorDtdContexts.xml,\
-               META-INF/,\
-               EditorDtdContexts2.xml
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
deleted file mode 100644
index 76c52ba..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-
-pluginName     = DTD Editor infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
deleted file mode 100644
index aa57fbc..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorDtdContexts.xml" plugin ="org.eclipse.wst.dtd.ui"/>
-       <contexts file="EditorDtdContexts2.xml" plugin ="org.eclipse.wst.dtd.core"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore b/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore
deleted file mode 100644
index 180fc9b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.dtdeditor.doc.user_1.0.0.jar
-temp
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.project b/docs/org.eclipse.wst.dtdeditor.doc.user/.project
deleted file mode 100644
index 4486d7a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtdeditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap
deleted file mode 100644
index b8a5163..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map collection-type="sequence" title="DTD Editor">

-<topicref href="topics/cworkdtds.dita" navtitle="Working with DTDs" type="concept">

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating DTDs"

-type="task">

-<topicref href="topics/cdtdover.dita" linking="sourceonly" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-<topicref href="topics/tedtsrcst.dita" linking="sourceonly" navtitle="Setting source highlighting styles"

-type="task"></topicref>

-<topicref href="topics/tdtemplt.dita" linking="sourceonly" navtitle="Working with DTD templates"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/timptdtd.dita" navtitle="Importing DTDs" type="task">

-</topicref>

-<topicref href="topics/tvaldtd.dita" navtitle="Validating DTDs" type="task">

-</topicref>

-<topicref href="topics/rdtdicons.dita" navtitle="Icons used in the DTD editor"

-type="reference"></topicref>

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
deleted file mode 100644
index e959eb8..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="DTD Editor" topic="topics/cworkdtds.html">
-<topic label="Working with DTDs" href="topics/cworkdtds.html">
-<topic label="Creating DTDs" href="topics/tcretdtd.html">
-<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
-<topic label="Setting source highlighting styles" href="topics/tedtsrcst.html"/>
-<topic label="Working with DTD templates" href="topics/tdtemplt.html"/>
-</topic>
-<topic label="Importing DTDs" href="topics/timptdtd.html"/>
-<topic label="Validating DTDs" href="topics/tvaldtd.html"/>
-<topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap
deleted file mode 100644
index f05b032..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map>

-<topicgroup collection-type="family">

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating a new DTD"

-type="task"></topicref>

-<topicref href="topics/cdtdover.dita" linking="targetonly" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cdtdover.dita" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-<topicref href="topics/tvaldtd.dita" linking="targetonly" navtitle="Validating DTDs"

-type="task"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating a new DTD"

-type="task"></topicref>

-<topicref href="topics/tdtemplt.dita" navtitle="Working with DTD templates"

-type="task"></topicref>

-</topicgroup>

-</map>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
deleted file mode 100644
index dd9be9e..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
-			<property name="args.input" location="DTDEditormap_toc.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 5496ab4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.dtdeditor.doc.user; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html b/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
deleted file mode 100644
index 92aaedd..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = DTDEditormap_toc.xml,\
-               about.html,\
-               org.eclipse.wst.dtdeditor.doc.userindex.xml,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
deleted file mode 100644
index 39611d6..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
deleted file mode 100644
index cb41506..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
deleted file mode 100644
index 5efa9b9..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
deleted file mode 100644
index 57ad089..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 89ba825..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
deleted file mode 100644
index c6cde94..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
deleted file mode 100644
index 6df0291..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
deleted file mode 100644
index e799143..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
deleted file mode 100644
index 7017d91..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
deleted file mode 100644
index 119e3d4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
deleted file mode 100644
index 093c6ba..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs
deleted file mode 100644
index 0f963ab..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
deleted file mode 100644
index e423242..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
deleted file mode 100644
index 92fe3c5..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-org.eclipse.wst.dtdeditor.doc.user=org.eclipse.wst.dtdeditor.doc.user\n1.0.300.qualifier

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index 771ea1c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
deleted file mode 100644
index af1ba6a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,10 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html=0

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments b/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
deleted file mode 100644
index 19b5d0c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
deleted file mode 100644
index 8c80683..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-   <toc file="DTDEditormap_toc.xml"/>
-       <index path="index/"/>
-  </extension>
-	<extension point="org.eclipse.help.index">
-		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist
deleted file mode 100644
index 13cbd72..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="DTDEditormap_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="DTDEditormap_toc.ditamap"/>

-    <map file="DTDreftable.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.html b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.html
deleted file mode 100644
index 993d81a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<strong>D</strong>
-<ul class="indexlist">
-<li>DTD
-<ul class="indexlist">
-<li><a href="topics/tcretdtd.html#tcretdtd">creating</a>
-</li>
-<li><a href="topics/tdtemplt.html#twmacro">creating templates</a>
-</li>
-<li><a href="topics/rdtdicons.html#ricons">editor icons</a>
-</li>
-<li><a href="topics/tedtsrcst.html#ttaghilt">highlighting styles</a>
-</li>
-<li><a href="topics/timptdtd.html#timptdtd">importing</a>
-</li>
-<li><a href="topics/cdtdover.html#cdtdover">overview</a>
-</li>
-<li><a href="topics/tvaldtd.html#tvaldtd">validating</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong>T</strong>
-<ul class="indexlist">
-<li>templates
-<ul class="indexlist">
-<li><a href="topics/tdtemplt.html#twmacro">DTD</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong>X</strong>
-<ul class="indexlist">
-<li>XML editor
-<ul class="indexlist">
-<li><a href="topics/tedtsrcst.html#ttaghilt">DTD highlighting styles</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
deleted file mode 100644
index ce9760d..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="DTD">
-    <entry keyword="creating">
-      <topic href="topics/tcretdtd.html#tcretdtd" title="Creating DTDs"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cdtdover.html#cdtdover" title="Document type definitions (DTDs) - overview"/>
-    </entry>
-    <entry keyword="highlighting styles">
-      <topic href="topics/tedtsrcst.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-    <entry keyword="creating templates">
-      <topic href="topics/tdtemplt.html#twmacro" title="Working with DTD templates"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/timptdtd.html#timptdtd" title="Importing DTDs"/>
-    </entry>
-    <entry keyword="validating">
-      <topic href="topics/tvaldtd.html#tvaldtd" title="Validating DTDs"/>
-    </entry>
-    <entry keyword="editor icons">
-      <topic href="topics/rdtdicons.html#ricons" title="Icons used in the DTD editor"/>
-    </entry>
-  </entry>
-  <entry keyword="XML editor">
-    <entry keyword="DTD highlighting styles">
-      <topic href="topics/tedtsrcst.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-  </entry>
-  <entry keyword="templates">
-    <entry keyword="DTD">
-      <topic href="topics/tdtemplt.html#twmacro" title="Working with DTD templates"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
deleted file mode 100644
index d10ce86..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-pluginName     = DTD Editor documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
deleted file mode 100644
index 8c80683..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-   <toc file="DTDEditormap_toc.xml"/>
-       <index path="index/"/>
-  </extension>
-	<extension point="org.eclipse.help.index">
-		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
deleted file mode 100644
index f947171..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<concept id="cdtdover" xml:lang="en-us">

-<title>Document type definitions (DTDs) - overview</title>

-<titlealts>

-<searchtitle>Document type definition (DTD) - overview</searchtitle>

-</titlealts>

-<shortdesc>A document type definition (DTD) provides you with the means to

-validate XML files against a set of rules. When you create a DTD file, you

-can specify rules that control the structure of any XML files that reference

-the DTD file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>A DTD can contain declarations that define elements, attributes, notations,

-and entities for any XML files that reference the DTD file. It also establishes

-constraints for how each element, attribute, notation, and entity can be used

-within any of the XML files that reference the DTD file.</p>

-<p>To be considered a valid XML file, the document must be accompanied by

-a DTD (or an XML schema), and conform to all of the declarations in the DTD

-(or XML schema).</p>

-<p>Certain XML parsers have the ability to read DTDs and check to see if the

-XML file it is reading follows all of those rules. While the parser is reading

-the XML file, it will check each line to be sure that it conforms to the rules

-that are laid out in the DTD file. If there is a problem, the parser generates

-an error and points to where the error occurs in the XML file. This kind of

-parser is called a validating parser because it validates the content of the

-XML file against the DTD.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
deleted file mode 100644
index efe3ea4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Document type definitions (DTDs) - overview" />
-<meta name="abstract" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
-<meta name="description" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
-<meta content="DTDs (document type definitions), overview" name="DC.subject" />
-<meta content="DTDs (document type definitions), overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cdtdover" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Document type definition (DTD) - overview</title>
-</head>
-<body id="cdtdover"><a name="cdtdover"><!-- --></a>
-
-
-<h1 class="topictitle1">Document type definitions (DTDs) - overview</h1>
-
-
-
-
-<div><p>A document type definition (DTD) provides you with the means to
-validate XML files against a set of rules. When you create a DTD file, you
-can specify rules that control the structure of any XML files that reference
-the DTD file.</p>
-
-<p>A DTD can contain declarations that define elements, attributes, notations,
-and entities for any XML files that reference the DTD file. It also establishes
-constraints for how each element, attribute, notation, and entity can be used
-within any of the XML files that reference the DTD file.</p>
-
-<p>To be considered a valid XML file, the document must be accompanied by
-a DTD (or an XML schema), and conform to all of the declarations in the DTD
-(or XML schema).</p>
-
-<p>Certain XML parsers have the ability to read DTDs and check to see if the
-XML file it is reading follows all of those rules. While the parser is reading
-the XML file, it will check each line to be sure that it conforms to the rules
-that are laid out in the DTD file. If there is a problem, the parser generates
-an error and points to where the error occurs in the XML file. This kind of
-parser is called a validating parser because it validates the content of the
-XML file against the DTD.</p>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita
deleted file mode 100644
index 72850d4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithdtds" xml:lang="en-us">

-<title>Working with DTDs</title>

-<shortdesc>This sections contains information on the following:</shortdesc>

-<conbody></conbody>

-</concept>

-<?Pub *0000000395?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
deleted file mode 100644
index f43a581..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with DTDs" />
-<meta name="abstract" content="This sections contains information on the following:" />
-<meta name="description" content="This sections contains information on the following:" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/timptdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvaldtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rdtdicons.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithdtds" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with DTDs</title>
-</head>
-<body id="workingwithdtds"><a name="workingwithdtds"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with DTDs</h1>
-
-
-<div><p>This sections contains information on the following:</p>
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tcretdtd.html">Creating DTDs</a></strong><br />
-A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.</li>
-<li class="ulchildlink"><strong><a href="../topics/timptdtd.html">Importing DTDs</a></strong><br />
-If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor.</li>
-<li class="ulchildlink"><strong><a href="../topics/tvaldtd.html">Validating DTDs</a></strong><br />
-Validating a DTD file lets you verify that it is well formed and does not contain any errors.</li>
-<li class="ulchildlink"><strong><a href="../topics/rdtdicons.html">Icons used in the DTD editor</a></strong><br />
-These DTD editor icons appear in the Outline view.</li>
-</ul>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
deleted file mode 100644
index 003c581..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the DTD editor</title>

-<titlealts>

-<searchtitle>Icons used in the DTD editor</searchtitle>

-</titlealts>

-<shortdesc>These DTD editor icons appear in the Outline view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>editor icons</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<thead>

-<row>

-<entry>Icon&nbsp;</entry>

-<entry>Description</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="COLSPEC0"></entry>

-<entry colname="COLSPEC1"></entry>

-</row>

-<row>

-<entry> <image href="../images/nany.gif"><alt>This graphic is the ANY content

-icon</alt></image> </entry>

-<entry>ANY content (content model)</entry>

-</row>

-<row>

-<entry><image href="../images/attribute.gif"><alt>This graphic is the attribute

-icon</alt></image> </entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry><image href="../images/attribute_list.gif"><alt>This graphic is the

-attribute list icon</alt></image> </entry>

-<entry>attribute list</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/ADD_Comment.gif"><alt>This

-graphic is the comment icon</alt></image></entry>

-<entry colname="COLSPEC1">comment</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDChoice.gif"><alt>This graphic is the content

-model - choice icon</alt></image></entry>

-<entry>content model - choice</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDSequence.gif"><alt>This graphic is the content

-model - sequence icon</alt></image></entry>

-<entry>content model - sequence</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Element.gif"><alt>This graphic is the element

-icon</alt></image> </entry>

-<entry>element</entry>

-</row>

-<row>

-<entry> <image href="../images/nempty.gif"><alt>This graphic is the EMPTY

-content (content model) icon</alt></image> </entry>

-<entry>EMPTY content (content model)</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Entity.gif"><alt>This graphic is the entity

-icon</alt></image> </entry>

-<entry>entity</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Notation.gif"><alt>This graphic is the notation

-icon</alt></image> </entry>

-<entry>notation</entry>

-</row>

-<row>

-<entry> <image href="../images/ADD_Entity_Reference.gif"><alt>This graphic

-is the parameter entity reference icon</alt></image></entry>

-<entry>parameter entity reference</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-<section></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
deleted file mode 100644
index 9b01e7d..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the DTD editor" />
-<meta name="abstract" content="These DTD editor icons appear in the Outline view." />
-<meta name="description" content="These DTD editor icons appear in the Outline view." />
-<meta content="DTD editor, icons" name="DC.subject" />
-<meta content="DTD editor, icons" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Icons used in the DTD editor</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the DTD editor</h1>
-
-
-
-
-<div><p>These DTD editor icons appear in the Outline view.</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" id="N10063">Icon </th>
-
-<th valign="top" id="N1006A">Description</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" headers="N10063 ">&nbsp;</td>
-
-<td valign="top" headers="N1006A ">&nbsp;</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/nany.gif" alt="This graphic is the ANY content&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">ANY content (content model)</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/attribute.gif" alt="This graphic is the attribute&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/attribute_list.gif" alt="This graphic is the&#10;attribute list icon" /> </td>
-
-<td valign="top" headers="N1006A ">attribute list</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Comment.gif" alt="This&#10;graphic is the comment icon" /></td>
-
-<td valign="top" headers="N1006A ">comment</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/XSDChoice.gif" alt="This graphic is the content&#10;model - choice icon" /></td>
-
-<td valign="top" headers="N1006A ">content model - choice</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/XSDSequence.gif" alt="This graphic is the content&#10;model - sequence icon" /></td>
-
-<td valign="top" headers="N1006A ">content model - sequence</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Element.gif" alt="This graphic is the element&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">element</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/nempty.gif" alt="This graphic is the EMPTY&#10;content (content model) icon" /> </td>
-
-<td valign="top" headers="N1006A ">EMPTY content (content model)</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Entity.gif" alt="This graphic is the entity&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">entity</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Notation.gif" alt="This graphic is the notation&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">notation</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/ADD_Entity_Reference.gif" alt="This graphic&#10;is the parameter entity reference icon" /></td>
-
-<td valign="top" headers="N1006A ">parameter entity reference</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
deleted file mode 100644
index 8aaa14c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tcretdtd" xml:lang="en-us">

-<title>Creating DTDs</title>

-<titlealts>

-<searchtitle>Creating a new document type definition (DTD)</searchtitle>

-</titlealts>

-<shortdesc>A document type definition (DTD) contains a set of rules that can

-be used to validate an XML file. After you have created a DTD, you can edit

-it manually, adding declarations that define elements, attributes, entities,

-and notations, and how they can be used for any XML files that reference the

-DTD file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p></p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>Follow

-these steps to create a new DTD:</p></context>

-<steps>

-<step><cmd>If necessary, create a project to contain the DTD.</cmd></step>

-<step><cmd>In the workbench, select <menucascade><uicontrol>File</uicontrol>

-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol><uicontrol>XML</uicontrol>

-<uicontrol> DTD</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>. </cmd>

-</step>

-<step><cmd>Select the project or folder that will contain the DTD.</cmd></step>

-<step><cmd>In the <uicontrol>File name</uicontrol> field, type the name of

-the DTD, for example <userinput>MyDTD.dtd</userinput>.</cmd><info>The name

-of your DTD file must end with the extension <userinput>.dtd</userinput></info>

-</step>

-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>

-<step><cmd>You can use a DTD template as the basis for your new DTD file.

-To do so, click the <uicontrol>Use DTD Template</uicontrol> check box, and

-select the template you want to use.</cmd></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result><p>The DTD appears in the Navigator view and automatically, by default,

-opens in the DTD editor. In the DTD editor, you can manually add elements,

-attributes, notations, entities, and comments to the DTD. If you close the

-file, and want to later re-open it in the DTD editor, double-click it in the

-Navigator view.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
deleted file mode 100644
index 712f40c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating DTDs" />
-<meta name="abstract" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
-<meta name="description" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
-<meta content="DTDs (document type definitions), creating" name="DC.subject" />
-<meta content="DTDs (document type definitions), creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcretdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a new document type definition (DTD)</title>
-</head>
-<body id="tcretdtd"><a name="tcretdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating DTDs</h1>
-
-
-
-
-<div><p>A document type definition (DTD) contains a set of rules that can
-be used to validate an XML file. After you have created a DTD, you can edit
-it manually, adding declarations that define elements, attributes, entities,
-and notations, and how they can be used for any XML files that reference the
-DTD file.</p>
-
-<div class="section"><p />
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>Follow
-these steps to create a new DTD:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>If necessary, create a project to contain the DTD.</span></li>
-
-<li class="stepexpand"><span>In the workbench, select <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">XML</span>
- &gt; <span class="uicontrol"> DTD</span></span> and click <span class="uicontrol">Next</span>. </span>
-</li>
-
-<li class="stepexpand"><span>Select the project or folder that will contain the DTD.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">File name</span> field, type the name of
-the DTD, for example <kbd class="userinput">MyDTD.dtd</kbd>.</span> The name
-of your DTD file must end with the extension <kbd class="userinput">.dtd</kbd>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>You can use a DTD template as the basis for your new DTD file.
-To do so, click the <span class="uicontrol">Use DTD Template</span> check box, and
-select the template you want to use.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section"><p>The DTD appears in the Navigator view and automatically, by default,
-opens in the DTD editor. In the DTD editor, you can manually add elements,
-attributes, notations, entities, and comments to the DTD. If you close the
-file, and want to later re-open it in the DTD editor, double-click it in the
-Navigator view.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
deleted file mode 100644
index a379bc5..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="twmacro" xml:lang="en-us">

-<title>Working with DTD templates</title>

-<titlealts>

-<searchtitle>Working with DTD templates</searchtitle>

-</titlealts>

-<shortdesc>Templates are a chunk of predefined code that you can insert into

-a DTD file when it is created. You may find a template useful when you have

-a certain piece of code you want to reuse several times, and you do not want

-to write it out every time.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>creating templates</indexterm></indexterm>

-<indexterm>templates<indexterm>DTD</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To create a new DTD template follow these steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>DTD Files</uicontrol><uicontrol>DTD

-Templates</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol> if you want to create a completely

-new template.</cmd></step>

-<step><cmd>Supply a new template <uicontrol>Name</uicontrol> and <uicontrol>Description</uicontrol>.</cmd>

-</step>

-<step><cmd>Specify the <uicontrol>Context</uicontrol> for the template.</cmd>

-<info>This is the context in which the template is available in the proposal

-list when content assist is requested. </info></step>

-<step><cmd>Specify the <uicontrol>Pattern</uicontrol> for your template using

-the appropriate tags, attributes, or attribute values to be inserted by content

-assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Insert Variable</uicontrol> button

-and select the variable to be inserted. </cmd><info>For example, the <b>date</b> variable

-indicates the current date will be inserted. </info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-<postreq>You can edit, remove, import, or export a template by using the same

-preferences page. <p>If you have a template that you do not want to remove,

-but you no longer want the template to appear in the DTD templates list when

-you create a file, go to the<b> DTD Templates</b> preferences page and clear

-its check box.</p></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
deleted file mode 100644
index 333a754..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Working with DTD templates" />
-<meta name="abstract" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta name="description" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="DTD templates, creating, templates, DTDs" name="DC.subject" />
-<meta content="DTD templates, creating, templates, DTDs" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twmacro" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with DTD templates</title>
-</head>
-<body id="twmacro"><a name="twmacro"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with DTD templates</h1>
-
-
-
-
-<div><p>Templates are a chunk of predefined code that you can insert into
-a DTD file when it is created. You may find a template useful when you have
-a certain piece of code you want to reuse several times, and you do not want
-to write it out every time.</p>
-
-<div class="section"><p>To create a new DTD template follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">DTD Files</span> &gt; <span class="uicontrol">DTD
-Templates</span></span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span> if you want to create a completely
-new template.</span></li>
-
-<li class="stepexpand"><span>Supply a new template <span class="uicontrol">Name</span> and <span class="uicontrol">Description</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Context</span> for the template.</span>
- This is the context in which the template is available in the proposal
-list when content assist is requested. </li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by content
-assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Insert Variable</span> button
-and select the variable to be inserted. </span> For example, the <strong>date</strong> variable
-indicates the current date will be inserted. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-<div class="section">You can edit, remove, import, or export a template by using the same
-preferences page. <p>If you have a template that you do not want to remove,
-but you no longer want the template to appear in the DTD templates list when
-you create a file, go to the<strong> DTD Templates</strong> preferences page and clear
-its check box.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
deleted file mode 100644
index 1714d29..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="ttaghilt" xml:lang="en-us">

-<title>Setting source highlighting styles</title>

-<titlealts>

-<searchtitle>Setting source highlighting styles for DTD files</searchtitle>

-</titlealts>

-<shortdesc>If desired, you can change various aspects of how the DTD source

-code is displayed in the Source view of the DTD editor, such as the colors

-the tags will be displayed in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>highlighting styles</indexterm></indexterm>

-<indexterm>XML editor<indexterm>DTD highlighting styles</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To set highlighting styles for the DTD code, follow these steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>DTD Files</uicontrol><uicontrol> DTD

-Styles</uicontrol></menucascade>.</cmd></step>

-<step><cmd>In the <uicontrol>Content type</uicontrol> list, select the source

-tag type that you wish to set a highlighting style for. You can also click

-text in the sample text to specify the source tag type that you wish to set

-a highlighting style for.</cmd></step>

-<step><cmd>Click the <uicontrol>Foreground</uicontrol> box.</cmd></step>

-<step><cmd>Select the color that you want the text of the tag to appear in

-and click <uicontrol>OK</uicontrol>.</cmd></step>

-<step><cmd>Click the <uicontrol>Background</uicontrol> box.</cmd></step>

-<step><cmd>Select the color that you want to appear behind the tag and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the <uicontrol>Bold</uicontrol> check box if you want to

-make the type bold.</cmd></step>

-<step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting

-styles back to their default values. If you only want to reset the value for

-a particular content type, select it in the <uicontrol>Content type </uicontrol> field,

-the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>

-</steps>

-<result></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
deleted file mode 100644
index 1e34382..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting source highlighting styles" />
-<meta name="abstract" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
-<meta name="description" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
-<meta content="DTDs (document type definitions), XML editor preferences, setting highlighting styles, XML editor, preferences, setting DTD highlighting styles" name="DC.subject" />
-<meta content="DTDs (document type definitions), XML editor preferences, setting highlighting styles, XML editor, preferences, setting DTD highlighting styles" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ttaghilt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting source highlighting styles for DTD files</title>
-</head>
-<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting source highlighting styles</h1>
-
-
-
-
-<div><p>If desired, you can change various aspects of how the DTD source
-code is displayed in the Source view of the DTD editor, such as the colors
-the tags will be displayed in.</p>
-
-<div class="section"><p>To set highlighting styles for the DTD code, follow these steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">DTD Files</span> &gt; <span class="uicontrol"> DTD
-Styles</span></span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Content type</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also click
-text in the sample text to specify the source tag type that you wish to set
-a highlighting style for.</span></li>
-
-<li><span>Click the <span class="uicontrol">Foreground</span> box.</span></li>
-
-<li><span>Select the color that you want the text of the tag to appear in
-and click <span class="uicontrol">OK</span>.</span></li>
-
-<li><span>Click the <span class="uicontrol">Background</span> box.</span></li>
-
-<li><span>Select the color that you want to appear behind the tag and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
-make the type bold.</span></li>
-
-<li><span>Click <span class="uicontrol">Restore Default</span> to set the highlighting
-styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <span class="uicontrol">Content type </span> field,
-the click the <span class="uicontrol">Restore Default</span> button next to it. </span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span> to save your changes.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
deleted file mode 100644
index 18993b8..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="timptdtd" xml:lang="en-us">

-<title>Importing DTDs</title>

-<titlealts>

-<searchtitle>Importing DTDs</searchtitle>

-</titlealts>

-<shortdesc>If you want to work with DTD files that you created outside of

-the product, you can import them into the workbench and open them in the DTD

-editor. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To import a DTD into the workbench, follow these steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>File</uicontrol><uicontrol>Import</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Select the import source and click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Fill in the fields in the <uicontrol>Import</uicontrol> wizard

-as necessary.</cmd></step>

-<step><cmd>When you are finished, click <uicontrol>Finish</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the DTD file in the Navigator view and double-click it to

-open it in the DTD editor.</cmd></step>

-</steps>

-<result><p>After you have imported a DTD file into the workbench and opened

-it in the DTD editor, you can edit it manually.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
deleted file mode 100644
index 24cfbbe..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing DTDs" />
-<meta name="abstract" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
-<meta name="description" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
-<meta content="DTDs (document type definitions), importing" name="DC.subject" />
-<meta content="DTDs (document type definitions), importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="timptdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing DTDs</title>
-</head>
-<body id="timptdtd"><a name="timptdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing DTDs</h1>
-
-
-
-
-<div><p>If you want to work with DTD files that you created outside of
-the product, you can import them into the workbench and open them in the DTD
-editor. </p>
-
-<div class="section"><p>To import a DTD into the workbench, follow these steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span>
-</span>.</span></li>
-
-<li><span>Select the import source and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li><span>Fill in the fields in the <span class="uicontrol">Import</span> wizard
-as necessary.</span></li>
-
-<li><span>When you are finished, click <span class="uicontrol">Finish</span>.</span>
-</li>
-
-<li><span>Select the DTD file in the Navigator view and double-click it to
-open it in the DTD editor.</span></li>
-
-</ol>
-
-<div class="section"><p>After you have imported a DTD file into the workbench and opened
-it in the DTD editor, you can edit it manually.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
deleted file mode 100644
index d4c49df..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tvaldtd" xml:lang="en-us">

-<title>Validating DTDs</title>

-<titlealts>

-<searchtitle>Validating DTDs</searchtitle>

-</titlealts>

-<shortdesc>Validating a DTD file lets you verify that it is well formed and

-does not contain any errors.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.&nbsp;</p><p>To validate

-a DTD, follow these steps:</p></context>

-<steps>

-<step><cmd>In the Navigator view, right-click the DTD and click <menucascade>

-<uicontrol>Validate DTD File</uicontrol></menucascade>.</cmd></step>

-</steps>

-<result>A dialog opens, indicating if the DTD file was successfully validated

-or not. If the file is invalid, any errors will appear in the Problems view. &nbsp;<p><b>Note</b>:

-If you receive an error message indicating that the Problems view is full,

-you can increase the number of error messages allowed by selecting <menucascade>

-<uicontrol>Properties</uicontrol><uicontrol>Validation</uicontrol></menucascade> from

-the project's pop-up menu and specifying the maximum number of error messages

-allowed. You might have to select the <uicontrol>Override validation preferences</uicontrol> check

-box in order to enable the <uicontrol>Maximum number of validation messages</uicontrol> field</p><p>You

-can set up project's properties so that different types of project resources

-are automatically validated when you save them. From a project's pop-up menu

-select  <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.

-Any validators you can run against your&nbsp;project will be listed in the

-Validation page.&nbsp;</p></result>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

-<desc>General validation information</desc>

-</link>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
deleted file mode 100644
index 5a49f1d..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating DTDs" />
-<meta name="abstract" content="Validating a DTD file lets you verify that it is well formed and does not contain any errors." />
-<meta name="description" content="Validating a DTD file lets you verify that it is well formed and does not contain any errors." />
-<meta content="DTDs (document type definitions), validating" name="DC.subject" />
-<meta content="DTDs (document type definitions), validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tvaldtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating DTDs</title>
-</head>
-<body id="tvaldtd"><a name="tvaldtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating DTDs</h1>
-
-
-
-
-<div><p>Validating a DTD file lets you verify that it is well formed and
-does not contain any errors.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To validate
-a DTD, follow these steps:</p>
-</div>
-
-
-<div class="p"><span>In the Navigator view, right-click the DTD and click <span class="menucascade">
-<span class="uicontrol">Validate DTD File</span></span>.</span></div>
-
-
-<div class="section">A dialog opens, indicating if the DTD file was successfully validated
-or not. If the file is invalid, any errors will appear in the Problems view.  <p><strong>Note</strong>:
-If you receive an error message indicating that the Problems view is full,
-you can increase the number of error messages allowed by selecting <span class="menucascade">
-<span class="uicontrol">Properties</span> &gt; <span class="uicontrol">Validation</span></span> from
-the project's pop-up menu and specifying the maximum number of error messages
-allowed. You might have to select the <span class="uicontrol">Override validation preferences</span> check
-box in order to enable the <span class="uicontrol">Maximum number of validation messages</span> field</p>
-<p>You
-can set up project's properties so that different types of project resources
-are automatically validated when you save them. From a project's pop-up menu
-select  <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
-Any validators you can run against your project will be listed in the
-Validation page. </p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.cvsignore b/docs/org.eclipse.wst.html.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.project b/docs/org.eclipse.wst.html.ui.infopop/.project
deleted file mode 100644
index 05aa1b4..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
deleted file mode 100644
index 8b8dc10..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="misc0170">
-<description>Use this dialog to edit the Web content settings for a Web project. You can specify the default document type, CSS profile, and target device. The public ID and system ID are populated automatically. To restore the defaults, click <b>Restore Defaults</b>.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0030">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create, save, or load an HTML file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when either creating HTML files or loading your HTML files into the editor.  Changing the creating files encoding causes any new HTML files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0031">
-<description>This page lets you specify the formatting, content assist, and capitalization style that will be used when you edit an HTML file.
-
-Enter a maximum width in the <b>Line width</b> field to specify the line width to break a line to fit onto more than one line when the document is formatted.
-
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted. Attributes will return to the same margin as the previous line.
-
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
-
-If you prefer to use spaces, select <b>Indent using spaces</b>.
-
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-
-To apply these formatting styles, select the <b>Format Document</b> menu item.
-
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-
-Select the Uppercase or Lowercase radio button to determine the case for tag and attribute names that are inserted into the document when using content assist or code generation.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0032">
-<description>This page lets you customize the syntax highlighting that the HTML editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0033">
-<description>This page lets you create new and edit existing templates that will be used when you edit an HTML file.
-</description>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1100">
-<description>Cleanup options enable you to update a document so that it is well-formed and formatted.
-
-The following cleanup options let you select radio buttons to choose the type of cleanup to be performed:
-- <b>Tag name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all tags in a file for easier visual parsing and consistency.
-- <b>Attribute name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all attributes in a file for easier visual parsing and consistency.
-
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-- <b>Insert required attributes</b>: Inserts an missing attributes that are required by the tag to make the element or document well-formed.
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
deleted file mode 100644
index b614187..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="htmlsource_source_HelpId">
-<description>The HTML source page editor lets you edit a file that is coded in the Hypertext Markup Language or in XHTML. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml
deleted file mode 100644
index ed68cf2..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="htmlw0010">
-<description>Select the HTML template checkbox to create your HTML file based on a default template. Choose one of the frameset templates if you are developing a Web site with frames. If you do not select a template, your newly created JSP file will be completely blank.
-</description>
-</context>
-
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 6c2c257..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.ui.infopop; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.html.ui.infopop/about.html b/docs/org.eclipse.wst.html.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
deleted file mode 100644
index 71f9701..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               about.html,\
-               EditorHtmlContexts.xml,\
-               META-INF/,\
-               EditorHtmlContexts2.xml,\
-               plugin.properties
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.properties b/docs/org.eclipse.wst.html.ui.infopop/plugin.properties
deleted file mode 100644
index a24444c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.html.ui.infopop
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML editor infopops
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
deleted file mode 100644
index 9b085e7..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorHtmlContexts.xml" plugin ="org.eclipse.wst.html.ui"/>
-       <contexts file="EditorHtmlContexts2.xml" plugin ="org.eclipse.wst.html.core"/>
-         <contexts file="HTMLWizContexts.xml" plugin="org.eclipse.wst.html.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/.cvsignore b/docs/org.eclipse.wst.sse.doc.user/.cvsignore
deleted file mode 100644
index 33a2f88..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.wst.sse.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/.project b/docs/org.eclipse.wst.sse.doc.user/.project
deleted file mode 100644
index e2d6406..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml b/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
deleted file mode 100644
index d8406e0..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
-			<property name="args.input" location="sse_toc.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index e9d0f36..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.doc.user; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.sse.doc.user/about.html b/docs/org.eclipse.wst.sse.doc.user/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.sse.doc.user/build.properties b/docs/org.eclipse.wst.sse.doc.user/build.properties
deleted file mode 100644
index 950d643..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-bin.includes = about.html,\
-               images/,\
-               plugin.xml,\
-               sse_toc.xml,\
-               org.eclipse.wst.sse.doc.userindex.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
-               
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif b/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
deleted file mode 100644
index d82014f..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif b/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
deleted file mode 100644
index 41a141c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif b/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
deleted file mode 100644
index 54a6371..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif b/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
deleted file mode 100644
index 3faa1e2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif b/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs b/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
deleted file mode 100644
index ac3ffd2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/deletable b/docs/org.eclipse.wst.sse.doc.user/index/deletable
deleted file mode 100644
index e423242..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
deleted file mode 100644
index 1207a6c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

-org.eclipse.wst.sse.doc.user=org.eclipse.wst.sse.doc.user\n1.0.300.qualifier

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
deleted file mode 100644
index 2810719..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs b/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
deleted file mode 100644
index ef97094..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,24 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html=0

-/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html=0

-/org.eclipse.wst.sse.doc.user/topics/cvalidate.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html=0

-/org.eclipse.wst.sse.doc.user/topics/cencoding.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html=0

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/segments b/docs/org.eclipse.wst.sse.doc.user/index/segments
deleted file mode 100644
index 19b5d0c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml b/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
deleted file mode 100644
index a994293..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-
-<!-- ===================================================== -->
-<!-- This is the plug-in for declaring the help pages      -->
-<!-- for the structured text editors (source editors).     -->
-<!-- ===================================================== -->
-
-<plugin>
-
-    <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml">
-       <index path="index/"/>
-      </toc>
-   </extension>
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
-</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist
deleted file mode 100644
index b0f4da5..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist
+++ /dev/null
@@ -1,7 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="sse_toc.ditamap"/>

-  </nav>

-  <link>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
deleted file mode 100644
index 10a8886..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_41" href="#IDX1_41">A</a>
-<a name="IDX0_43" href="#IDX1_43">C</a>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_46" href="#IDX1_46">F</a>
-<a name="IDX0_48" href="#IDX1_48">H</a>
-<a name="IDX0_4A" href="#IDX1_4A">J</a>
-<a name="IDX0_4D" href="#IDX1_4D">M</a>
-<a name="IDX0_53" href="#IDX1_53">S</a>
-<a name="IDX0_54" href="#IDX1_54">T</a>
-<a name="IDX0_56" href="#IDX1_56">V</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_41" href="#IDX0_41">A</a></strong>
-<ul class="indexlist">
-<li>annotation preferences
-<ul class="indexlist">
-<li><a href="topics/tsrcedt001.html#tsrcedt001">markup language settings</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
-<ul class="indexlist">
-<li>character encoding
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">location in files</a>
-</li>
-</ul>
-</li>
-<li>content assistance
-<ul class="indexlist">
-<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling for JSP files</a>
-</li>
-<li><a href="topics/csrcedt006.html#csrcedt006">overview</a>
-</li>
-<li><a href="topics/tsrcedt005.html#tsrcedt005">structured text editors</a>
-</li>
-</ul>
-</li>
-<li>content types
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">mapping file extensions</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>drawers
-<ul class="indexlist">
-<li><a href="topics/tsrcedt016.html#tsrcedt016">snippets view</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_46" href="#IDX0_46">F</a></strong>
-<ul class="indexlist">
-<li>file extensions
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">mapping content types</a>
-</li>
-</ul>
-</li>
-<li>file types
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">editors</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_48" href="#IDX0_48">H</a></strong>
-<ul class="indexlist">
-<li>HTML
-<ul class="indexlist">
-<li>templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt024.html#tsrcedt024">adding</a>
-</li>
-<li><a href="topics/tsrcedt024.html#tsrcedt024">removing</a>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
-<ul class="indexlist">
-<li>JSP files
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling content assistance</a>
-</li>
-</ul>
-</li>
-<li>JSP pages
-<ul class="indexlist">
-<li><a href="topics/tsrcedt028.html#tsrcedt028">templates</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4D" href="#IDX0_4D">M</a></strong>
-<ul class="indexlist">
-<li>markup languages
-<ul class="indexlist">
-<li><a href="topics/tsrcedt000.html#tsrcedt000">editing text</a>
-</li>
-<li><a href="topics/tsrcedt001.html#tsrcedt001">setting annotation preferences</a>
-</li>
-<li><a href="topics/tsrcedt027.html#tsrcedt027">templates</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_53" href="#IDX0_53">S</a></strong>
-<ul class="indexlist">
-<li>snippet drawers
-<ul class="indexlist">
-<li><a href="topics/tsrcedt015.html#tsrcedt015">adding items</a>
-</li>
-</ul>
-</li>
-<li>snippet items
-<ul class="indexlist">
-<li><a href="topics/tsrcedt015.html#tsrcedt015">adding to drawers</a>
-</li>
-</ul>
-</li>
-<li>snippets
-<ul class="indexlist">
-<li><a href="topics/tsrcedt014.html#tsrcedt014">drawer customization</a>
-</li>
-<li><a href="topics/tsrcedt022.html#tsrcedt022">editing items</a>
-</li>
-<li><a href="topics/tsrcedt016.html#tsrcedt016">modifying drawers</a>
-</li>
-<li><a href="topics/tsrcedt026.html#tsrcedt026">overview</a>
-</li>
-</ul>
-</li>
-<li>Snippets view
-<ul class="indexlist">
-<li><a href="topics/csrcedt001.html#csrcedt001">overview</a>
-</li>
-</ul>
-</li>
-<li>spell check
-<ul class="indexlist">
-<li><a href="topics/tsrcedt010.html#tsrcedt010">structured text editors</a>
-</li>
-</ul>
-</li>
-<li>structured text editors
-<ul class="indexlist">
-<li>content assistance <a href="topics/tsrcedt005.html#tsrcedt005">(1)</a>, <a href="topics/csrcedt006.html#csrcedt006">(2)</a>
-</li>
-<li><a href="topics/csrcedt004.html#csrcedt004">overview</a>
-</li>
-<li><a href="topics/tsrcedt025.html#tsrcedt025">preference setting</a>
-</li>
-<li><a href="topics/tsrcedt010.html#tsrcedt010">spell check</a>
-</li>
-<li><a href="topics/tsrcedt007.html#tsrcedt007">text search</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_54" href="#IDX0_54">T</a></strong>
-<ul class="indexlist">
-<li>templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt024.html#tsrcedt024">HTML</a>
-</li>
-<li><a href="topics/tsrcedt028.html#tsrcedt028">JSP pages</a>
-</li>
-<li><a href="topics/tsrcedt027.html#tsrcedt027">markup languages</a>
-</li>
-<li><a href="topics/csrcedt004.html#csrcedt004">structured text editors</a>
-</li>
-<li><a href="topics/tsrcedt029.html#tsrcedt027">XML</a>
-</li>
-</ul>
-</li>
-<li>text
-<ul class="indexlist">
-<li><a href="topics/tsrcedt000.html#tsrcedt000">editing in markup languages</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
-<ul class="indexlist">
-<li>validation
-<ul class="indexlist">
-<li><a href="topics/cvalidate.html#csrcedt001">source vs batch</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XHTML
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-</ul>
-</li>
-<li>XML
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-</ul>
-</li>
-<li>xml templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt029.html#tsrcedt027">adding</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
deleted file mode 100644
index 02d9209..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="structured text editors">
-    <entry keyword="overview">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="preference setting">
-      <topic href="topics/tsrcedt025.html#tsrcedt025" title="Setting preferences for structured text editors"/>
-    </entry>
-    <entry keyword="content assistance">
-      <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
-      <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
-    </entry>
-    <entry keyword="text search">
-      <topic href="topics/tsrcedt007.html#tsrcedt007" title="Searching or finding text within a file"/>
-    </entry>
-    <entry keyword="spell check">
-      <topic href="topics/tsrcedt010.html#tsrcedt010" title="Checking spelling"/>
-    </entry>
-  </entry>
-  <entry keyword="templates">
-    <entry keyword="structured text editors">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="markup languages">
-      <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
-    </entry>
-    <entry keyword="HTML">
-      <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-    </entry>
-    <entry keyword="JSP pages">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-    <entry keyword="XML">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="markup languages">
-    <entry keyword="editing text">
-      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-    </entry>
-    <entry keyword="setting annotation preferences">
-      <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
-    </entry>
-    <entry keyword="templates">
-      <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="text">
-    <entry keyword="editing in markup languages">
-      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="validation">
-    <entry keyword="source vs batch">
-      <topic href="topics/cvalidate.html#csrcedt001" title="Source and batch validation"/>
-    </entry>
-  </entry>
-  <entry keyword="annotation preferences">
-    <entry keyword="markup language settings">
-      <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
-    </entry>
-  </entry>
-  <entry keyword="content assistance">
-    <entry keyword="structured text editors">
-      <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
-    </entry>
-    <entry keyword="enabling for JSP files">
-      <topic href="topics/tsrcedt023.html#tsrcedt023" title="Enabling content assist for JSP files"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP files">
-    <entry keyword="enabling content assistance">
-      <topic href="topics/tsrcedt023.html#tsrcedt023" title="Enabling content assist for JSP files"/>
-    </entry>
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="content types">
-    <entry keyword="mapping file extensions">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="file extensions">
-    <entry keyword="mapping content types">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="file types">
-    <entry keyword="editors">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="character encoding">
-    <entry keyword="location in files">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="XHTML">
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="XML">
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="spell check">
-    <entry keyword="structured text editors">
-      <topic href="topics/tsrcedt010.html#tsrcedt010" title="Checking spelling"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML">
-    <entry keyword="templates">
-      <entry keyword="removing">
-        <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-      </entry>
-      <entry keyword="adding">
-        <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="JSP pages">
-    <entry keyword="templates">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-  </entry>
-  <entry keyword="xml templates">
-    <entry keyword="adding">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="snippets">
-    <entry keyword="overview">
-      <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-    </entry>
-    <entry keyword="drawer customization">
-      <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-    </entry>
-    <entry keyword="editing items">
-      <topic href="topics/tsrcedt022.html#tsrcedt022" title="Editing snippet items"/>
-    </entry>
-    <entry keyword="modifying drawers">
-      <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
-    </entry>
-  </entry>
-  <entry keyword="Snippets view">
-    <entry keyword="overview">
-      <topic href="topics/csrcedt001.html#csrcedt001" title="Snippets view"/>
-    </entry>
-  </entry>
-  <entry keyword="snippet drawers">
-    <entry keyword="adding items">
-      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
-    </entry>
-  </entry>
-  <entry keyword="snippet items">
-    <entry keyword="adding to drawers">
-      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
-    </entry>
-  </entry>
-  <entry keyword="drawers">
-    <entry keyword="snippets view">
-      <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.properties b/docs/org.eclipse.wst.sse.doc.user/plugin.properties
deleted file mode 100644
index d97c2f1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.sse.doc.user
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured text editor and snippets documentation
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.xml b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
deleted file mode 100644
index ebbb6bd..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-
-<!-- ===================================================== -->
-<!-- This is the plug-in for declaring the help pages      -->
-<!-- for the structured text editors (source editors).     -->
-<!-- ===================================================== -->
-
-<plugin>
-
-    <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml"/>
-       <index path="index/"/>
-       </extension>
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
-</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap b/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap
deleted file mode 100644
index 90bc751..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map id="wstssetoc" linking="none" title="Editing text coded in markup languages - overview">

-<topicref href="topics/csrcedt004.dita" navtitle="Structured text editors">

-<topicref href="topics/tsrcedt000.dita" locktitle="yes" navtitle="Editing text coded in markup languages "

-type="task">

-<topicref href="topics/cvalidate.dita" navtitle="Source and batch validation"

-type="concept"></topicref>

-<topicref href="topics/tsrcedt025.dita" navtitle="Setting preferences for structured text editors"

-type="task">

-<topicref href="topics/tsrcedt001.dita" navtitle="Setting annotation preferences for markup languages"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tsrcedt005.dita" navtitle="Getting content assistance in structured text editors"

-type="task">

-<topicref href="topics/csrcedt006.dita" navtitle="Content assist" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt023.dita" navtitle="Making content assist work for JSP files"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tcontenttype.dita" navtitle="Associating editors with file types"

-type="task"></topicref>

-<topicref href="topics/cencoding.dita" navtitle="File Encoding" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt007.dita" navtitle="Searching or finding text within a file"

-type="task"></topicref>

-<topicref href="topics/tsrcedt010.dita" navtitle="Checking spelling" type="task">

-</topicref>

-<topicref href="topics/tsrcedt027.dita" navtitle="Adding and removing markup language templates - overview"

-type="task">

-<topicref href="topics/tsrcedt024.dita" navtitle="Adding and removing HTML templates"

-type="task"></topicref>

-<topicref href="topics/tsrcedt028.dita" navtitle="Adding and removing JSP templates"

-type="task"></topicref>

-<topicref href="topics/tsrcedt029.dita" navtitle="Adding and removing XML templates"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tsrcedt026.dita" navtitle="Editing with snippets - overview"

-type="task">

-<topicref href="topics/csrcedt001.dita" navtitle="Snippets view" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt014.dita" navtitle="Adding snippets drawers"

-type="task"></topicref>

-<topicref href="topics/tsrcedt015.dita" navtitle="Adding items to snippets drawers"

-type="task"></topicref>

-<topicref href="topics/tsrcedt022.dita" navtitle="Editing snippet items" type="task">

-</topicref>

-<topicref href="topics/tsrcedt016.dita" navtitle="Deleting or hiding snippet items or drawers"

-type="task"></topicref>

-</topicref>

-</topicref>

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
deleted file mode 100644
index 36f3b7f..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<toc label="Structured text editors" topics="topics/csrcedt004.html">
-   <topic label="Structured text editors" href="topics/csrcedt004.html">
-      <topic label="Editing text coded in markup languages " href="topics/tsrcedt000.html">
-         <topic label="Source and batch validation" href="topics/cvalidate.html"/>
-         <topic label="Setting preferences for structured text editors" href="topics/tsrcedt025.html">
-            <topic label="Setting annotation preferences for markup languages" href="topics/tsrcedt001.html"/>
-         </topic>
-         <topic label="Getting content assistance in structured text editors" href="topics/tsrcedt005.html">
-            <topic label="Content assist" href="topics/csrcedt006.html"/>
-            <topic label="Making content assist work for JSP files" href="topics/tsrcedt023.html"/>
-         </topic>
-         <topic label="Associating editors with file types" href="topics/tcontenttype.html"/>
-         <topic label="File Encoding" href="topics/cencoding.html"/>
-         <topic label="Searching or finding text within a file" href="topics/tsrcedt007.html"/>
-         <topic label="Checking spelling" href="topics/tsrcedt010.html"/>
-         <topic label="Adding and removing markup language templates - overview" href="topics/tsrcedt027.html">
-            <topic label="Adding and removing HTML templates" href="topics/tsrcedt024.html"/>
-            <topic label="Adding and removing JSP templates" href="topics/tsrcedt028.html"/>
-            <topic label="Adding and removing XML templates" href="topics/tsrcedt029.html"/>
-         </topic>
-         <topic label="Editing with snippets - overview" href="topics/tsrcedt026.html">
-            <topic label="Snippets view" href="topics/csrcedt001.html"/>
-            <topic label="Adding snippets drawers" href="topics/tsrcedt014.html"/>
-            <topic label="Adding items to snippets drawers" href="topics/tsrcedt015.html"/>
-            <topic label="Editing snippet items" href="topics/tsrcedt022.html"/>
-            <topic label="Deleting or hiding snippet items or drawers" href="topics/tsrcedt016.html"/>
-         </topic>
-      </topic>
-   </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
deleted file mode 100644
index c7a7322..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="cencoding" xml:lang="en-us">

-<title>File Encoding</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>character encoding<indexterm>location in files</indexterm></indexterm>

-<indexterm>JSP files<indexterm>character encoding</indexterm></indexterm>

-<indexterm>XHTML<indexterm>character encoding</indexterm></indexterm>

-<indexterm>XML<indexterm>character encoding</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> The character encoding in XML, (X)HTML files, and JSP files can be specified

-and invoked in many different ways; however, we recommend that you specify

-the encoding in each one of your source files, for that is where many XML,

-HTML, JSP editors expect to find the encoding.</p>

-<p>For example, for JSP files, you might use the pageEncoding attribute and/or

-the contentType attribute in the page directive, as shown in the following

-example:<codeblock>&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"

-    pageEncoding="ISO-8859-1"%&gt;

-</codeblock></p>

-<p>For XML files, you might use the encoding pseudo-attribute in the xml declaration

-at the start of a document or the text declaration at the start of an entity,

-as in the following example: <codeblock>&lt;?xml version="1.0" encoding="iso-8859-1" ?></codeblock></p>

-<p>For (X)HTML files, you might use the &lt;meta&gt; tag inside the &lt;head&gt;

-tags, as shown in the following example:<codeblock>&lt;meta http-equiv="Content-Type" content="text/html;charset=utf-8" /></codeblock></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
deleted file mode 100644
index a63fabd..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>File Encoding</title>
-</head>
-<body id="cencoding"><a name="cencoding"><!-- --></a>
-<h1 class="topictitle1">File Encoding</h1>
-<div><p></p>
-<p> The character encoding in XML, (X)HTML files, and JSP files can be specified
-and invoked in many different ways; however, we recommend that you specify
-the encoding in each one of your source files, for that is where many XML,
-HTML, JSP editors expect to find the encoding.</p>
-<div class="p">For example, for JSP files, you might use the pageEncoding attribute and/or
-the contentType attribute in the page directive, as shown in the following
-example:<pre>&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;</pre>
-</div>
-<div class="p">For XML files, you might use the encoding pseudo-attribute in the xml declaration
-at the start of a document or the text declaration at the start of an entity,
-as in the following example: <pre>&lt;?xml version="1.0" encoding="iso-8859-1" ?&gt;</pre>
-</div>
-<div class="p">For (X)HTML files, you might use the &lt;meta&gt; tag inside the &lt;head&gt;
-tags, as shown in the following example:<pre>&lt;meta http-equiv="Content-Type" content="text/html;charset=utf-8" /&gt;</pre>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita
deleted file mode 100644
index 7f85c95..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt001" xml:lang="en-us">

-<title>Snippets view</title>

-<shortdesc>The Snippets view lets you catalog and organize reusable programming

-objects, such as HTML tagging, <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, and JSP code, along with

-files and custom JSP tags.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Snippets view<indexterm>overview</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> The Snippets view can be extended based on additional objects that you

-define and include. To view or collapse the objects in a specific drawer,

-click the drawer name.</p>

-<p>The Snippets view has the following features: <ul>

-<li>Drag-and-drop to various source editing pages: You can drag items from

-the view into the active editor and the text will be dropped into the document

-at the cursor location </li>

-<li>Double-click support: You can double-click on an item and have it inserted

-at the current cursor position in the active editor </li>

-<li>User-defined drawers and items: You can define, edit, and remove items

-from view drawers as desired.</li>

-<li>Plug-in-defined drawers and items: Plug-in developers can contribute a

-default list of items to their own drawers.</li>

-<li>Variables in insertions: By default, items will be edited using a dialog

-and, when inserted, you will be prompted for values for each of the variables.</li>

-<li>Customization: You can select which drawers and items are shown in the

-Snippets view.</li>

-<li>Custom insertion: Plug-in developers can customize the behavior of items

-so that when they are dropped during a drag-and-drop action, both the text

-that is inserted and the insertion location are strictly defined.</li>

-</ul></p>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-<link href="tsrcedt000.dita"></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
deleted file mode 100644
index a37e9de..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Snippets view" />
-<meta name="abstract" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags." />
-<meta name="description" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags." />
-<meta content="Snippets view, overview" name="DC.subject" />
-<meta content="Snippets view, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt001" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Snippets view</title>
-</head>
-<body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
-
-
-<h1 class="topictitle1">Snippets view</h1>
-
-
-
-<div><p>The Snippets view lets you catalog and organize reusable programming
-objects, such as HTML tagging, JavaScript™, and JSP code, along with
-files and custom JSP tags.</p>
-
-<p> The Snippets view can be extended based on additional objects that you
-define and include. To view or collapse the objects in a specific drawer,
-click the drawer name.</p>
-
-<div class="p">The Snippets view has the following features: <ul>
-<li>Drag-and-drop to various source editing pages: You can drag items from
-the view into the active editor and the text will be dropped into the document
-at the cursor location </li>
-
-<li>Double-click support: You can double-click on an item and have it inserted
-at the current cursor position in the active editor </li>
-
-<li>User-defined drawers and items: You can define, edit, and remove items
-from view drawers as desired.</li>
-
-<li>Plug-in-defined drawers and items: Plug-in developers can contribute a
-default list of items to their own drawers.</li>
-
-<li>Variables in insertions: By default, items will be edited using a dialog
-and, when inserted, you will be prompted for values for each of the variables.</li>
-
-<li>Customization: You can select which drawers and items are shown in the
-Snippets view.</li>
-
-<li>Custom insertion: Plug-in developers can customize the behavior of items
-so that when they are dropped during a drag-and-drop action, both the text
-that is inserted and the insertion location are strictly defined.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
deleted file mode 100644
index de02cbe..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt004" xml:lang="en-us">

-<title>Structured text editors for markup languages</title>

-<titlealts>

-<navtitle>Structured text editors</navtitle>

-</titlealts>

-<shortdesc><q>Structured text editor</q> is any of several text editors that

-you can use to edit various markup languages such as HTML, JavaScript, or

-XML.</shortdesc>

-<prolog><metadata>

-<keywords><keyword>source editors</keyword></keywords>

-</metadata></prolog>

-<conbody>

-<p><indexterm>structured text editors<indexterm>overview</indexterm></indexterm>

-<indexterm>templates<indexterm>structured text editors</indexterm></indexterm>

-

-The structured text editor is represented by various editors that you can

-use to edit files coded with markup tags:</p>

-<table>

-<tgroup cols="3"><colspec colname="col1" colwidth="89*"/><colspec colname="col2"

-colwidth="134*"/><colspec colname="COLSPEC0" colwidth="69*"/>

-<thead>

-<row>

-<entry colname="col1" valign="top">File type</entry>

-<entry colname="col2" valign="top">Editor</entry>

-<entry colname="COLSPEC0" valign="top">Content assist?</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">Cascading style sheet</entry>

-<entry colname="col2">CSS source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">Document type definitions</entry>

-<entry colname="col2">DTD source page editor</entry>

-<entry colname="COLSPEC0">No</entry>

-</row>

-<row>

-<entry colname="col1">HTML</entry>

-<entry colname="col2">HTML source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm></entry>

-<entry colname="col2"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> source page editor or source

-tab of JavaScript editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">JSP</entry>

-<entry colname="col2">JSP source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">XML</entry>

-<entry colname="col2">Source tab of XML editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">XSD (schema)</entry>

-<entry colname="col2">Source tab of XML schema editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-<p>You can access the structured text editor by right-clicking on a relevant

-file name in Navigator or Package Explorer view and then clicking <uicontrol>Open

-With</uicontrol> and selecting the editor mentioned above.</p>

-<p>The structured text editor provides a consistent interface regardless of

-the markup language with which it is associated. It provides capabilities

-such as find and replace, undo, redo, a spelling checker, and coding assistance

-(unless otherwise noted). It also highlights syntax in different colors. Following

-is a brief description of some of the structured text editor's capabilities:</p>

-<dl><dlentry>

-<dt>syntax highlighting</dt>

-<dd>Each keyword type and syntax type is highlighted differently, enabling

-you to easily find a certain kind of keyword for editing. For example, in

-HTML, element names, attribute names, attribute values, and comments have

-different colors; in <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, function and variable

-names, quoted text strings, and comments have different colors.</dd>

-</dlentry><dlentry>

-<dt>unlimited undo and redo</dt>

-<dd>These options allow you to incrementally undo and redo every change made

-to a file for the entire editing session. For text, changes are incremented

-one character or set of selected characters at a time.</dd>

-</dlentry><dlentry>

-<dt>content assist</dt>

-<dd>Content assist helps you to insert <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> functions, HTML tags, or

-other keywords. Choices available in the content assist list are based on

-functions defined by the syntax of the language in which the file is coded.</dd>

-</dlentry><dlentry>

-<dt>user-defined templates and snippets</dt>

-<dd>By using the Snippets view, you can access user-defined code snippets

-and (for all code types except <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>) templates to help you

-quickly add regularly used text strings.</dd>

-</dlentry><dlentry>

-<dt>function selection</dt>

-<dd>Based on the location of your cursor, the function or tag selection indicator

-highlights the line numbers that include a function or tag in the vertical

-ruler on the left area of the Source page.</dd>

-</dlentry><dlentry>

-<dt>pop-up menu options</dt>

-<dd>These are the same editing options available in the workbench <uicontrol>Edit</uicontrol> menu.</dd>

-</dlentry></dl>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
deleted file mode 100644
index ec3d55e..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Structured text editors for markup languages" />
-<meta name="abstract" content="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML." />
-<meta name="description" content="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML." />
-<meta content="source editors" name="DC.subject" />
-<meta content="source editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt004" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Structured text editors for markup languages</title>
-</head>
-<body id="csrcedt004"><a name="csrcedt004"><!-- --></a>
-
-
-<h1 class="topictitle1">Structured text editors for markup languages</h1>
-
-
-
-
-<div><p><span class="q">"Structured text editor"</span> is any of several text editors that
-you can use to edit various markup languages such as HTML, JavaScript, or
-XML.</p>
-
-<p>
-
-The structured text editor is represented by various editors that you can
-use to edit files coded with markup tags:</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" width="30.47945205479452%" id="N1008A">File type</th>
-
-<th valign="top" width="45.89041095890411%" id="N10092">Editor</th>
-
-<th valign="top" width="23.63013698630137%" id="N1009A">Content assist?</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">Cascading style sheet</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">CSS source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">Document type definitions</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">DTD source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">No</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">HTML</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">HTML source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">JavaScript™</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">JavaScript source page editor or source
-tab of JavaScript editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">JSP</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">JSP source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">XML</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">Source tab of XML editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">XSD (schema)</td>
-
-<td valign="top" width="45.89041095890411%" headers="N10092 ">Source tab of XML schema editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<p>You can access the structured text editor by right-clicking on a relevant
-file name in Navigator or Package Explorer view and then clicking <span class="uicontrol">Open
-With</span> and selecting the editor mentioned above.</p>
-
-<p>The structured text editor provides a consistent interface regardless of
-the markup language with which it is associated. It provides capabilities
-such as find and replace, undo, redo, a spelling checker, and coding assistance
-(unless otherwise noted). It also highlights syntax in different colors. Following
-is a brief description of some of the structured text editor's capabilities:</p>
-
-<dl>
-<dt class="dlterm">syntax highlighting</dt>
-
-<dd>Each keyword type and syntax type is highlighted differently, enabling
-you to easily find a certain kind of keyword for editing. For example, in
-HTML, element names, attribute names, attribute values, and comments have
-different colors; in JavaScript, function and variable
-names, quoted text strings, and comments have different colors.</dd>
-
-
-<dt class="dlterm">unlimited undo and redo</dt>
-
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-
-
-<dt class="dlterm">content assist</dt>
-
-<dd>Content assist helps you to insert JavaScript functions, HTML tags, or
-other keywords. Choices available in the content assist list are based on
-functions defined by the syntax of the language in which the file is coded.</dd>
-
-
-<dt class="dlterm">user-defined templates and snippets</dt>
-
-<dd>By using the Snippets view, you can access user-defined code snippets
-and (for all code types except JavaScript) templates to help you
-quickly add regularly used text strings.</dd>
-
-
-<dt class="dlterm">function selection</dt>
-
-<dd>Based on the location of your cursor, the function or tag selection indicator
-highlights the line numbers that include a function or tag in the vertical
-ruler on the left area of the Source page.</dd>
-
-
-<dt class="dlterm">pop-up menu options</dt>
-
-<dd>These are the same editing options available in the workbench <span class="uicontrol">Edit</span> menu.</dd>
-
-</dl>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
deleted file mode 100644
index fc9cdf6..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt006" xml:lang="en-us">

-<title>Content assist</title>

-<shortdesc>Content assist helps you insert or finish a tag or function or

-finish a line of code in a structured text editor. The placement of the cursor

-in the source file provides the context for the content assist to offer suggestions

-for completion.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content assistance<indexterm>overview</indexterm></indexterm>

-<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Most of the structured text editors have content assist. For a list of

-editors that have content assist, see <xref href="csrcedt004.dita" type="concept">Structured

-text editors for markup languages</xref>. For information on how to get content

-assistance, see <xref href="tsrcedt005.dita" type="task">Getting content assistance

-in structured text editors</xref></p>

-<p>The sections below describe specifics of HTML content assist, <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> content

-assist, and JSP content assist.</p>

-<section><title>HTML content assist</title><p>HTML is flexible in that some

-HTML elements allow end tags to be optionally omitted, such as <codeph>P</codeph>, <codeph>DT</codeph>, <codeph>DD</codeph>, <codeph>LI</codeph>, <codeph

->THEAD</codeph>, <codeph>TR</codeph>, <codeph>TD</codeph>, <codeph>TH</codeph>,

-and so on. Other HTML elements that are defined to have no content may require

-the end tag always be omitted, such as <codeph>BR</codeph>, <codeph>HR</codeph>, <codeph>LINK</codeph>, <codeph>META</codeph>,

-and <codeph>IMG</codeph>. This flexibility makes the content assist function

-within the HTML source page editor less precise than it might be with a more

-rigidly constrained markup language.</p><p>HTML content assist is most beneficial

-when you need to complete a tag name, add an attribute name-value pair within

-a start tag, or select from an enumerated list of attribute values.</p><p>Although

-content assist only shows attribute names that have not already been specified

-in a start tag, it does not take into account grammar constraints for tags.

-For example, the <codeph>HEAD</codeph> element in HTML only permits zero or

-one occurrences of a <codeph>TITLE</codeph> tag in its content. If you prompt

-for content assist within a <codeph>HEAD</codeph> content that already contains

-a <codeph>TITLE</codeph> tag, content assist will still show <codeph>TITLE</codeph> in

-its proposal list.</p><p>However, if an attribute is required according to

-the DTD/Schema, that attribute will show up at the top of the list, with a

-yellow circle indicator on its icon.</p><p>If your cursor is in a position

-where content assist is available, a pop-up list of available choices is displayed.

-The list is based on the context. For example, if you use content assist directly

-after an opening paragraph tag (<codeph>&lt;p></codeph>) , the first item

-in the content assist list will be the corresponding closing paragraph (<codeph>&lt;/p></codeph>)

-tag.</p><p>The content assist list displays all available tags for the current

-cursor position, including templates. The picture below shows the default

-content assist list for a paragraph tag example:<image alt="HTML Content assist"

-href="../images/ncontass.gif" placement="break"></image></p><p>Tag proposals

-are listed alphabetically. If you type a <codeph>&lt;</codeph> (to begin a

-new tag) before prompting for content assist, and begin typing the first one

-or two letters of the tag that you want to add, the proposal list automatically

-refreshes to reflect proposals that match the pattern you have typed. If you

-do not type a <codeph>&lt;</codeph> before prompting for content assist, you

-can click within the proposal list and then type the letter that the tag begins

-with, to reduce (somewhat) the amount of scrolling to locate the desired tag.</p><p>As

-you type the first one or two letters of the attribute names or enumerated

-attribute values that you want to add to a tag, the list automatically refreshes

-to reflect proposals that match the pattern you have typed.</p><note type="restriction"><image

-alt="For Linux." href="../images/nlinux.gif"></image> When using Linux (Motif

-or GTK) and a DBCS locale, double-clicking on the content assist list can

-sometimes cause the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> VM to terminate. Instead of double-clicking

-on the list, use the arrows and Enter keys to make the selection from the

-list.</note></section>

-<section><title><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="JavaScript">JavaScript</tm> content assist</title><p>Items in the <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> content

-assist list are preceded by an Internet Explorer icon, a Netscape icon, or

-both, to indicate whether specific <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> objects, methods, or functions

-are supported by one or both browsers. If the Internet Explorer icon is present,

-it indicates that the object, method, or function is supported by Internet

-Explorer Version 5.0 or higher.  If the Netscape icon is present, it indicates

-that the object, method, or function is supported by Netscape Navigator Version

-4.7 or higher. A question mark icon (<image alt="Question mark icon" href="../images/nquest.gif"

-placement="inline"></image>) in place of one of the browser icons indicates

-that it is unknown whether the browser supports the object, method, or function.</p><p>The

-picture below shows the default content assist list within a <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> file:<image

-alt="JavaScript content assist" href="../images/njscdast.gif" placement="break">

-</image></p><p>Code proposals are listed alphabetically. If you type a <codeph>. </codeph> (include

-the space) before prompting for content assist, and begin typing the first

-one or two letters of the code that you want to add, the proposal list automatically

-refreshes to reflect proposals that match the pattern you have typed, to reduce

-(somewhat) the amount of scrolling to locate the desired code.</p></section>

-<section><title>JSP content assist</title><p>You have many options for embedding <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> and

-HTML code in your JSP pages by using content assist.</p><p>All of the JSP

-tags are included both in the template list and in XML format (for example, <codeph>&lt;jsp:expression></codeph>).

-To add JSP scriptlet tags, for example, move the cursor to the appropriate

-position in the file and press Ctrl+Space to use content assist. Select <image

-alt="JSP scriptlet content assist" href="../images/nmacscrp.gif" placement="inline">

-</image> from the proposal list to insert <codeph>&lt;% %></codeph>  in the

-document.</p><p>Scriptlets are inserted in a tag <codeph>&lt;% %></codeph>.

-For example: <codeblock>&lt;% System.currentTimeMillis() %></codeblock></p><p>This

-example will evaluate the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> statement to get the current time in

-milliseconds.</p><p>To have the result of the statement inserted in the file,

-put an equals sign (=) in the front of the statement. For example: <codeblock>&lt;b>This is the time : &lt;%= System.currentTimeMillis()%>&lt;/b></codeblock

-></p><p>When you are within a scriptlet you are writing pure <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code.

-Therefore, content assist works exactly the same as it does for the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor.

-For example, if you request content assist after <codeph>System</codeph>,

-content assist displays a list of methods. <note><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> content assist works only in a Web

-project, because it requires a buildpath to find the appropriate <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes.</note></p><p>There

-are also special tags such as useBean. For example: <codeblock>&lt;jsp:useBean id="useBean" class="java.lang.String"/></codeblock></p><p>The

-useBean tag enables you to create a bean called <codeph>aString</codeph> of

-type <codeph>String</codeph>. Then when you use content assist, this is recognized

-as a declared variable. For example, if you use content assist after <codeph>aString</codeph>,

-as follows:</p><p> <codeblock>&lt;% aString. %> </codeblock>the content assist

-list shows available methods. This is because <codeph>aString</codeph> has

-been declared as a bean of type String.</p><p>If you use content assist after

-the <codeph>a</codeph>, as follows: <codeblock>&lt;% a %> </codeblock>content

-assist knows that <codeph>aString</codeph> exists, and it is shown in the

-content assist list.</p></section>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt005.dita"><linktext>Getting content assistance in structured

-text editors</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
deleted file mode 100644
index a17e788..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Content assist" />
-<meta name="abstract" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
-<meta name="description" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
-<meta content="content assist, overview, structured text editors" name="DC.subject" />
-<meta content="content assist, overview, structured text editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt006" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Content assist</title>
-</head>
-<body id="csrcedt006"><a name="csrcedt006"><!-- --></a>
-
-
-<h1 class="topictitle1">Content assist</h1>
-
-
-
-<div><p>Content assist helps you insert or finish a tag or function or
-finish a line of code in a structured text editor. The placement of the cursor
-in the source file provides the context for the content assist to offer suggestions
-for completion.</p>
-
-<p>Most of the structured text editors have content assist. For a list of
-editors that have content assist, see <a href="csrcedt004.html">Structured text editors for markup languages</a>. For information on how to get content
-assistance, see <a href="tsrcedt005.html">Getting content assistance in structured text editors</a></p>
-
-<p>The sections below describe specifics of HTML content assist, JavaScript™ content
-assist, and JSP content assist.</p>
-
-<div class="section"><h4 class="sectiontitle">HTML content assist</h4><p>HTML is flexible in that some
-HTML elements allow end tags to be optionally omitted, such as <samp class="codeph">P</samp>, <samp class="codeph">DT</samp>, <samp class="codeph">DD</samp>, <samp class="codeph">LI</samp>, <samp class="codeph">THEAD</samp>, <samp class="codeph">TR</samp>, <samp class="codeph">TD</samp>, <samp class="codeph">TH</samp>,
-and so on. Other HTML elements that are defined to have no content may require
-the end tag always be omitted, such as <samp class="codeph">BR</samp>, <samp class="codeph">HR</samp>, <samp class="codeph">LINK</samp>, <samp class="codeph">META</samp>,
-and <samp class="codeph">IMG</samp>. This flexibility makes the content assist function
-within the HTML source page editor less precise than it might be with a more
-rigidly constrained markup language.</p>
-<p>HTML content assist is most beneficial
-when you need to complete a tag name, add an attribute name-value pair within
-a start tag, or select from an enumerated list of attribute values.</p>
-<p>Although
-content assist only shows attribute names that have not already been specified
-in a start tag, it does not take into account grammar constraints for tags.
-For example, the <samp class="codeph">HEAD</samp> element in HTML only permits zero or
-one occurrences of a <samp class="codeph">TITLE</samp> tag in its content. If you prompt
-for content assist within a <samp class="codeph">HEAD</samp> content that already contains
-a <samp class="codeph">TITLE</samp> tag, content assist will still show <samp class="codeph">TITLE</samp> in
-its proposal list.</p>
-<p>However, if an attribute is required according to
-the DTD/Schema, that attribute will show up at the top of the list, with a
-yellow circle indicator on its icon.</p>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of available choices is displayed.
-The list is based on the context. For example, if you use content assist directly
-after an opening paragraph tag (<samp class="codeph">&lt;p&gt;</samp>) , the first item
-in the content assist list will be the corresponding closing paragraph (<samp class="codeph">&lt;/p&gt;</samp>)
-tag.</p>
-<p>The content assist list displays all available tags for the current
-cursor position, including templates. The picture below shows the default
-content assist list for a paragraph tag example:<br /><img src="../images/ncontass.gif" alt="HTML Content assist" /><br /></p>
-<p>Tag proposals
-are listed alphabetically. If you type a <samp class="codeph">&lt;</samp> (to begin a
-new tag) before prompting for content assist, and begin typing the first one
-or two letters of the tag that you want to add, the proposal list automatically
-refreshes to reflect proposals that match the pattern you have typed. If you
-do not type a <samp class="codeph">&lt;</samp> before prompting for content assist, you
-can click within the proposal list and then type the letter that the tag begins
-with, to reduce (somewhat) the amount of scrolling to locate the desired tag.</p>
-<p>As
-you type the first one or two letters of the attribute names or enumerated
-attribute values that you want to add to a tag, the list automatically refreshes
-to reflect proposals that match the pattern you have typed.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction:</span> <img src="../images/nlinux.gif" alt="For Linux." /> When using Linux (Motif
-or GTK) and a DBCS locale, double-clicking on the content assist list can
-sometimes cause the Java™ VM to terminate. Instead of double-clicking
-on the list, use the arrows and Enter keys to make the selection from the
-list.</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">JavaScript content assist</h4><p>Items in the JavaScript content
-assist list are preceded by an Internet Explorer icon, a Netscape icon, or
-both, to indicate whether specific JavaScript objects, methods, or functions
-are supported by one or both browsers. If the Internet Explorer icon is present,
-it indicates that the object, method, or function is supported by Internet
-Explorer Version 5.0 or higher.  If the Netscape icon is present, it indicates
-that the object, method, or function is supported by Netscape Navigator Version
-4.7 or higher. A question mark icon (<img src="../images/nquest.gif" alt="Question mark icon" />) in place of one of the browser icons indicates
-that it is unknown whether the browser supports the object, method, or function.</p>
-<p>The
-picture below shows the default content assist list within a JavaScript file:<br /><img src="../images/njscdast.gif" alt="JavaScript content assist" /><br /></p>
-<p>Code proposals are listed alphabetically. If you type a <samp class="codeph">. </samp> (include
-the space) before prompting for content assist, and begin typing the first
-one or two letters of the code that you want to add, the proposal list automatically
-refreshes to reflect proposals that match the pattern you have typed, to reduce
-(somewhat) the amount of scrolling to locate the desired code.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">JSP content assist</h4><p>You have many options for embedding Java and
-HTML code in your JSP pages by using content assist.</p>
-<p>All of the JSP
-tags are included both in the template list and in XML format (for example, <samp class="codeph">&lt;jsp:expression&gt;</samp>).
-To add JSP scriptlet tags, for example, move the cursor to the appropriate
-position in the file and press Ctrl+Space to use content assist. Select <img src="../images/nmacscrp.gif" alt="JSP scriptlet content assist" /> from the proposal list to insert <samp class="codeph">&lt;% %&gt;</samp>  in the
-document.</p>
-<div class="p">Scriptlets are inserted in a tag <samp class="codeph">&lt;% %&gt;</samp>.
-For example: <pre>&lt;% System.currentTimeMillis() %&gt;</pre>
-</div>
-<p>This
-example will evaluate the Java statement to get the current time in
-milliseconds.</p>
-<div class="p">To have the result of the statement inserted in the file,
-put an equals sign (=) in the front of the statement. For example: <pre>&lt;b&gt;This is the time : &lt;%= System.currentTimeMillis()%&gt;&lt;/b&gt;</pre>
-</div>
-<div class="p">When you are within a scriptlet you are writing pure Java code.
-Therefore, content assist works exactly the same as it does for the Java editor.
-For example, if you request content assist after <samp class="codeph">System</samp>,
-content assist displays a list of methods. <div class="note"><span class="notetitle">Note:</span> Java content assist works only in a Web
-project, because it requires a buildpath to find the appropriate Java classes.</div>
-</div>
-<div class="p">There
-are also special tags such as useBean. For example: <pre>&lt;jsp:useBean id="useBean" class="java.lang.String"/&gt;</pre>
-</div>
-<p>The
-useBean tag enables you to create a bean called <samp class="codeph">aString</samp> of
-type <samp class="codeph">String</samp>. Then when you use content assist, this is recognized
-as a declared variable. For example, if you use content assist after <samp class="codeph">aString</samp>,
-as follows:</p>
-<div class="p"> <pre>&lt;% aString. %&gt; </pre>
-the content assist
-list shows available methods. This is because <samp class="codeph">aString</samp> has
-been declared as a bean of type String.</div>
-<div class="p">If you use content assist after
-the <samp class="codeph">a</samp>, as follows: <pre>&lt;% a %&gt; </pre>
-content
-assist knows that <samp class="codeph">aString</samp> exists, and it is shown in the
-content assist list.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
deleted file mode 100644
index 7f9287b..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt001" xml:lang="en-us">

-<title>Source and batch validation</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>validation<indexterm>source vs batch</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two types of validation that can occur when you are working with

-source files in a structured source editor: source validation and batch validation. </p>

-<p>Source validation occurs as you type your code; this validation reflects

-the "unsaved" and "unbuilt" contents of the source you are editing. For example,

-if you were to type the following code in a JSP editor:<lines><codeph>&lt;foo:bar></codeph></lines>where <codeph>foo:bar</codeph>is

-a tag that does not exist, the problem would be discovered immediately and

-would appear underlined in the editor. The advantage of this type of validation

-is that it can alert you to errors instantly.<note>To turn source validation

-on (or off) for all structured text editors, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol><uicontrol>General</uicontrol><uicontrol>Editors</uicontrol>

-<uicontrol>Structured Text Editors</uicontrol></menucascade> and check (or

-uncheck) <b>Report problems as you type</b>.</note></p>

-<p>Batch validation occurs on saved files. It can catch build process errors

-and other errors that the source validator cannot. For example, suppose you

-typed the following in a JSP editor:<lines>

-<codeph>&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>

-&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%></codeph></lines>In

-this example, the same prefix is used twice. This would prompt the batch validator

-to trigger markers and to generate build warnings in the Problems view and

-in the Navigator. </p>

-<p>Batch validation can uncover errors in multiple files at once and give

-you a comprehensive view of where problematic code can be found in your project.

-Moreover, you do not need to open files in an editor to run batch validation.

-To run batch validation on specific files, select and right click the files

-in the Project Explorer and then select <menucascade><uicontrol>Run Validation</uicontrol>

-</menucascade> from the popup menu.</p>

-<note>To set preferences for batch validation, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol><uicontrol>Validation</uicontrol></menucascade></note>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
deleted file mode 100644
index 05fe0f2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Source and batch validation</title>
-</head>
-<body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
-<h1 class="topictitle1">Source and batch validation</h1>
-<div><p></p>
-<p>There are two types of validation that can occur when you are working with
-source files in a structured source editor: source validation and batch validation. </p>
-<div class="p">Source validation occurs as you type your code; this validation reflects
-the "unsaved" and "unbuilt" contents of the source you are editing. For example,
-if you were to type the following code in a JSP editor:<p><samp class="codeph">&lt;foo:bar&gt;</samp></p>
-where <samp class="codeph">foo:bar</samp>is
-a tag that does not exist, the problem would be discovered immediately and
-would appear underlined in the editor. The advantage of this type of validation
-is that it can alert you to errors instantly.<div class="note"><span class="notetitle">Note:</span> To turn source validation
-on (or off) for all structured text editors, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editors</span></span> and check (or
-uncheck) <strong>Report problems as you type</strong>.</div>
-</div>
-<div class="p">Batch validation occurs on saved files. It can catch build process errors
-and other errors that the source validator cannot. For example, suppose you
-typed the following in a JSP editor:<p><samp class="codeph">&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;<br />
-&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;</samp></p>
-In
-this example, the same prefix is used twice. This would prompt the batch validator
-to trigger markers and to generate build warnings in the Problems view and
-in the Navigator. </div>
-<p>Batch validation can uncover errors in multiple files at once and give
-you a comprehensive view of where problematic code can be found in your project.
-Moreover, you do not need to open files in an editor to run batch validation.
-To run batch validation on specific files, select and right click the files
-in the Project Explorer and then select <span class="menucascade"><span class="uicontrol">Run Validation</span></span> from the popup menu.</p>
-<div class="note"><span class="notetitle">Note:</span> To set preferences for batch validation, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Validation</span></span></div>
-</div>
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-</div></body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
deleted file mode 100644
index c63d1e1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tcontenttype" xml:lang="en-us">

-<title>Associating editors with additional files types</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content types<indexterm>mapping file extensions</indexterm></indexterm>

-<indexterm>file extensions<indexterm>mapping content types</indexterm></indexterm>

-<indexterm>file types<indexterm>editors</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can associate certain editors with a file type by clicking

-on <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>General</uicontrol><uicontrol>Editors</uicontrol><uicontrol>File

-Association</uicontrol></menucascade> and setting up the associations in the

-File Associations Window.</p><p>Some Eclipse-based editors, however, will

-only recognize a file based on the contents of the file. Consequently, if

-you want to associate an additional file type with some editors, you may have

-to first map the content type with its file extension. To map a content type

-with a file extension, complete the following steps: </p><ol>

-<li>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>General</uicontrol>

-<uicontrol>Content Types</uicontrol></menucascade>. The Content Type window

-appears. </li>

-<li>Select a content type in the Content Type window, and then select <b>Add</b> .

-The Define a New File Type window appears.</li>

-<li>Type the name of the file type, and then click <b>OK</b>.</li>

-</ol></context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
deleted file mode 100644
index ae9df23..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Associating editors with additional files types</title>
-</head>
-<body id="tcontenttype"><a name="tcontenttype"><!-- --></a>
-<h1 class="topictitle1">Associating editors with additional files types</h1>
-<div><p></p>
-<div class="section"><p>You can associate certain editors with a file type by clicking
-on <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">File
-Association</span></span> and setting up the associations in the
-File Associations Window.</p>
-<p>Some Eclipse-based editors, however, will
-only recognize a file based on the contents of the file. Consequently, if
-you want to associate an additional file type with some editors, you may have
-to first map the content type with its file extension. To map a content type
-with a file extension, complete the following steps: </p>
-<ol><li>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Content Types</span></span>. The Content Type window
-appears. </li>
-<li>Select a content type in the Content Type window, and then select <strong>Add</strong> .
-The Define a New File Type window appears.</li>
-<li>Type the name of the file type, and then click <strong>OK</strong>.</li>
-</ol>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
deleted file mode 100644
index 42b7b97..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt000" xml:lang="en-us">

-<title>Editing text coded in markup languages - overview</title>

-<titlealts>

-<navtitle>Editing markup languages - overview</navtitle>

-</titlealts>

-<shortdesc>You can edit text coded in markup languages with a <term>structured

-text editor</term>. This is a generic term for several editors that you can

-use to edit any of several markup languages, such as HTML.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>markup languages<indexterm>editing text</indexterm></indexterm>

-<indexterm>text<indexterm>editing in markup languages</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>In addition to basic editing tasks such as adding, modifying, and

-deleting text, you can perform the following tasks:</context>

-<steps-unordered>

-<step><cmd><xref href="tsrcedt025.dita" type="task">Set preferences for structured

-text editors</xref></cmd></step>

-<step><cmd><xref href="tsrcedt005.dita" type="task">Get content assistance

-in structured text editors</xref></cmd></step>

-<step><cmd><xref href="tsrcedt007.dita" type="task">Search or find text within

-a file</xref></cmd></step>

-<step><cmd><xref href="tsrcedt010.dita" type="task">Check spelling</xref></cmd>

-</step>

-<step><cmd><xref href="tsrcedt027.dita" type="task">Add or remove markup language

-templates</xref></cmd></step>

-<step><cmd><xref href="tsrcedt026.dita" type="task">Edit with snippets</xref></cmd>

-</step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt025.dita"></link>

-<link href="tsrcedt005.dita"></link>

-<link href="tsrcedt007.dita"></link>

-<link href="tsrcedt010.dita"></link>

-<link href="tsrcedt027.dita"></link>

-<link href="tsrcedt026.dita"></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
deleted file mode 100644
index e38d4f1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing text coded in markup languages - overview" />
-<meta name="abstract" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
-<meta name="description" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
-<meta content="markup languages, editing, structured text editors, markup language editing, overview" name="DC.subject" />
-<meta content="markup languages, editing, structured text editors, markup language editing, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt025.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt007.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt010.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt000" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing text coded in markup languages - overview</title>
-</head>
-<body id="tsrcedt000"><a name="tsrcedt000"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing text coded in markup languages - overview</h1>
-
-
-
-
-<div><p>You can edit text coded in markup languages with a <dfn class="term">structured
-text editor</dfn>. This is a generic term for several editors that you can
-use to edit any of several markup languages, such as HTML.</p>
-
-<div class="section">In addition to basic editing tasks such as adding, modifying, and
-deleting text, you can perform the following tasks:</div>
-
-<ul>
-<li><span><a href="tsrcedt025.html">Set preferences for structured text editors</a></span></li>
-
-<li><span><a href="tsrcedt005.html">Get content assistance in structured text editors</a></span></li>
-
-<li><span><a href="tsrcedt007.html">Search or find text within a file</a></span></li>
-
-<li><span><a href="tsrcedt010.html">Check spelling</a></span>
-</li>
-
-<li><span><a href="tsrcedt027.html">Add or remove markup language templates</a></span></li>
-
-<li><span><a href="tsrcedt026.html">Edit with snippets</a></span>
-</li>
-
-</ul>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt025.html" title="">Setting preferences for structured text editors</a></div>
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured text editors</a></div>
-<div><a href="tsrcedt007.html" title="">Searching or finding text within a file</a></div>
-<div><a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a></div>
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language templates - overview</a></div>
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
deleted file mode 100644
index 471b837..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt001" xml:lang="en-us">

-<title>Setting annotation preferences for markup languages</title>

-<titlealts>

-<navtitle>Setting annotation preferences</navtitle>

-</titlealts>

-<shortdesc>This documentation describes how to set <term>annotation preferences</term> for

-Web and XML files. The annotation preferences include whether to analyze the

-syntactic validity of your file while you are typing and what colors to use

-to highlight errors, warnings, tasks, search results, bookmarks, and other

-text.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>annotation preferences<indexterm>markup language settings</indexterm></indexterm><indexterm>markup languages<indexterm>setting annotation preferences</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>By default, when you edit in a structured text editor, your source

-code is validated as you type it in. Like other Eclipse-based editors, the

-structured text editors for markup languages flag warnings and errors in the

-source code in the editor area. The warnings and errors also show up in the

-Tasks view when you save the file.</p><note>Highlighting is fully dynamic

-with the exception of search results. Search results are highlighted based

-upon what has been saved to disk.</note><note type="tip">You can improve a

-structured text editor's performance by turning off the real-time validation.</note><p>To

-set annotation preferences, complete the following steps:</p> </context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade>.</cmd><stepresult>A Preferences window appears.</stepresult>

-</step>

-<step><cmd>In the Preferences window, click <menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select one of the following options:</cmd>

-<choices>

-<choice>To turn off real-time syntax validation, click <uicontrol>Structured

-Text Editor</uicontrol> and uncheck the <uicontrol>Analyze annotations while

-typing</uicontrol> box.</choice>

-<choice>To control other annotation settings, click <uicontrol>Annotations</uicontrol> and

-select your annotation preferences.</choice>

-</choices>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your preferences and close

-the page.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt025.dita"><linktext>Setting preferences for structured

-text editors</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
deleted file mode 100644
index b069e85..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting annotation preferences for markup languages" />
-<meta name="abstract" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
-<meta name="description" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
-<meta content="annotation preferences, markup language settings, markup languages, setting annotation preferences" name="DC.subject" />
-<meta content="annotation preferences, markup language settings, markup languages, setting annotation preferences" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt025.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt001" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting annotation preferences for markup languages</title>
-</head>
-<body id="tsrcedt001"><a name="tsrcedt001"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting annotation preferences for markup languages</h1>
-
-
-
-
-<div><p>This documentation describes how to set <dfn class="term">annotation preferences</dfn> for
-Web and XML files. The annotation preferences include whether to analyze the
-syntactic validity of your file while you are typing and what colors to use
-to highlight errors, warnings, tasks, search results, bookmarks, and other
-text.</p>
-
-<div class="section"> <p>By default, when you edit in a structured text editor, your source
-code is validated as you type it in. Like other Eclipse-based editors, the
-structured text editors for markup languages flag warnings and errors in the
-source code in the editor area. The warnings and errors also show up in the
-Tasks view when you save the file.</p>
-<div class="note"><span class="notetitle">Note:</span> Highlighting is fully dynamic
-with the exception of search results. Search results are highlighted based
-upon what has been saved to disk.</div>
-<div class="tip"><span class="tiptitle">Tip:</span> You can improve a
-structured text editor's performance by turning off the real-time validation.</div>
-<p>To
-set annotation preferences, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span>.</span> A Preferences window appears.
-</li>
-
-<li class="stepexpand"><span>In the Preferences window, click <span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select one of the following options:</span>
-<ul>
-<li>To turn off real-time syntax validation, click <span class="uicontrol">Structured
-Text Editor</span> and uncheck the <span class="uicontrol">Analyze annotations while
-typing</span> box.</li>
-
-<li>To control other annotation settings, click <span class="uicontrol">Annotations</span> and
-select your annotation preferences.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save your preferences and close
-the page.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt025.html" title="">Setting preferences for structured
-text editors</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
deleted file mode 100644
index 958f2ee..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt005" xml:lang="en-us">

-<title>Getting content assistance in structured text editors</title>

-<!--Formerly "Using JavaScript content assist"; moved some JavaScript-specific content to csrcedt006.dita ("Content assist")-->

-<titlealts>

-<navtitle>Getting content assistance</navtitle>

-</titlealts>

-<shortdesc>To get help in adding markup to a file, you can use content assist

-in a structured text editor. Content assist helps you insert or finish a tag

-or function or finish a line of code in a structured text editor.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content assistance<indexterm>structured text editors</indexterm></indexterm>

-<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>Content assist also enables you to select and insert templates in

-structured text editors. The placement of the cursor in the source file provides

-the context for the content assist to offer suggestions for completion.</context>

-<steps-unordered>

-<step><cmd></cmd><info>You can request content assist in either of the following

-two ways:</info>

-<choices>

-<choice>From the <uicontrol>Edit</uicontrol> menu, select <uicontrol>Content

-Assist</uicontrol></choice>

-<choice>Press Ctrl+Space</choice>

-</choices>

-<info><p>In addition, you can set a preference that causes content assist

-to pop up automatically when certain characters are typed, such as <codeph>.</codeph> in

-the case of <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="JavaScript">JavaScript</tm> or <codeph>&lt;</codeph> in the case

-of HTML and XML. To set this preference, select <uicontrol>Preferences</uicontrol> from

-the <uicontrol>Window</uicontrol> menu, and then select <uicontrol>Web and

-XML Files</uicontrol>, followed by one of the following sequences:<ul>

-<li><menucascade><uicontrol>HTML Files</uicontrol><uicontrol>HTML Source</uicontrol>

-</menucascade></li>

-<li><menucascade><uicontrol>JavaScript Files</uicontrol><uicontrol>JavaScript

-Source</uicontrol></menucascade></li>

-<li><menucascade><uicontrol>XML Files</uicontrol><uicontrol>XML Source</uicontrol>

-</menucascade></li>

-</ul>In the <uicontrol>Content assist</uicontrol> group box, select the <uicontrol>Automatically

-make suggestions</uicontrol> check box, and supply any additional characters

-that should trigger content assist.</p><p>If your cursor is in a position

-where content assist is available, a pop-up list of all available choices

-is displayed. For each of these choices, a brief description of the code is

-provided.</p></info></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<!--  <link href="contentassist" type="showme" format="viewlet"><linktext>Show Me</linktext></link>  -->

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt023.dita"><linktext>Making content assist work for JSP

-files</linktext></link>

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
deleted file mode 100644
index 39640bd..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Getting content assistance in structured text editors" />
-<meta name="abstract" content="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor." />
-<meta name="description" content="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor." />
-<meta content="content assist, structured text editors" name="DC.subject" />
-<meta content="content assist, structured text editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt023.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt005" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Getting content assistance in structured text editors</title>
-</head>
-<body id="tsrcedt005"><a name="tsrcedt005"><!-- --></a>
-
-
-<h1 class="topictitle1">Getting content assistance in structured text editors</h1>
-
-
-
-
-
-<div><p>To get help in adding markup to a file, you can use content assist
-in a structured text editor. Content assist helps you insert or finish a tag
-or function or finish a line of code in a structured text editor.</p>
-
-<div class="section">Content assist also enables you to select and insert templates in
-structured text editors. The placement of the cursor in the source file provides
-the context for the content assist to offer suggestions for completion.</div>
-
-
-<div class="p"><span /> You can request content assist in either of the following
-two ways:
-<ul>
-<li>From the <span class="uicontrol">Edit</span> menu, select <span class="uicontrol">Content
-Assist</span></li>
-
-<li>Press Ctrl+Space</li>
-
-</ul>
-
- <div class="p">In addition, you can set a preference that causes content assist
-to pop up automatically when certain characters are typed, such as <samp class="codeph">.</samp> in
-the case of JavaScript™ or <samp class="codeph">&lt;</samp> in the case
-of HTML and XML. To set this preference, select <span class="uicontrol">Preferences</span> from
-the <span class="uicontrol">Window</span> menu, and then select <span class="uicontrol">Web and
-XML Files</span>, followed by one of the following sequences:<ul>
-<li><span class="menucascade"><span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span>
-</span></li>
-
-<li><span class="menucascade"><span class="uicontrol">JavaScript Files</span> &gt; <span class="uicontrol">JavaScript
-Source</span></span></li>
-
-<li><span class="menucascade"><span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Source</span>
-</span></li>
-
-</ul>
-In the <span class="uicontrol">Content assist</span> group box, select the <span class="uicontrol">Automatically
-make suggestions</span> check box, and supply any additional characters
-that should trigger content assist.</div>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of all available choices
-is displayed. For each of these choices, a brief description of the code is
-provided.</p>
-</div>
-
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt023.html" title="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files.">Making content assist work for JSP
-files</a></div>
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita
deleted file mode 100644
index 38aa8b6..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt007" xml:lang="en-us">

-<title>Searching or finding text within a file</title>

-<prolog><metadata>

-<keywords><indexterm>structured text editors<indexterm>text search</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<prereq><note type="tip">Before you do a Search operation in a structured

-text editor, save the file you are searching. The search function works from

-the most recently saved version of the file rather than from the contents

-that you see in the editor area. You do not need to save your file before

-you do a Find/Replace operation. </note></prereq>

-<context>Each structured text editor provides two ways to locate a text string

-in the file you are editing and optionally replace it with another string: <dl>

-<dlentry>

-<dt>Find/Replace</dt>

-<dd>Lets you locate text in the file currently being edited.</dd>

-</dlentry><dlentry>

-<dt>Search</dt>

-<dd>Lets you locate text in files that have been saved to your workspace.</dd>

-</dlentry></dl><p>To locate and optionally replace text, select one of the

-following menu paths:</p></context>

-<steps-unordered>

-<step><cmd><menucascade><uicontrol>Edit</uicontrol><uicontrol>Find/Replace</uicontrol>

-</menucascade> (or <uicontrol>Ctrl+F</uicontrol>)</cmd><info>This option is

-self-explanatory.</info></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
deleted file mode 100644
index 3c6a789..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Searching or finding text within a file" />
-<meta content="structured text editors, text search" name="DC.subject" />
-<meta content="structured text editors, text search" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt007" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Searching or finding text within a file</title>
-</head>
-<body id="tsrcedt007"><a name="tsrcedt007"><!-- --></a>
-
-
-<h1 class="topictitle1">Searching or finding text within a file</h1>
-
-
-<div>
-<div class="p"><div class="tip"><span class="tiptitle">Tip:</span> Before you do a Search operation in a structured
-text editor, save the file you are searching. The search function works from
-the most recently saved version of the file rather than from the contents
-that you see in the editor area. You do not need to save your file before
-you do a Find/Replace operation. </div>
-</div>
-
-<div class="section">Each structured text editor provides two ways to locate a text string
-in the file you are editing and optionally replace it with another string: <dl>
-
-<dt class="dlterm">Find/Replace</dt>
-
-<dd>Lets you locate text in the file currently being edited.</dd>
-
-
-<dt class="dlterm">Search</dt>
-
-<dd>Lets you locate text in files that have been saved to your workspace.</dd>
-
-</dl>
-<p>To locate and optionally replace text, select one of the
-following menu paths:</p>
-</div>
-
-
-<div class="p"><span><span class="menucascade"><span class="uicontrol">Edit</span> &gt; <span class="uicontrol">Find/Replace</span>
-</span> (or <span class="uicontrol">Ctrl+F</span>)</span> This option is
-self-explanatory.</div>
-
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita
deleted file mode 100644
index 4ac6d01..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt010" xml:lang="en-us">

-<title>Checking spelling</title>

-<shortdesc>This documentation describes how to check spelling in a structured

-text editor.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>spell check<indexterm>structured text editors</indexterm></indexterm><indexterm>structured text editors<indexterm>spell check</indexterm></indexterm>

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>The structured text editors for markup languages (accessed from

-the Project Explorer's pop-up menu or by clicking the Source tab in certain

-editors) provide a spell checking feature.</p><p>To check spelling in an HTML,

-XML, or other file that uses a structured markup language:</p> </context>

-<steps>

-<step><cmd>(Optional) To select the dictionary that will be used, click <menucascade>

-<uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol><uicontrol>Spell

-Check</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Open in a  structured text editor the file whose spelling you want

-to check.</cmd></step>

-<step><cmd>Start the spelling checker by clicking <menucascade><uicontrol>Edit</uicontrol>

-<uicontrol>Spell Check</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Type a new spelling into the <uicontrol>Change to</uicontrol> field,

-or select one of the available options. Click the <uicontrol>Change</uicontrol> button

-to change the current instance of the word in the current document. Click

-the <uicontrol>Change All</uicontrol> button to change all instances of the

-word in the current document. You can also click the <uicontrol>Add</uicontrol> button

-to add the currently selected spelling to your dictionary.</cmd></step>

-<step><cmd>Use the controls in the Spell Check dialog box to ignore, change,

-or add terms to the current dictionary. (To remove a word after it has been

-added to the dictionary, click the <uicontrol>Dictionary</uicontrol> push

-button.)</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
deleted file mode 100644
index 0df2732..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Checking spelling" />
-<meta name="abstract" content="This documentation describes how to check spelling in a structured text editor." />
-<meta name="description" content="This documentation describes how to check spelling in a structured text editor." />
-<meta content="spell check, structured text editors" name="DC.subject" />
-<meta content="spell check, structured text editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt010" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Checking spelling</title>
-</head>
-<body id="tsrcedt010"><a name="tsrcedt010"><!-- --></a>
-
-
-<h1 class="topictitle1">Checking spelling</h1>
-
-
-
-<div><p>This documentation describes how to check spelling in a structured
-text editor.</p>
-
-<div class="section"> <p>The structured text editors for markup languages (accessed from
-the Project Explorer's pop-up menu or by clicking the Source tab in certain
-editors) provide a spell checking feature.</p>
-<p>To check spelling in an HTML,
-XML, or other file that uses a structured markup language:</p>
- </div>
-
-<ol>
-<li><span>(Optional) To select the dictionary that will be used, click <span class="menucascade">
-<span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Spell
-Check</span></span>.</span></li>
-
-<li><span>Open in a  structured text editor the file whose spelling you want
-to check.</span></li>
-
-<li><span>Start the spelling checker by clicking <span class="menucascade"><span class="uicontrol">Edit</span>
- &gt; <span class="uicontrol">Spell Check</span></span>.</span></li>
-
-<li><span>Type a new spelling into the <span class="uicontrol">Change to</span> field,
-or select one of the available options. Click the <span class="uicontrol">Change</span> button
-to change the current instance of the word in the current document. Click
-the <span class="uicontrol">Change All</span> button to change all instances of the
-word in the current document. You can also click the <span class="uicontrol">Add</span> button
-to add the currently selected spelling to your dictionary.</span></li>
-
-<li><span>Use the controls in the Spell Check dialog box to ignore, change,
-or add terms to the current dictionary. (To remove a word after it has been
-added to the dictionary, click the <span class="uicontrol">Dictionary</span> push
-button.)</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
deleted file mode 100644
index ce2bb1d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt014" xml:lang="en-us">

-<title>Adding snippets drawers</title>

-<shortdesc>This documentation explains how to customize the Snippets view

-by adding a new drawer.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>drawer customization</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To add a new drawer to the Snippets view:</context>

-<steps>

-<step><cmd>Right-click anywhere in the Snippets view and select <uicontrol>Customize</uicontrol> from

-the pop-up menu.</cmd></step>

-<step><cmd>Click <menucascade><uicontrol>New</uicontrol><uicontrol>Category</uicontrol>

-</menucascade> and type the name of the new drawer in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Optionally, type a description in the <uicontrol>Description</uicontrol> field.</cmd>

-</step>

-<step><cmd>Select the drawer's behavior by checking check boxes as appropriate.

-The check boxes are as follows:</cmd>

-<choicetable>

-<chrow><choption>Hide</choption><chdesc>Do not display the drawer.</chdesc>

-</chrow>

-<chrow><choption>Open drawer at start-up</choption><chdesc>At start-up, display

-the drawer's items.</chdesc></chrow>

-<chrow><choption>Pin drawer open at start-up</choption><chdesc>Keep the drawer

-open.</chdesc></chrow>

-</choicetable>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>. The new drawer will be added to

-the list of drawers in the Snippets view.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
deleted file mode 100644
index 22bbb84..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding snippets drawers" />
-<meta name="abstract" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
-<meta name="description" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
-<meta content="snippets, drawers, adding, deleting, editing items, hiding" name="DC.subject" />
-<meta content="snippets, drawers, adding, deleting, editing items, hiding" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt014" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding snippets drawers</title>
-</head>
-<body id="tsrcedt014"><a name="tsrcedt014"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding snippets drawers</h1>
-
-
-
-<div><p>This documentation explains how to customize the Snippets view
-by adding a new drawer.</p>
-
-<div class="section">To add a new drawer to the Snippets view:</div>
-
-<ol>
-<li><span>Right-click anywhere in the Snippets view and select <span class="uicontrol">Customize</span> from
-the pop-up menu.</span></li>
-
-<li><span>Click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Category</span>
-</span> and type the name of the new drawer in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li><span>Optionally, type a description in the <span class="uicontrol">Description</span> field.</span>
-</li>
-
-<li><span>Select the drawer's behavior by checking check boxes as appropriate.
-The check boxes are as follows:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100A4-option" align="left">Option</th>
-<th valign="bottom" id="N100A4-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N100A4-option" id="N100AE"><strong>Hide</strong></td>
-<td valign="top" headers="N100A4-desc N100AE">Do not display the drawer.</td>
-
-</tr>
-
-<tr><td valign="top" headers="N100A4-option" id="N100BE"><strong>Open drawer at start-up</strong></td>
-<td valign="top" headers="N100A4-desc N100BE">At start-up, display
-the drawer's items.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A4-option" id="N100CD"><strong>Pin drawer open at start-up</strong></td>
-<td valign="top" headers="N100A4-desc N100CD">Keep the drawer
-open.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>. The new drawer will be added to
-the list of drawers in the Snippets view.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
deleted file mode 100644
index e1195f9..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt015" xml:lang="en-us">

-<title>Adding items to snippets drawers</title>

-<prolog><metadata>

-<keywords><indexterm>snippet drawers<indexterm>adding items</indexterm></indexterm>

-<indexterm>snippet items<indexterm>adding to drawers</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> To add new items to an existing snippets drawer::</context>

-<steps>

-<step><cmd>Do one of the following choices:</cmd><info><table colsep="0" frame="topbot">

-<tgroup cols="2"><colspec colname="col1" colwidth="72*"/><colspec colname="col2"

-colwidth="127*"/>

-<thead>

-<row>

-<entry colname="col1" valign="top">To start with this:</entry>

-<entry colname="col2" valign="top">Do this:</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">An empty item that you can edit</entry>

-<entry colname="col2">Right-click anywhere in an existing drawer, select <uicontrol>Customize</uicontrol>,

-and click <menucascade><uicontrol>New</uicontrol><uicontrol>New Item</uicontrol>

-</menucascade>.</entry>

-</row>

-<row>

-<entry colname="col1">Existing text pasted into a new item in an existing

-drawer</entry>

-<entry colname="col2">Copy or cut text to the clipboard. In the Snippets view,

-right-click anywhere in an existing drawer and click <uicontrol>Paste</uicontrol>.</entry>

-</row>

-<row>

-<entry colname="col1">Existing text pasted into a new item in a new or existing

-drawer</entry>

-<entry colname="col2">Select the text, right-click, click <uicontrol>Add to

-Snippets</uicontrol>, specify the name of the drawer in the Snippets view

-to which you want to add the item, and click <uicontrol>OK</uicontrol>.</entry>

-</row>

-</tbody>

-</tgroup>

-</table></info><stepresult>A <wintitle>Customize Palette</wintitle> window

-appears.</stepresult></step>

-<step><cmd>Type a name for the new item, and, optionally, provide a description.</cmd>

-<stepresult>The value that you type in the <uicontrol>Name</uicontrol> field

-will appear next to the item's icon in the Snippets view.</stepresult></step>

-<step><cmd>To include in the <uicontrol>Template Pattern</uicontrol> field

-a variable that you have already defined, click <uicontrol>Insert Variable

-Placeholder</uicontrol>. </cmd><info>A variable placeholder is a marker that,

-when tagging is inserted into the active file, will be replaced by the value

-that is entered into the <uicontrol>Insert Template:</uicontrol><varname>Item_name</varname> dialog

-at insertion time. Clicking the <uicontrol>Insert Variable Placeholder</uicontrol> button

-or typing Ctrl+Space activates a pop-up in the text area that prompts you

-with the correct sequences to create a marker for the variable.</info><stepxmp>For

-example, if you create two variables named <varname>uri</varname> and <varname>prefix</varname>,

-and create variable placeholders for both, the template pattern might look

-like this:<codeblock>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %></codeblock></stepxmp>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result>The new item will be added to the list of items in the appropriate

-drawer.</result>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
deleted file mode 100644
index 2c928aa..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding items to snippets drawers" />
-<meta content="snippet drawers, adding items to, snippet items, adding to drawers" name="DC.subject" />
-<meta content="snippet drawers, adding items to, snippet items, adding to drawers" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt015" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding items to snippets drawers</title>
-</head>
-<body id="tsrcedt015"><a name="tsrcedt015"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding items to snippets drawers</h1>
-
-
-<div>
-<div class="section"> To add new items to an existing snippets drawer::</div>
-
-<ol>
-<li class="stepexpand"><span>Do one of the following choices:</span> 
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="hsides" border="1" rules="rows">
-<thead align="left">
-<tr>
-<th valign="top" width="36.18090452261307%" id="N10079">To start with this:</th>
-
-<th valign="top" width="63.81909547738693%" id="N10081">Do this:</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">An empty item that you can edit</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Right-click anywhere in an existing drawer, select <span class="uicontrol">Customize</span>,
-and click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">New Item</span>
-</span>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">Existing text pasted into a new item in an existing
-drawer</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Copy or cut text to the clipboard. In the Snippets view,
-right-click anywhere in an existing drawer and click <span class="uicontrol">Paste</span>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">Existing text pasted into a new item in a new or existing
-drawer</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Select the text, right-click, click <span class="uicontrol">Add to
-Snippets</span>, specify the name of the drawer in the Snippets view
-to which you want to add the item, and click <span class="uicontrol">OK</span>.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
- A <span class="wintitle">Customize Palette</span> window
-appears.</li>
-
-<li class="stepexpand"><span>Type a name for the new item, and, optionally, provide a description.</span>
- The value that you type in the <span class="uicontrol">Name</span> field
-will appear next to the item's icon in the Snippets view.</li>
-
-<li class="stepexpand"><span>To include in the <span class="uicontrol">Template Pattern</span> field
-a variable that you have already defined, click <span class="uicontrol">Insert Variable
-Placeholder</span>. </span> A variable placeholder is a marker that,
-when tagging is inserted into the active file, will be replaced by the value
-that is entered into the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time. Clicking the <span class="uicontrol">Insert Variable Placeholder</span> button
-or typing Ctrl+Space activates a pop-up in the text area that prompts you
-with the correct sequences to create a marker for the variable. For
-example, if you create two variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-and create variable placeholders for both, the template pattern might look
-like this:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">The new item will be added to the list of items in the appropriate
-drawer.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
deleted file mode 100644
index fd624af..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt016" xml:lang="en-us">

-<title>Deleting or hiding snippet items or drawers</title>

-<titlealts>

-<navtitle>Deleting and hiding drawers and items</navtitle>

-</titlealts>

-<shortdesc>This documentation describes how to delete or hide drawers and

-items in the Snippets view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>drawers<indexterm>snippets view</indexterm></indexterm>

-<indexterm>snippets<indexterm>modifying drawers</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>You can hide any drawer or item that shows up in the Snippets view.

-If the drawer or item is user-defined, you can delete it permanently. To delete

-or hide a drawer or item, complete the following steps:</context>

-<steps>

-<step><cmd>Select the item or drawer that you want to remove.</cmd></step>

-<step><cmd>Right-click and select <uicontrol>Customize</uicontrol> from the

-pop-up menu.</cmd></step>

-<step><cmd>Select the item or drawer and click <uicontrol>Delete</uicontrol> or <uicontrol>Hide</uicontrol>.</cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>. The item or drawer will be deleted

-or hidden from the Snippets view.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
deleted file mode 100644
index f3d7504..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Deleting or hiding snippet items or drawers" />
-<meta name="abstract" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
-<meta name="description" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
-<meta content="snippets, deleting or hiding drawers, drawers, deleting snippets, hiding snippets" name="DC.subject" />
-<meta content="snippets, deleting or hiding drawers, drawers, deleting snippets, hiding snippets" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt016" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Deleting or hiding snippet items or drawers</title>
-</head>
-<body id="tsrcedt016"><a name="tsrcedt016"><!-- --></a>
-
-
-<h1 class="topictitle1">Deleting or hiding snippet items or drawers</h1>
-
-
-
-
-<div><p>This documentation describes how to delete or hide drawers and
-items in the Snippets view.</p>
-
-<div class="section">You can hide any drawer or item that shows up in the Snippets view.
-If the drawer or item is user-defined, you can delete it permanently. To delete
-or hide a drawer or item, complete the following steps:</div>
-
-<ol>
-<li><span>Select the item or drawer that you want to remove.</span></li>
-
-<li><span>Right-click and select <span class="uicontrol">Customize</span> from the
-pop-up menu.</span></li>
-
-<li><span>Select the item or drawer and click <span class="uicontrol">Delete</span> or <span class="uicontrol">Hide</span>.</span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>. The item or drawer will be deleted
-or hidden from the Snippets view.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita
deleted file mode 100644
index 63b31bf..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt022" xml:lang="en-us">

-<title>Editing snippet items</title>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>editing items</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> To modify an existing item in a Snippets drawer, complete the steps

-listed below. If you have just completed the task <xref href="tsrcedt015.dita"

-type="task">Adding an item to a snippets drawer</xref> and the <wintitle>Customize

-Palette</wintitle> window is still open, you can skip steps 1 and 2.</context>

-<steps>

-<step><cmd>In the Snippets view, right-click the name of the item that you

-want to modify, and select <uicontrol>Customize</uicontrol>.</cmd></step>

-<step><cmd>Optionally, type a new name and a new description for the item.</cmd>

-</step>

-<step><cmd>To declare a variable, click <uicontrol>New</uicontrol> and type

-the variable's name, description, and default value.</cmd></step>

-<step><cmd>To edit an existing variable, type over the existing values.</cmd>

-</step>

-<step><cmd>To edit the <uicontrol>Template Pattern</uicontrol> field, type

-into the field, cut and paste into the field, or, if you have defined one

-or more variables, click the <uicontrol>Insert Variable Placeholder</uicontrol> button,

-and double-click the name of the variable that you want to insert.</cmd><stepxmp>For

-example, if you have declare variables named <varname>uri</varname> and <varname>prefix</varname>,

-clicking the button brings up a menu that contains those names. Double-clicking <varname>uri</varname> inserts <codeph>${uri}</codeph>,

-as in the following example:<codeblock>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %></codeblock></stepxmp>

-<stepresult>Later, when you insert the snippet into a file, <codeph>${uri}</codeph> and <codeph>${prefix}</codeph> are

-each converted to the default value declared in the Variables table. Users

-can replace the default values in the <uicontrol>Insert Template:</uicontrol><varname>Item_name</varname> dialog

-at insertion time.</stepresult></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result>The modified item will be added to the list of items in the appropriate

-drawer.</result>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
deleted file mode 100644
index d1a8987..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing snippet items" />
-<meta content="snippets, editing items" name="DC.subject" />
-<meta content="snippets, editing items" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt022" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing snippet items</title>
-</head>
-<body id="tsrcedt022"><a name="tsrcedt022"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing snippet items</h1>
-
-
-<div>
-<div class="section"> To modify an existing item in a Snippets drawer, complete the steps
-listed below. If you have just completed the task <a href="tsrcedt015.html">Adding an item to a snippets drawer</a> and the <span class="wintitle">Customize
-Palette</span> window is still open, you can skip steps 1 and 2.</div>
-
-<ol>
-<li class="stepexpand"><span>In the Snippets view, right-click the name of the item that you
-want to modify, and select <span class="uicontrol">Customize</span>.</span></li>
-
-<li class="stepexpand"><span>Optionally, type a new name and a new description for the item.</span>
-</li>
-
-<li class="stepexpand"><span>To declare a variable, click <span class="uicontrol">New</span> and type
-the variable's name, description, and default value.</span></li>
-
-<li class="stepexpand"><span>To edit an existing variable, type over the existing values.</span>
-</li>
-
-<li class="stepexpand"><span>To edit the <span class="uicontrol">Template Pattern</span> field, type
-into the field, cut and paste into the field, or, if you have defined one
-or more variables, click the <span class="uicontrol">Insert Variable Placeholder</span> button,
-and double-click the name of the variable that you want to insert.</span> For
-example, if you have declare variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-clicking the button brings up a menu that contains those names. Double-clicking <var class="varname">uri</var> inserts <samp class="codeph">${uri}</samp>,
-as in the following example:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
-
- Later, when you insert the snippet into a file, <samp class="codeph">${uri}</samp> and <samp class="codeph">${prefix}</samp> are
-each converted to the default value declared in the Variables table. Users
-can replace the default values in the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">The modified item will be added to the list of items in the appropriate
-drawer.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
deleted file mode 100644
index 0bd8065..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt023" xml:lang="en-us">

-<title>Enabling content assist for JSP files</title>

-<shortdesc>Having the proper files defined in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build class path is essential for content

-assist to work properly in JSP files. It is also essential for the links builder

-to be able to correctly resolve links to servlets or <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans

-in JSP and HTML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content assistance<indexterm>enabling for JSP files</indexterm></indexterm>

-<indexterm>JSP files<indexterm>enabling content assistance</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To enable content assist for JSP files:</context>

-<steps>

-<step><cmd>To determine whether the build path is correct, select <uicontrol>Properties</uicontrol> from

-the project's pop-up menu. </cmd></step>

-<step><cmd>Select <uicontrol>Java Build Path</uicontrol>, and then the <uicontrol>Libraries</uicontrol> page. </cmd>

-<info>You should see the following files:<ul>

-<li>j2ee.jar</li>

-<li>rt.jar </li>

-<li>servlet.jar</li>

-<li>webcontainer.jar</li>

-</ul></info></step>

-<step><cmd>If they are not present, add them as External JAR files. You may

-have your own versions of these files, depending on the level of JDK or Servlet

-API for which you are developing.</cmd></step>

-<step><cmd>If your Web applications reference other JARs, you can place them

-in the build path as follows:</cmd>

-<substeps>

-<substep><cmd>Use the <uicontrol>Add JARs</uicontrol> button on the Library

-page. You must ensure that the JAR file is available to the server by properly

-configuring the server.</cmd></substep>

-<substep><cmd>Add the JARs to the <filepath>WEB-INF/lib</filepath> directory.

-They will be automatically added to the build path and deployed to the server

-in as part of the project WAR.</cmd></substep>

-</substeps>

-</step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt005.dita"><linktext>Getting content assistance in structured

-text editors</linktext></link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
deleted file mode 100644
index e50a155..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Enabling content assist for JSP files" />
-<meta name="abstract" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
-<meta name="description" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
-<meta content="JSP files, content assist enablement, content assist, enabling for JSP files" name="DC.subject" />
-<meta content="JSP files, content assist enablement, content assist, enabling for JSP files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt023" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enabling content assist for JSP files</title>
-</head>
-<body id="tsrcedt023"><a name="tsrcedt023"><!-- --></a>
-
-
-<h1 class="topictitle1">Enabling content assist for JSP files</h1>
-
-
-
-<div><p>Having the proper files defined in the Java™ build class path is essential for content
-assist to work properly in JSP files. It is also essential for the links builder
-to be able to correctly resolve links to servlets or Java beans
-in JSP and HTML files.</p>
-
-<div class="section">To enable content assist for JSP files:</div>
-
-<ol>
-<li class="stepexpand"><span>To determine whether the build path is correct, select <span class="uicontrol">Properties</span> from
-the project's pop-up menu. </span></li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Java Build Path</span>, and then the <span class="uicontrol">Libraries</span> page. </span>
- You should see the following files:<ul>
-<li>j2ee.jar</li>
-
-<li>rt.jar </li>
-
-<li>servlet.jar</li>
-
-<li>webcontainer.jar</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If they are not present, add them as External JAR files. You may
-have your own versions of these files, depending on the level of JDK or Servlet
-API for which you are developing.</span></li>
-
-<li class="stepexpand"><span>If your Web applications reference other JARs, you can place them
-in the build path as follows:</span>
-<ol type="a">
-<li><span>Use the <span class="uicontrol">Add JARs</span> button on the Library
-page. You must ensure that the JAR file is available to the server by properly
-configuring the server.</span></li>
-
-<li><span>Add the JARs to the <span class="filepath">WEB-INF/lib</span> directory.
-They will be automatically added to the build path and deployed to the server
-in as part of the project WAR.</span></li>
-
-</ol>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita
deleted file mode 100644
index c475e98..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt024" xml:lang="en-us">

-<title>Adding and removing HTML templates</title>

-<shortdesc>HTML content assist provides several templates, or chunks of predefined

-code, that you can insert into a file. You can use the default templates as

-provided, customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>HTML<indexterm>templates<indexterm>removing</indexterm></indexterm></indexterm><indexterm>templates<indexterm>HTML</indexterm></indexterm><indexterm>HTML<indexterm>templates<indexterm>adding</indexterm></indexterm></indexterm>

-

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of HTML pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into an HTML or XHTML file.</p><p>To add

-a new HTML template, complete the following steps:</p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>HTML Files</uicontrol><uicontrol>HTML Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the HTML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
deleted file mode 100644
index f627370..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing HTML templates" />
-<meta name="abstract" content="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="HTML, templates, removing, adding" name="DC.subject" />
-<meta content="HTML, templates, removing, adding" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt024" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing HTML templates</title>
-</head>
-<body id="tsrcedt024"><a name="tsrcedt024"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing HTML templates</h1>
-
-
-
-<div><p>HTML content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of HTML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an HTML or XHTML file.</p>
-<p>To add
-a new HTML template, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
deleted file mode 100644
index e390542..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt025" xml:lang="en-us">

-<title>Setting preferences for structured text editors</title>

-<titlealts>

-<navtitle>Setting structured text editor preferences</navtitle>

-</titlealts>

-<prolog><metadata>

-<keywords><indexterm>structured text editors<indexterm>preference setting</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>You can customize your working environment by specifying preferences

-for the structured text editor.</context>

-<steps>

-<step><cmd>In the main menu, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select one of the choices that are shown in the following table:</cmd>

-<choicetable relcolwidth="10* 30*">

-<chhead><choptionhd>Item</choptionhd><chdeschd>Menu path</chdeschd></chhead>

-<chrow><choption>Annotation settings</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Annotations</uicontrol></menucascade></chdesc>

-</chrow>

-<chrow><choption>Character encoding</choption><chdesc><uicontrol>Web and XML</uicontrol>,

-then one of the following choices: <uicontrol>CSS Files</uicontrol>, <uicontrol>HTML

-Files</uicontrol>, <uicontrol>JSP Files</uicontrol>, <uicontrol>*XML Files

-( *not implemented in WTP)</uicontrol></chdesc></chrow>

-<chrow><choption>Content assist: HTML</choption><chdesc><menucascade><uicontrol>Web

-and XML</uicontrol><uicontrol>HTML Files</uicontrol><uicontrol>HTML Source</uicontrol>

-</menucascade></chdesc></chrow>

-<chrow><choption>Content assist: JavaScript</choption><chdesc><menucascade>

-<uicontrol>Web and XML</uicontrol><uicontrol>JavaScript Files</uicontrol>

-<uicontrol>JavaScript Source</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Content assist: XML</choption><chdesc><menucascade><uicontrol>Web

-and XML</uicontrol><uicontrol>*XML Files (*not implemented in WTP)</uicontrol>

-<uicontrol>XML Source</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Editor appearance</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Appearance</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Editor font</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Colors and Fonts</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-</menucascade></chdesc></chrow>

-<chrow><choption>Editor navigation</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Navigation</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>File-type-specific settings</choption><chdesc><uicontrol>Web

-and XML</uicontrol>, then navigate to the file type and particular setting</chdesc>

-</chrow>

-<chrow><choption>Hover help</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Hovers</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Key bindings</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Keys</uicontrol><uicontrol>Keyboard Shortcuts</uicontrol></menucascade> then

-in the <uicontrol>Category</uicontrol> field specify <uicontrol>Source</uicontrol></chdesc>

-</chrow>

-<chrow><choption>Spell checking</choption><chdesc><uicontrol>Spell Check</uicontrol></chdesc>

-</chrow>

-<chrow><choption>Syntax checking</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Appearance</uicontrol></menucascade> then check or uncheck the <uicontrol>Analyze

-annotations while typing</uicontrol> box.</chdesc></chrow>

-</choicetable>

-<info><note>You cannot set <uicontrol>Web and XML</uicontrol> preferences

-unless the Core XML Support capability (<menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Capabilities</uicontrol></menucascade>) is enabled, and you cannot

-set preferences for DTD files unless the XML Development capability is enabled.</note></info>

-</step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt001.dita"><linktext>Setting annotation preferences for

-markup languages</linktext></link>

-<link href="tsrcedt010.dita"><linktext>Checking spelling</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
deleted file mode 100644
index 2194f1e..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting preferences for structured text editors" />
-<meta content="structured text editors, preference setting" name="DC.subject" />
-<meta content="structured text editors, preference setting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt010.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt025" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting preferences for structured text editors</title>
-</head>
-<body id="tsrcedt025"><a name="tsrcedt025"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting preferences for structured text editors</h1>
-
-
-
-<div>
-<div class="section">You can customize your working environment by specifying preferences
-for the structured text editor.</div>
-
-<ol>
-<li class="stepexpand"><span>In the main menu, click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select one of the choices that are shown in the following table:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1006E-option">Item</th>
-<th valign="bottom" id="N1006E-desc">Menu path</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N1006E-option" id="N10088"><strong>Annotation settings</strong></td>
-<td valign="top" headers="N1006E-desc N10088"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Annotations</span></span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N100AB"><strong>Character encoding</strong></td>
-<td valign="top" headers="N1006E-desc N100AB"><span class="uicontrol">Web and XML</span>,
-then one of the following choices: <span class="uicontrol">CSS Files</span>, <span class="uicontrol">HTML
-Files</span>, <span class="uicontrol">JSP Files</span>, <span class="uicontrol">*XML Files
-( *not implemented in WTP)</span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N100D6"><strong>Content assist: HTML</strong></td>
-<td valign="top" headers="N1006E-desc N100D6"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span>
-</span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N100F8"><strong>Content assist: JavaScript</strong></td>
-<td valign="top" headers="N1006E-desc N100F8"><span class="menucascade">
-<span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">JavaScript Files</span>
- &gt; <span class="uicontrol">JavaScript Source</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N1011B"><strong>Content assist: XML</strong></td>
-<td valign="top" headers="N1006E-desc N1011B"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">*XML Files (*not implemented in WTP)</span>
- &gt; <span class="uicontrol">XML Source</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N1013D"><strong>Editor appearance</strong></td>
-<td valign="top" headers="N1006E-desc N1013D"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Appearance</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N10165"><strong>Editor font</strong></td>
-<td valign="top" headers="N1006E-desc N10165"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Colors and Fonts</span> &gt; <span class="uicontrol">Structured Text Editor</span>
-</span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N10188"><strong>Editor navigation</strong></td>
-<td valign="top" headers="N1006E-desc N10188"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Navigation</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N101B0"><strong>File-type-specific settings</strong></td>
-<td valign="top" headers="N1006E-desc N101B0"><span class="uicontrol">Web
-and XML</span>, then navigate to the file type and particular setting</td>
-
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N101C5"><strong>Hover help</strong></td>
-<td valign="top" headers="N1006E-desc N101C5"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Hovers</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N101ED"><strong>Key bindings</strong></td>
-<td valign="top" headers="N1006E-desc N101ED"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Keys</span> &gt; <span class="uicontrol">Keyboard Shortcuts</span></span> then
-in the <span class="uicontrol">Category</span> field specify <span class="uicontrol">Source</span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N1021C"><strong>Spell checking</strong></td>
-<td valign="top" headers="N1006E-desc N1021C"><span class="uicontrol">Spell Check</span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N1006E-option" id="N10230"><strong>Syntax checking</strong></td>
-<td valign="top" headers="N1006E-desc N10230"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Appearance</span></span> then check or uncheck the <span class="uicontrol">Analyze
-annotations while typing</span> box.</td>
-</tr>
-
-</tbody></table>
-
- <div class="note"><span class="notetitle">Note:</span> You cannot set <span class="uicontrol">Web and XML</span> preferences
-unless the Core XML Support capability (<span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Capabilities</span></span>) is enabled, and you cannot
-set preferences for DTD files unless the XML Development capability is enabled.</div>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt001.html" title="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text.">Setting annotation preferences for
-markup languages</a></div>
-<div><a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
deleted file mode 100644
index d7cf927..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt026" xml:lang="en-us">

-<title>Editing with snippets - overview</title>

-<shortdesc>The Snippets view lets you catalog and organize reusable programming

-objects, such as HTML tagging, <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, and JSP code, along with

-files and custom JSP tags. The view can be extended based on additional objects

-that you define and include.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>overview</indexterm></indexterm>

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>In the Snippets view you can perform the following tasks:</context>

-<steps-unordered>

-<step><cmd>Add snippets drawers</cmd></step>

-<step><cmd>Add items to snippets drawers</cmd></step>

-<step><cmd>Edit snippet items</cmd></step>

-<step><cmd>Delete or hide snippet items or drawers</cmd></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
deleted file mode 100644
index 85e03ed..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing with snippets - overview" />
-<meta name="abstract" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
-<meta name="description" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
-<meta content="snippets, overview, HTML, editing, reuse with snippets, JavaScript, JSP code, JSP tags, custom" name="DC.subject" />
-<meta content="snippets, overview, HTML, editing, reuse with snippets, JavaScript, JSP code, JSP tags, custom" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt026" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing with snippets - overview</title>
-</head>
-<body id="tsrcedt026"><a name="tsrcedt026"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing with snippets - overview</h1>
-
-
-
-<div><p>The Snippets view lets you catalog and organize reusable programming
-objects, such as HTML tagging, JavaScript™, and JSP code, along with
-files and custom JSP tags. The view can be extended based on additional objects
-that you define and include.</p>
-
-<div class="section">In the Snippets view you can perform the following tasks:</div>
-
-<ul>
-<li><span>Add snippets drawers</span></li>
-
-<li><span>Add items to snippets drawers</span></li>
-
-<li><span>Edit snippet items</span></li>
-
-<li><span>Delete or hide snippet items or drawers</span></li>
-
-</ul>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
deleted file mode 100644
index 7d324eb..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt027" xml:lang="en-us">

-<title>Adding and removing markup language templates - overview</title>

-<titlealts>

-<navtitle>Adding markup language templates</navtitle>

-</titlealts>

-<shortdesc>Content assist provides templates, or chunks of predefined code,

-that you can insert into a file. You can use the default templates as provided,

-customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>markup languages<indexterm>templates</indexterm></indexterm>

-<indexterm>templates<indexterm>markup languages</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>Templates are available for the following markup languages:<ul>

-<li>HTML or XHTML</li>

-<li>JSP</li>

-</ul></context>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
deleted file mode 100644
index 66434c3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing markup language templates - overview" />
-<meta name="abstract" content="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="markup languages, adding and removing templates" name="DC.subject" />
-<meta content="markup languages, adding and removing templates" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt027" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing markup language templates - overview</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing markup language templates - overview</h1>
-
-
-
-
-<div><p>Content assist provides templates, or chunks of predefined code,
-that you can insert into a file. You can use the default templates as provided,
-customize the default templates, or create your own templates.</p>
-
-<div class="section">Templates are available for the following markup languages:<ul>
-<li>HTML or XHTML</li>
-
-<li>JSP</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
deleted file mode 100644
index cb9bc26..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt028" xml:lang="en-us">

-<title>Adding and removing JSP templates</title>

-<shortdesc>JSP content assist provides several templates, or chunks of predefined

-code, that you can insert into a file. You can use the default templates as

-provided, customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>JSP pages<indexterm>templates</indexterm></indexterm>

-<indexterm>templates<indexterm>JSP pages</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of JSP pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into a JSP file.</p><p>To add a new JSP template,

-complete the following steps:</p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>JSP Files</uicontrol><uicontrol>JSP Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the HTML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
deleted file mode 100644
index 57cf2d4..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing JSP templates" />
-<meta name="abstract" content="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="JSP templates, adding, removing, templates, JSP" name="DC.subject" />
-<meta content="JSP templates, adding, removing, templates, JSP" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt028" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing JSP templates</title>
-</head>
-<body id="tsrcedt028"><a name="tsrcedt028"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing JSP templates</h1>
-
-
-
-<div><p>JSP content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of JSP pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into a JSP file.</p>
-<p>To add a new JSP template,
-complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">JSP Files</span> &gt; <span class="uicontrol">JSP Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
deleted file mode 100644
index e41bd7c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<!-- $Id: tsrcedt029.dita,v 1.4 2006/04/13 20:37:13 bkorn Exp $ -->

-<task id="tsrcedt027" xml:lang="en-us">

-<title>Adding and removing XML templates</title>

-<shortdesc>XML content assist provides a comment template, a chunk of predefined

-code that you can insert into a file. You can use the default template as

-provided, customize that template, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>templates<indexterm>XML</indexterm></indexterm>

-<indexterm>xml templates<indexterm>adding</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of XML pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into an XML file.</p><p>To add a new XML

-template, complete the following steps: </p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the XML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
deleted file mode 100644
index 07d2669..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing XML templates" />
-<meta name="abstract" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
-<meta name="description" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
-<meta content="xml templates, adding, removing, templates, XML" name="DC.subject" />
-<meta content="xml templates, adding, removing, templates, XML" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt027" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing XML templates</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing XML templates</h1>
-
-
-
-<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You can use the default template as
-provided, customize that template, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of XML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an XML file.</p>
-<p>To add a new XML
-template, complete the following steps: </p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the XML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore b/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.project b/docs/org.eclipse.wst.sse.ui.infopop/.project
deleted file mode 100644
index 2d9cc84..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml b/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
deleted file mode 100644
index b68067e..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-
-<context id="sted0001">
-<description>This page lets you customize the appearance of the structured text editors.
-When the <b>Highlight matching brackets</b> option is selected, whenever the cursor is next to a bracket or curly braces, its opening or closing counter part is highlighted.
-Select the <b>Report problems as you type</b> check box to update validity annotations (temporary annotations, such as missing required attributes based on a DTD, that go away when the editor is closed, or the problem is fixed) as the user types.
-In the <b>Appearance color options</b> table, you can adjust various editor appearance features.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="sted0003">
-<description>This page lets you customize hover text in the structured text editors.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclispe.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1010">
-<description>Content assist helps you to finish tags or lines of code and insert templates. Depending on the source markup language, the choices that are available in the content assist list are based on tags defined by DTD and schema files, tag library descriptors, or content model standard that is specified for the file being edited. HTML content assist choices are based on the W3C HTML 4.01 content model.
-
-If your cursor is in a position where content assist is available, a pop-up list of available choices is displayed. The content assist list displays all available completions for the current cursor position, including templates. Content assist is also available by pressing Ctrl+Space.
-</description>
-<topic label="Content assist" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt006.html"/>
-<topic label="Getting content assistance in structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1030">
-<description>Select this option to format an entire document. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file. Edit the appropriate Preferences pages to make changes in specific formatting behavior.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1040">
-<description>Select this option to format selected elements. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1070">
-<description>Select this option to open the <b>Properties</b> view, which displays properties relevant to the current element if any exist.
-</description>
-<topic label="Properties view" href="../org.eclipse.platform.doc.user/concepts/cpropview.htm"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm2000">
-<description>This structured text editor lets you edit a text file that is coded in a markup language. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting. For a more specific list of editing features, see the first link below.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0000">
-<description>This page lets you customize task tag discovery in the structured text editors.
-</description>
-</context>
-
-<context id="ecss0000">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="misc0180">
- <description>Use this dialog to edit the CSS content settings for a CSS file. You can specify CSS profile or restore the default by clicking <b>Restore Defaults</b>.
- </description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml b/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml
deleted file mode 100644
index f8bc39d..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="csssource_source_HelpId">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="ecss0000">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
- <context id="misc0180">
- <description>Use this dialog to edit the CSS content settings for a CSS file. You can specify CSS profile or restore the default by clicking <b>Restore Defaults</b>.
- </description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 7bdd756..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.ui.infopop; singleton:=true
-Bundle-Version: 1.0.102.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/about.html b/docs/org.eclipse.wst.sse.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/build.properties b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
deleted file mode 100644
index f92d471..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = EditorContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF/,\
-               EditorCssContexts2.xml,\
-               plugin.properties
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties b/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties
deleted file mode 100644
index 84f306f..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.sse.ui.infopop
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = SSE infopops
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
deleted file mode 100644
index 2a3796f..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorContexts.xml" plugin ="org.eclipse.wst.sse.ui"/>
-       <contexts file="EditorCssContexts2.xml" plugin ="org.eclipse.wst.sse.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index f703703..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.202.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index d9a93d8..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-
-pluginName     = Static Web infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac018..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/.cvsignore b/docs/org.eclipse.wst.webtools.doc.user/.cvsignore
deleted file mode 100644
index d1dca98..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.webtools.doc.user_1.0.0.jar
-temp
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/.project b/docs/org.eclipse.wst.webtools.doc.user/.project
deleted file mode 100644
index bd5b157..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.webtools.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml b/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
deleted file mode 100644
index 9c9ddbe..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
-			<property name="args.input" location="webtools_toc.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index cf2b706..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.webtools.doc.user; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.webtools.doc.user/about.html b/docs/org.eclipse.wst.webtools.doc.user/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/build.properties b/docs/org.eclipse.wst.webtools.doc.user/build.properties
deleted file mode 100644
index f7faab0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = plugin.xml,\
-               webtools_toc.xml,\
-               org.eclipse.wst.webtools.doc.userindex.xml,\
-               about.html,\
-               images/,\
-               topics/*htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
deleted file mode 100644
index ffafc3d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif b/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
deleted file mode 100644
index 46d245f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif b/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
deleted file mode 100644
index 7ef1a62..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
deleted file mode 100644
index 6321433..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
deleted file mode 100644
index 1a0caf6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
deleted file mode 100644
index 9c73b6a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
deleted file mode 100644
index f3c6261..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
deleted file mode 100644
index 943f756..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
deleted file mode 100644
index 889c47f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
deleted file mode 100644
index f324a63..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
deleted file mode 100644
index f596591..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
deleted file mode 100644
index 345f939..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
deleted file mode 100644
index 9cd47ee..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
deleted file mode 100644
index 55f5b1b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif b/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
deleted file mode 100644
index 407b051..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs b/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs
deleted file mode 100644
index 3a8c50a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/deletable b/docs/org.eclipse.wst.webtools.doc.user/index/deletable
deleted file mode 100644
index e423242..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
deleted file mode 100644
index c2b7f40..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

-org.eclipse.wst.webtools.doc.user=org.eclipse.wst.webtools.doc.user\n1.0.300.qualifier

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
deleted file mode 100644
index 9e7fe0e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
deleted file mode 100644
index f39e5f0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,29 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

-/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twprjset.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcresta.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twplib.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html=0

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/segments b/docs/org.eclipse.wst.webtools.doc.user/index/segments
deleted file mode 100644
index 19b5d0c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml b/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml
deleted file mode 100644
index 1caf976..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?eclipse version="3.0"?> 
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-   <plugin> 
-       <extension point="org.eclipse.help.toc">
-         	<toc file="webtools_toc.xml" /> 
-       <index path="index/"/>
-         	   </extension>  
-         	   
-        <extension point="org.eclipse.help.index">
-            <index file="org.eclipse.wst.webtools.doc.userindex.xml"/>
-   </extension>
-    </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist b/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist
deleted file mode 100644
index d9d52db..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="webtools_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="relatedlinks.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.html b/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.html
deleted file mode 100644
index 86c8662..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_42" href="#IDX1_42">B</a>
-<a name="IDX0_43" href="#IDX1_43">C</a>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_45" href="#IDX1_45">E</a>
-<a name="IDX0_46" href="#IDX1_46">F</a>
-<a name="IDX0_48" href="#IDX1_48">H</a>
-<a name="IDX0_4A" href="#IDX1_4A">J</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_52" href="#IDX1_52">R</a>
-<a name="IDX0_53" href="#IDX1_53">S</a>
-<a name="IDX0_56" href="#IDX1_56">V</a>
-<a name="IDX0_57" href="#IDX1_57">W</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_42" href="#IDX0_42">B</a></strong>
-<ul class="indexlist">
-<li>build output folders
-<ul class="indexlist">
-<li><a href="topics/twcvsr.html#twcvsr">ignoring in CVS</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
-<ul class="indexlist">
-<li>CVS
-<ul class="indexlist">
-<li><a href="topics/twcvsr.html#twcvsr">setting repository defaults</a>
-</li>
-</ul>
-</li>
-<li>cvsignore files
-<ul class="indexlist">
-<li><a href="topics/twcvsr.html#twcvsr">creating</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>DOCTYPE declarations
-<ul class="indexlist">
-<li><a href="topics/tjprefs.html#tjprefs">adding automatically</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
-<ul class="indexlist">
-<li>enterprise applications
-<ul class="indexlist">
-<li>projects
-<ul class="indexlist">
-<li><a href="topics/ccwebprj.html#ccwebprj">dynamic Web projects</a>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>exporting
-<ul class="indexlist">
-<li><a href="topics/twcrewar.html#twcrewar">WAR files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_46" href="#IDX0_46">F</a></strong>
-<ul class="indexlist">
-<li>framesets
-<ul class="indexlist">
-<li><a href="topics/tjcrehtm.html#tjcrehtm">creating</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_48" href="#IDX0_48">H</a></strong>
-<ul class="indexlist">
-<li>HTML
-<ul class="indexlist">
-<li><a href="topics/tjcrehtm.html#tjcrehtm">creating files</a>
-</li>
-</ul>
-</li>
-<li>HTML files
-<ul class="indexlist">
-<li><a href="topics/tjprefs.html#tjprefs">editing preferences</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
-<ul class="indexlist">
-<li>JSP files
-<ul class="indexlist">
-<li><a href="topics/tjcrejsp.html#tjcrejsp">creating</a>
-</li>
-</ul>
-</li>
-<li>JSP pages
-<ul class="indexlist">
-<li><a href="topics/cpdjsps.html#cpdjsps">overview</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>Project Explorer view
-<ul class="indexlist">
-<li><a href="topics/ccwebvw.html#ccwebvw">overview</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
-<ul class="indexlist">
-<li>repositories
-<ul class="indexlist">
-<li><a href="topics/twcvsr.html#twcvsr">default CVS settings</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_53" href="#IDX0_53">S</a></strong>
-<ul class="indexlist">
-<li>servers
-<ul class="indexlist">
-<li><a href="topics/tservertarget.html#tservertarget">targeting</a>
-</li>
-</ul>
-</li>
-<li>servlets
-<ul class="indexlist">
-<li><a href="topics/twsrvwiz.html#twsrvwiz">creating</a>
-</li>
-<li><a href="topics/cwservbn.html#cwservbn">overview</a>
-</li>
-</ul>
-</li>
-<li>static Web projects
-<ul class="indexlist">
-<li><a href="topics/twpcnvrt.html#twpcnvrt">converting to dynamic</a>
-</li>
-<li><a href="topics/twcresta.html#twcresta">creating</a>
-</li>
-<li><a href="topics/ccstatic.html#ccstatic">overview</a>
-</li>
-</ul>
-</li>
-<li>style sheets
-<ul class="indexlist">
-<li><a href="topics/tstylesheet.html#tstylesheet">creating</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
-<ul class="indexlist">
-<li>virtual JAR files associations
-<ul class="indexlist">
-<li><a href="topics/twplib.html#twplib">Web library projects</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_57" href="#IDX0_57">W</a></strong>
-<ul class="indexlist">
-<li>WAR files
-<ul class="indexlist">
-<li><a href="topics/twcrewar.html#twcrewar">exporting</a>
-</li>
-<li><a href="topics/twimpwar.html#twimpwar">importing</a>
-</li>
-<li><a href="topics/cwwarovr.html#cwwarovr">overview</a>
-</li>
-</ul>
-</li>
-<li>Web applications
-<ul class="indexlist">
-<li><a href="topics/cwebprojects.html#cwebprojects">creating or importing</a>
-</li>
-<li><a href="topics/ccwtover.html#ccwtover">overview</a>
-</li>
-<li><a href="topics/twcreprj.html#twcreprj">resources</a>
-</li>
-<li><a href="topics/tservertarget.html#tservertarget">server targeting</a>
-</li>
-</ul>
-</li>
-<li>Web content
-<ul class="indexlist">
-<li><a href="topics/cpdjsps.html#cpdjsps">generating dynamically</a>
-</li>
-</ul>
-</li>
-<li>Web development
-<ul class="indexlist">
-<li><a href="topics/ccwebvw.html#ccwebvw">Project Explorer view</a>
-</li>
-</ul>
-</li>
-<li>Web editors
-<ul class="indexlist">
-<li><a href="topics/cwwedtvw.html#cwwedtvw">workbench integration</a>
-</li>
-</ul>
-</li>
-<li>Web library projects
-<ul class="indexlist">
-<li><a href="topics/twplib.html#twplib">virtual JAR files and projects</a>
-</li>
-</ul>
-</li>
-<li>Web page design
-<ul class="indexlist">
-<li><a href="topics/cwebpagedesign.html#cwebpagedesign">overview</a>
-</li>
-</ul>
-</li>
-<li>Web pages
-<ul class="indexlist">
-<li><a href="topics/tjdetags.html#tjdetags">creating</a>
-</li>
-</ul>
-</li>
-<li>Web perspective
-<ul class="indexlist">
-<li><a href="topics/ccwebvw.html#ccwebvw">Project Explorer view</a>
-</li>
-</ul>
-</li>
-<li>Web projects
-<ul class="indexlist">
-<li><a href="topics/twpcnvrt.html#twpcnvrt">converting static to dynamic</a>
-</li>
-<li><a href="topics/twcreprj.html#twcreprj">creating dynamic projects</a>
-</li>
-<li><a href="topics/twcresta.html#twcresta">creating static</a>
-</li>
-<li><a href="topics/ccwebprj.html#ccwebprj">dynamic projects overview</a>
-</li>
-<li><a href="topics/twcrewar.html#twcrewar">exporting WAR files</a>
-</li>
-<li><a href="topics/cwebprojects.html#cwebprojects">overview</a>
-</li>
-<li><a href="topics/twprjset.html#twprjset">properties settings</a>
-</li>
-<li><a href="topics/ccstatic.html#ccstatic">static</a>
-</li>
-</ul>
-</li>
-<li>Web resources
-<ul class="indexlist">
-<li><a href="topics/cwebresources.html#cwebresources">overview</a>
-</li>
-</ul>
-</li>
-<li>Web servers
-<ul class="indexlist">
-<li><a href="topics/cwservbn.html#cwservbn">generating dynamic content</a>
-</li>
-</ul>
-</li>
-<li>Web tools
-<ul class="indexlist">
-<li><a href="topics/cwtfeatures.html#cwtfeatures">features</a>
-</li>
-</ul>
-</li>
-<li>WML
-<ul class="indexlist">
-<li><a href="topics/tjcrehtm.html#tjcrehtm">creating files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XHTML
-<ul class="indexlist">
-<li><a href="topics/tjcrehtm.html#tjcrehtm">creating files</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml b/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml
deleted file mode 100644
index 83ed10a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="Web applications">
-    <entry keyword="overview">
-      <topic href="topics/ccwtover.html#ccwtover" title="Web application overview"/>
-    </entry>
-    <entry keyword="creating or importing">
-      <topic href="topics/cwebprojects.html#cwebprojects" title="Web projects"/>
-    </entry>
-    <entry keyword="resources">
-      <topic href="topics/twcreprj.html#twcreprj" title="Creating a dynamic Web project"/>
-    </entry>
-    <entry keyword="server targeting">
-      <topic href="topics/tservertarget.html#tservertarget" title="Server targeting for Web applications"/>
-    </entry>
-  </entry>
-  <entry keyword="Web tools">
-    <entry keyword="features">
-      <topic href="topics/cwtfeatures.html#cwtfeatures" title="Web tools features"/>
-    </entry>
-  </entry>
-  <entry keyword="Project Explorer view">
-    <entry keyword="overview">
-      <topic href="topics/ccwebvw.html#ccwebvw" title="Project Explorer view and Web development"/>
-    </entry>
-  </entry>
-  <entry keyword="Web development">
-    <entry keyword="Project Explorer view">
-      <topic href="topics/ccwebvw.html#ccwebvw" title="Project Explorer view and Web development"/>
-    </entry>
-  </entry>
-  <entry keyword="Web perspective">
-    <entry keyword="Project Explorer view">
-      <topic href="topics/ccwebvw.html#ccwebvw" title="Project Explorer view and Web development"/>
-    </entry>
-  </entry>
-  <entry keyword="Web resources">
-    <entry keyword="overview">
-      <topic href="topics/cwebresources.html#cwebresources" title="Web resources"/>
-    </entry>
-  </entry>
-  <entry keyword="Web page design">
-    <entry keyword="overview">
-      <topic href="topics/cwebpagedesign.html#cwebpagedesign" title="Web page design"/>
-    </entry>
-  </entry>
-  <entry keyword="Web projects">
-    <entry keyword="overview">
-      <topic href="topics/cwebprojects.html#cwebprojects" title="Web projects"/>
-    </entry>
-    <entry keyword="creating dynamic projects">
-      <topic href="topics/twcreprj.html#twcreprj" title="Creating a dynamic Web project"/>
-    </entry>
-    <entry keyword="dynamic projects overview">
-      <topic href="topics/ccwebprj.html#ccwebprj" title="Dynamic Web projects and applications"/>
-    </entry>
-    <entry keyword="creating static">
-      <topic href="topics/twcresta.html#twcresta" title="Creating a static Web project"/>
-    </entry>
-    <entry keyword="converting static to dynamic">
-      <topic href="topics/twpcnvrt.html#twpcnvrt" title="Converting static Web projects to dynamic Web projects"/>
-    </entry>
-    <entry keyword="static">
-      <topic href="topics/ccstatic.html#ccstatic" title="Static Web projects"/>
-    </entry>
-    <entry keyword="exporting WAR files">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-    <entry keyword="properties settings">
-      <topic href="topics/twprjset.html#twprjset" title="Setting Web project properties"/>
-    </entry>
-  </entry>
-  <entry keyword="WAR files">
-    <entry keyword="overview">
-      <topic href="topics/cwwarovr.html#cwwarovr" title="Web archive (WAR) files"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/twimpwar.html#twimpwar" title="Importing Web archive (WAR) files"/>
-    </entry>
-    <entry keyword="exporting">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-  </entry>
-  <entry keyword="enterprise applications">
-    <entry keyword="projects">
-      <entry keyword="dynamic Web projects">
-        <topic href="topics/ccwebprj.html#ccwebprj" title="Dynamic Web projects and applications"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="static Web projects">
-    <entry keyword="creating">
-      <topic href="topics/twcresta.html#twcresta" title="Creating a static Web project"/>
-    </entry>
-    <entry keyword="converting to dynamic">
-      <topic href="topics/twpcnvrt.html#twpcnvrt" title="Converting static Web projects to dynamic Web projects"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/ccstatic.html#ccstatic" title="Static Web projects"/>
-    </entry>
-  </entry>
-  <entry keyword="exporting">
-    <entry keyword="WAR files">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-  </entry>
-  <entry keyword="Web library projects">
-    <entry keyword="virtual JAR files and projects">
-      <topic href="topics/twplib.html#twplib" title="Adding Web library projects"/>
-    </entry>
-  </entry>
-  <entry keyword="virtual JAR files associations">
-    <entry keyword="Web library projects">
-      <topic href="topics/twplib.html#twplib" title="Adding Web library projects"/>
-    </entry>
-  </entry>
-  <entry keyword="Web editors">
-    <entry keyword="workbench integration">
-      <topic href="topics/cwwedtvw.html#cwwedtvw" title="Workbench integration with Web editors"/>
-    </entry>
-  </entry>
-  <entry keyword="Web pages">
-    <entry keyword="creating">
-      <topic href="topics/tjdetags.html#tjdetags" title="Creating and editing Web pages - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="framesets">
-    <entry keyword="creating">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="WML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="XHTML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="DOCTYPE declarations">
-    <entry keyword="adding automatically">
-      <topic href="topics/tjprefs.html#tjprefs" title="Defining HTML file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML files">
-    <entry keyword="editing preferences">
-      <topic href="topics/tjprefs.html#tjprefs" title="Defining HTML file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="style sheets">
-    <entry keyword="creating">
-      <topic href="topics/tstylesheet.html#tstylesheet" title="Creating cascading style sheets"/>
-    </entry>
-  </entry>
-  <entry keyword="servlets">
-    <entry keyword="creating">
-      <topic href="topics/twsrvwiz.html#twsrvwiz" title="Creating servlets"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cwservbn.html#cwservbn" title="Servlets"/>
-    </entry>
-  </entry>
-  <entry keyword="Web servers">
-    <entry keyword="generating dynamic content">
-      <topic href="topics/cwservbn.html#cwservbn" title="Servlets"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP files">
-    <entry keyword="creating">
-      <topic href="topics/tjcrejsp.html#tjcrejsp" title="Creating JavaServer Pages (JSP) files"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP pages">
-    <entry keyword="overview">
-      <topic href="topics/cpdjsps.html#cpdjsps" title="JavaServer Pages (JSP) technology"/>
-    </entry>
-  </entry>
-  <entry keyword="Web content">
-    <entry keyword="generating dynamically">
-      <topic href="topics/cpdjsps.html#cpdjsps" title="JavaServer Pages (JSP) technology"/>
-    </entry>
-  </entry>
-  <entry keyword="build output folders">
-    <entry keyword="ignoring in CVS">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="CVS">
-    <entry keyword="setting repository defaults">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="cvsignore files">
-    <entry keyword="creating">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="repositories">
-    <entry keyword="default CVS settings">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="servers">
-    <entry keyword="targeting">
-      <topic href="topics/tservertarget.html#tservertarget" title="Server targeting for Web applications"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.properties b/docs/org.eclipse.wst.webtools.doc.user/plugin.properties
deleted file mode 100644
index acba026..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-
-pluginName   = Web tools documentation
-providerName = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml b/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
deleted file mode 100644
index 1caf976..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?eclipse version="3.0"?> 
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-   <plugin> 
-       <extension point="org.eclipse.help.toc">
-         	<toc file="webtools_toc.xml" /> 
-       <index path="index/"/>
-         	   </extension>  
-         	   
-        <extension point="org.eclipse.help.index">
-            <index file="org.eclipse.wst.webtools.doc.userindex.xml"/>
-   </extension>
-    </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap b/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
deleted file mode 100644
index 2a26dff..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//IBM//DTD DITA IBM Map//EN"

- "ibm-map.dtd">

-<map title="Web tools related links"><?Pub Caret1?>

-<reltable>

-<relheader>

-<relcolspec type="concept"></relcolspec>

-<relcolspec type="task"></relcolspec>

-<relcolspec type="reference"></relcolspec>

-</relheader>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/tjchgxdt.dita" navtitle="Specifying an implicit document type for an HTML, XHTML, or JSP fragment">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrehtm.dita" navtitle="Creating HTML and XHTML files and framesets">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrejsp.dita" navtitle="Creating JavaServer Pages (JSP) files">

-</topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family">

-<topicref href="topics/tservertarget.dita" navtitle="Server targeting for Web applications">

-</topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" navtitle="Creating a dynamic Web project">

-</topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" navtitle="Creating a static Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files" scope="peer">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twcrewar.dita" navtitle="Exporting Web Archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twcvsr.dita" navtitle="Setting CVS repository defaults"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files" scope="peer">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" navtitle="Importing Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications"

-scope="peer"></topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twpcnvrt.dita" navtitle="Converting static Web projects to dynamic Web projects">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twplib.dita" navtitle="Adding Web library projects">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twprjset.dita" navtitle="Setting Web project properties">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwservbn.dita" linking="targetonly" navtitle="Servlets"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twsrvwiz.dita" navtitle="Creating servlets"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwebvw.dita" navtitle="Project Explorer view and Web development">

-</topicref>

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview"

-scope="peer"></topicref>

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology"

-scope="peer"></topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" linking="targetonly" navtitle="Importing Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview">

-</topicref>

-<topicref href="topics/cwtfeatures.dita" linking="targetonly" navtitle="Web tools features">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer">

-<topicref href="topics/tjdetags.dita" linking="targetonly" navtitle="Creating and editing Web pages - overview">

-</topicref>

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwtfeatures.dita" navtitle="Web tools features"></topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwebpagedesign.dita" linking="targetonly" navtitle="Web page design">

-</topicref>

-<!-- <topicref href="topics/cwebtechnologies.dita" linking="targetonly" navtitle="Web technologies">

-</topicref> -->

-</relcell>

-<relcell>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-<topicref href="topics/twsrvwiz.dita" linking="targetonly" navtitle="Creating servlets"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<!-- <topicref href="topics/cwebtechnologies.dita" navtitle="Web technologies">

-</topicref> -->

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-<topicref href="topics/cwservbn.dita" linking="targetonly" navtitle="Servlets">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwservbn.dita" navtitle="Servlets"></topicref>

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell>

-<topicref href="topics/twsrvwiz.dita" linking="targetonly" navtitle="Creating servlets"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccstatic.dita" linking="targetonly" navtitle="Static Web projects">

-</topicref>

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrehtm.dita" linking="targetonly" navtitle="Creating HTML and XHTML files and framesets"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-<topicref href="topics/cwwedtvw.dita" linking="targetonly" navtitle="Workbench integration with Web editors">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/tjprefs.dita" linking="targetonly" navtitle="Defining HTML file preferences">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects"></topicref>

-<topicref href="topics/ccstatic.dita" linking="targetonly" navtitle="Static Web projects">

-</topicref>

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects"></topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebpagedesign.dita" navtitle="Web page design"></topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjdetags.dita" linking="targetonly" navtitle="Creating and editing Web pages - overview">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebresources.dita" navtitle="Web resources"></topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwwedtvw.dita" navtitle="Workbench integration with Web editors">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files">

-</topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" linking="targetonly" navtitle="Importing Web archive (WAR) files"

-scope="peer"></topicref>

-<topicref href="topics/twcrewar.dita" linking="targetonly" navtitle="Exporting Web Archive (WAR) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjdetags.dita" navtitle="Creating and editing Web pages - overview">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/tjprefs.dita" navtitle="Defining HTML file preferences">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-</reltable>

-</map>

-<?Pub *0000014944?>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita
deleted file mode 100644
index 7e809fb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccstatic" xml:lang="en-us">

-<title>Static Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>static</indexterm></indexterm>

-<indexterm>static Web projects<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>If you  want to create a content-based Web application that does not contain

-any dynamic content  (such as servlets, JSP files, filters, and associated

-metadata) you might prefer to create a static Web project, as opposed to a <xref

-href="ccwebprj.dita" scope="peer"><desc></desc>dynamic Web project</xref>.</p>

-<p>Static Web projects have the following characteristics:  <ul>

-<li>a Web content folder (called WebContent) for all publishable resources,

-You can change the name of this folder from the project's pop-up menu.</li>

-<li>a Theme folder, the suggested directory for storing cascading style sheets

-and other style-related objects.</li>

-<li>the ability to define folders outside of the Web content folder, for storing

-intermediate files, such as MIF files</li>

-<li>a conversion path from a static Web project to a dynamic Web project.

-If you decide to <xref href="twpcnvrt.dita" scope="peer"><desc></desc>convert</xref> the

-project, it will be a fully-valid dynamic Web project. </li>

-</ul></p>

-<p>In addition, your project will still have the following features (which

-are common to both static and dynamic Web projects ) : <ul>

-<li>HTML syntax validation</li>

-<li>a broken link fix-up wizard</li>

-<li>a Web site navigation tool</li>

-<li>a new server type, the Static Web server, which makes it easy to publish

-static Web projects</li>

-</ul> </p>

-<p>The folder that a static Web project is published to is modifiable, so

-that when you set the publishing "root" value (called a <i>context root</i>),

-such as <codeph>/web1</codeph>, for a static project, everything in the Web

-content folder will be published to the <filepath>web1</filepath> folder under

-the Web server's doc root. This enables you to group Web resources on a Web

-server in folders that correspond to Web projects in the workbench. When projects

-defined in this way are ready for production, you can publish specific projects

-directly to the doc root by changing the value to <codeph>/</codeph> and all

-publishing, link fixing, and browsing will update automatically.</p>

-<p>Aliases can also be used to specify a context root value. For example,

-suppose that there is an alias that is defined on the target Web server, as

-follows: <codeblock>Alias /scripts/ "/var/www/scripts"</codeblock>In this

-example, in which the current static Web project will contain common <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> files,

-you can set the context root value to be <ph>"scripts"</ph>.  In order for

-the resources in the static Web project to be published to the correct location

-on the Web server, you must add this Alias mapping to the server tools instance

-of the static Web server, as follows.  <ol>

-<li>From the Server view, double-click on the static Web server configuration

-to open the server configuration editor.<note>This assumes that you've already

-defined the static Web server.</note></li>

-<li>Click the <uicontrol>Configuration</uicontrol> editor tab.</li>

-<li>Scroll down to the <uicontrol>Alias Path Mapping</uicontrol> section,

-and add the new Alias mapping.</li>

-</ol>Now that <ph>"scripts"</ph> is defined as an Alias, the Web content in

-the static Web project will be published to the mapped path, <filepath>/var/www/scripts</filepath>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
deleted file mode 100644
index ae164c9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Static Web projects" />
-<meta content="Web projects, static, static Web projects, overview" name="DC.subject" />
-<meta content="Web projects, static, static Web projects, overview" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccstatic" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Static Web projects</title>
-</head>
-<body id="ccstatic"><a name="ccstatic"><!-- --></a>
-
-
-<h1 class="topictitle1">Static Web projects</h1>
-
-
-<div>
-<p>If you  want to create a content-based Web application that does not contain
-any dynamic content  (such as servlets, JSP files, filters, and associated
-metadata) you might prefer to create a static Web project, as opposed to a <a href="ccwebprj.html" title="">dynamic Web project</a>.</p>
-
-<div class="p">Static Web projects have the following characteristics:  <ul>
-<li>a Web content folder (called WebContent) for all publishable resources,
-You can change the name of this folder from the project's pop-up menu.</li>
-
-<li>a Theme folder, the suggested directory for storing cascading style sheets
-and other style-related objects.</li>
-
-<li>the ability to define folders outside of the Web content folder, for storing
-intermediate files, such as MIF files</li>
-
-<li>a conversion path from a static Web project to a dynamic Web project.
-If you decide to <a href="twpcnvrt.html" title="">convert</a> the
-project, it will be a fully-valid dynamic Web project. </li>
-
-</ul>
-</div>
-
-<div class="p">In addition, your project will still have the following features (which
-are common to both static and dynamic Web projects ) : <ul>
-<li>HTML syntax validation</li>
-
-<li>a broken link fix-up wizard</li>
-
-<li>a Web site navigation tool</li>
-
-<li>a new server type, the Static Web server, which makes it easy to publish
-static Web projects</li>
-
-</ul>
- </div>
-
-<p>The folder that a static Web project is published to is modifiable, so
-that when you set the publishing "root" value (called a <em>context root</em>),
-such as <samp class="codeph">/web1</samp>, for a static project, everything in the Web
-content folder will be published to the <span class="filepath">web1</span> folder under
-the Web server's doc root. This enables you to group Web resources on a Web
-server in folders that correspond to Web projects in the workbench. When projects
-defined in this way are ready for production, you can publish specific projects
-directly to the doc root by changing the value to <samp class="codeph">/</samp> and all
-publishing, link fixing, and browsing will update automatically.</p>
-
-<div class="p">Aliases can also be used to specify a context root value. For example,
-suppose that there is an alias that is defined on the target Web server, as
-follows: <pre>Alias /scripts/ "/var/www/scripts"</pre>
-In this
-example, in which the current static Web project will contain common JavaScript™ files,
-you can set the context root value to be <span>"scripts"</span>.  In order for
-the resources in the static Web project to be published to the correct location
-on the Web server, you must add this Alias mapping to the server tools instance
-of the static Web server, as follows.  <ol>
-<li>From the Server view, double-click on the static Web server configuration
-to open the server configuration editor.<div class="note"><span class="notetitle">Note:</span> This assumes that you've already
-defined the static Web server.</div>
-</li>
-
-<li>Click the <span class="uicontrol">Configuration</span> editor tab.</li>
-
-<li>Scroll down to the <span class="uicontrol">Alias Path Mapping</span> section,
-and add the new Alias mapping.</li>
-
-</ol>
-Now that <span>"scripts"</span> is defined as an Alias, the Web content in
-the static Web project will be published to the mapped path, <span class="filepath">/var/www/scripts</span>.</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita
deleted file mode 100644
index ade1bbb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccwebprj" xml:lang="en-us">

-<title>Dynamic Web projects and applications</title>

-<prolog><metadata>

-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>dynamic Web projects</indexterm></indexterm></indexterm>

-<indexterm>Web projects<indexterm>dynamic projects overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two types of Web projects: dynamic and <xref href="ccstatic.dita"

-scope="peer"><desc></desc>static</xref>. Dynamic web projects can contain

-dynamic J2EE resources such as servlets, JSP files, filters, and associated

-metadata, in addition to static resources such as images and HTML files. Static

-web projects only contains static resources. When you create Web projects,

-you can include cascading style sheets and JSP tag libraries (for dynamic

-Web projects), so that you can begin development with a richer set of project

-resources.</p>

-<p>Dynamic Web projects are always imbedded in Enterprise Application projects.

-The wizard that you use to create a dynamic Web project will also create an

-Enterprise Application (EAR) project if it does not already exist. The wizard

-will also update the <filepath>application.xml</filepath> deployment descriptor

-of the specified Enterprise Application project to define the Web project

-as a module element. If you are importing a WAR file rather than creating

-a dynamic Web project new, the WAR Import wizard requires that you specify

-a Web project, which already requires an EAR project. </p>

-<p>J2EE conventions may represent extra overhead if you only want to create

-a static, content-based Web application, which contains no dynamic files,

-such as JSP files or servlets. In this case, when you need only the most basic

-Web project, you might want to use the <i>static</i> Web project type (see <xref

-href="ccstatic.dita" scope="peer"><desc></desc>Static Web projects</xref>).

- Note that static Web projects can  be converted to dynamic Web projects by

-selecting <b>Convert to a Dynamic Web Project</b>, from the Project menu.</p>

-<p>The J2EE model, and more specifically, the <cite>Sun Microsystems <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite>, defines a Web application directory structure that

-specifies the location of Web content files, class files, class paths, deployment

-descriptors, and supporting metadata. The Web project hierarchy mirrors that

-of the Web application created from a project. In the workbench, you can use

-the <ph>New Web Project</ph> wizard to create a new Web project.</p>

-<p>The main project folder contains all development objects related to a Web

-application. The Web content folder contains the elements of the project necessary

-to create a Web application. This folder structure maps to the Web application

-archive (WAR) structure defined by Sun Microsystems.. The following default

-elements are located in the Web project folder hierarchy: <note>In the Project

-Explorer view, Web projects are filtered into folder nodes to customize the

-display of Web resources for easy management during development. For information

-on the filtered structure, see <xref href="ccwebvw.dita" scope="peer"><desc></desc>Project

-Explorer view</xref>.</note><dl><dlentry>

-<dt>Web Deployment Descriptor</dt>

-<dd>The standard Web application deployment descriptor (the <filepath>web.xml</filepath> file).</dd>

-</dlentry><dlentry>

-<dt>JavaSource</dt>

-<dd>Contains the project's <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> source code for classes, beans, and

-servlets. When these resources are added to a Web project, they are automatically

-compiled and the generated files are added to the WEB-INF/classes directory.

-The contents of the source directory are not packaged in WAR files unless

-an option is specified when a WAR file is created. <note>Though the default

-name given to the folder is JavaSources, you can change the name by right

-clicking on the name in the Project Explorer and clicking on <menucascade>

-<uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol></menucascade>.</note></dd>

-</dlentry><dlentry>

-<dt>imported_classes folder</dt>

-<dd>This folder may be created during a WAR import, and contains class files

-that do not have accompanying source.  The <uicontrol>imported_classes</uicontrol> folder

-is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes

-folder; <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> classes folders can also be created using the Web

-project <uicontrol>Java Build Path</uicontrol> properties page.</dd>

-</dlentry><dlentry>

-<dt>WebContent folder</dt>

-<dd>The mandatory location of all Web resources, including HTML, JSP, graphic

-files, and so on. If the files are not placed in this directory (or in a subdirectory

-structure under this directory), the files will not be available when the

-application is executed on a server. The Web content folder represents the

-contents of the WAR file that will be deployed to the server. Any files not

-under the Web content folder are considered development-time resources (for

-example, .java files, .sql files, and .mif files), and are not deployed when

-the project is unit tested or published. <note>Though the default name given

-to the folder is <filepath>WebContent</filepath>, you can change the name

- in the Project Explorer by right-clicking the folder and selecting <uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol> or

-from the Web page of the project's Properties dialog. In a dynamic Web project,

-changing the folder name will update the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build output directory. </note></dd>

-</dlentry><dlentry>

-<dt>META-INF</dt>

-<dd>This directory contains the <filepath>MANIFEST.MF</filepath> file, which

-is used to map class paths for dependent JAR files that exist in other projects

-in the same Enterprise Application project. An entry in this file will update

-the run-time project class path and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build settings to include the referenced

-JAR files.</dd>

-</dlentry><dlentry>

-<dt>theme</dt>

-<dd>The suggested directory for cascading style sheets and other style-related

-objects.</dd>

-</dlentry><dlentry>

-<dt>WEB-INF</dt>

-<dd>Based on the <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite>, this

-directory contains the supporting Web resources for a Web application, including

-the <filepath>web.xml</filepath> file and the classes and lib directories.</dd>

-</dlentry><dlentry>

-<dt>/classes</dt>

-<dd>This directory is for servlets, utility classes, and the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-output directory. The classes in this directory are used by the application

-class loader to load the classes. Folders in this directory will map package

-and class names, as in: <codeph>/WEB-INF/classes/com/mycorp/servlets/MyServlet.class</codeph>.<p>Do

-not place any .class files directly into this directory. The .class files

-are placed in this directory automatically when the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-compiles <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> source files that are in the <filepath>Java Resources</filepath> directory.

-Any files placed directly in this directory will be deleted by the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-when it runs.</p></dd>

-</dlentry><dlentry>

-<dt>/lib</dt>

-<dd>The supporting JAR files that your Web application references. Any classes

-in .jar files placed in this directory will be available for your Web application</dd>

-</dlentry><dlentry>

-<dt>Libraries</dt>

-<dd>The supporting JAR files that your Web application references. This folder

-mirrors the content of the lib folder. In addition, Web Library Projects,

-which are "virtual" JAR files that do not physically reside in the Web project,

-but are associated with <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> projects elsewhere in your workspace,

-are included in this folder. They are packaged with your project when you

-export the application's WAR file.</dd>

-</dlentry></dl> <note>A library entry on the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build path will remain there unless

-the actual JAR file is deleted from the WEB-INF/lib folder. If you remove

-a library path entry but not the JAR file, the library entry will be re-added

-to the path automatically.</note></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
deleted file mode 100644
index 9ac3b45..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Dynamic Web projects and applications" />
-<meta content="Web projects, dynamic, overview, dynamic Web projects" name="DC.subject" />
-<meta content="Web projects, dynamic, overview, dynamic Web projects" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwebprj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Dynamic Web projects and applications</title>
-</head>
-<body id="ccwebprj"><a name="ccwebprj"><!-- --></a>
-
-
-<h1 class="topictitle1">Dynamic Web projects and applications</h1>
-
-
-<div>
-<p>There are two types of Web projects: dynamic and <a href="ccstatic.html" title="">static</a>. Dynamic web projects can contain
-dynamic J2EE resources such as servlets, JSP files, filters, and associated
-metadata, in addition to static resources such as images and HTML files. Static
-web projects only contains static resources. When you create Web projects,
-you can include cascading style sheets and JSP tag libraries (for dynamic
-Web projects), so that you can begin development with a richer set of project
-resources.</p>
-
-<p>Dynamic Web projects are always imbedded in Enterprise Application projects.
-The wizard that you use to create a dynamic Web project will also create an
-Enterprise Application (EAR) project if it does not already exist. The wizard
-will also update the <span class="filepath">application.xml</span> deployment descriptor
-of the specified Enterprise Application project to define the Web project
-as a module element. If you are importing a WAR file rather than creating
-a dynamic Web project new, the WAR Import wizard requires that you specify
-a Web project, which already requires an EAR project. </p>
-
-<p>J2EE conventions may represent extra overhead if you only want to create
-a static, content-based Web application, which contains no dynamic files,
-such as JSP files or servlets. In this case, when you need only the most basic
-Web project, you might want to use the <em>static</em> Web project type (see <a href="ccstatic.html" title="">Static Web projects</a>).
- Note that static Web projects can  be converted to dynamic Web projects by
-selecting <strong>Convert to a Dynamic Web Project</strong>, from the Project menu.</p>
-
-<p>The J2EE model, and more specifically, the <cite>Sun Microsystems Java™ Servlet
-2.3 Specification</cite>, defines a Web application directory structure that
-specifies the location of Web content files, class files, class paths, deployment
-descriptors, and supporting metadata. The Web project hierarchy mirrors that
-of the Web application created from a project. In the workbench, you can use
-the <span>New Web Project</span> wizard to create a new Web project.</p>
-
-<div class="p">The main project folder contains all development objects related to a Web
-application. The Web content folder contains the elements of the project necessary
-to create a Web application. This folder structure maps to the Web application
-archive (WAR) structure defined by Sun Microsystems.. The following default
-elements are located in the Web project folder hierarchy: <div class="note"><span class="notetitle">Note:</span> In the Project
-Explorer view, Web projects are filtered into folder nodes to customize the
-display of Web resources for easy management during development. For information
-on the filtered structure, see <a href="ccwebvw.html" title="">Project Explorer view</a>.</div>
-<dl>
-<dt class="dlterm">Web Deployment Descriptor</dt>
-
-<dd>The standard Web application deployment descriptor (the <span class="filepath">web.xml</span> file).</dd>
-
-
-<dt class="dlterm">JavaSource</dt>
-
-<dd>Contains the project's Java source code for classes, beans, and
-servlets. When these resources are added to a Web project, they are automatically
-compiled and the generated files are added to the WEB-INF/classes directory.
-The contents of the source directory are not packaged in WAR files unless
-an option is specified when a WAR file is created. <div class="note"><span class="notetitle">Note:</span> Though the default
-name given to the folder is JavaSources, you can change the name by right
-clicking on the name in the Project Explorer and clicking on <span class="menucascade">
-<span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span></span>.</div>
-</dd>
-
-
-<dt class="dlterm">imported_classes folder</dt>
-
-<dd>This folder may be created during a WAR import, and contains class files
-that do not have accompanying source.  The <span class="uicontrol">imported_classes</span> folder
-is a Java classes
-folder; Java classes folders can also be created using the Web
-project <span class="uicontrol">Java Build Path</span> properties page.</dd>
-
-
-<dt class="dlterm">WebContent folder</dt>
-
-<dd>The mandatory location of all Web resources, including HTML, JSP, graphic
-files, and so on. If the files are not placed in this directory (or in a subdirectory
-structure under this directory), the files will not be available when the
-application is executed on a server. The Web content folder represents the
-contents of the WAR file that will be deployed to the server. Any files not
-under the Web content folder are considered development-time resources (for
-example, .java files, .sql files, and .mif files), and are not deployed when
-the project is unit tested or published. <div class="note"><span class="notetitle">Note:</span> Though the default name given
-to the folder is <span class="filepath">WebContent</span>, you can change the name
- in the Project Explorer by right-clicking the folder and selecting <span class="uicontrol">Refactor</span><span class="uicontrol">Rename</span> or
-from the Web page of the project's Properties dialog. In a dynamic Web project,
-changing the folder name will update the Java build output directory. </div>
-</dd>
-
-
-<dt class="dlterm">META-INF</dt>
-
-<dd>This directory contains the <span class="filepath">MANIFEST.MF</span> file, which
-is used to map class paths for dependent JAR files that exist in other projects
-in the same Enterprise Application project. An entry in this file will update
-the run-time project class path and Java build settings to include the referenced
-JAR files.</dd>
-
-
-<dt class="dlterm">theme</dt>
-
-<dd>The suggested directory for cascading style sheets and other style-related
-objects.</dd>
-
-
-<dt class="dlterm">WEB-INF</dt>
-
-<dd>Based on the <cite>Sun Microsystems Java Servlet 2.3 Specification</cite>, this
-directory contains the supporting Web resources for a Web application, including
-the <span class="filepath">web.xml</span> file and the classes and lib directories.</dd>
-
-
-<dt class="dlterm">/classes</dt>
-
-<dd>This directory is for servlets, utility classes, and the Java compiler
-output directory. The classes in this directory are used by the application
-class loader to load the classes. Folders in this directory will map package
-and class names, as in: <samp class="codeph">/WEB-INF/classes/com/mycorp/servlets/MyServlet.class</samp>.<p>Do
-not place any .class files directly into this directory. The .class files
-are placed in this directory automatically when the Java compiler
-compiles Java source files that are in the <span class="filepath">Java Resources</span> directory.
-Any files placed directly in this directory will be deleted by the Java compiler
-when it runs.</p>
-</dd>
-
-
-<dt class="dlterm">/lib</dt>
-
-<dd>The supporting JAR files that your Web application references. Any classes
-in .jar files placed in this directory will be available for your Web application</dd>
-
-
-<dt class="dlterm">Libraries</dt>
-
-<dd>The supporting JAR files that your Web application references. This folder
-mirrors the content of the lib folder. In addition, Web Library Projects,
-which are "virtual" JAR files that do not physically reside in the Web project,
-but are associated with Java projects elsewhere in your workspace,
-are included in this folder. They are packaged with your project when you
-export the application's WAR file.</dd>
-
-</dl>
- <div class="note"><span class="notetitle">Note:</span> A library entry on the Java build path will remain there unless
-the actual JAR file is deleted from the WEB-INF/lib folder. If you remove
-a library path entry but not the JAR file, the library entry will be re-added
-to the path automatically.</div>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
deleted file mode 100644
index cc86113..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccwebvw" xml:lang="en-us">

-<title>Project Explorer view and Web development</title>

-<prolog><metadata>

-<keywords><indexterm>Project Explorer view<indexterm>overview</indexterm></indexterm>

-<indexterm>Web development<indexterm>Project Explorer view</indexterm></indexterm>

-<indexterm>Web perspective<indexterm>Project Explorer view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<section><p>The Project Explorer view provides the following notable features: <ul>

-<li><image alt="For Windows" href="../images/nwin.gif" placement="inline">

-</image> You can drag and drop files from <tm tmclass="special" tmowner="Microsoft Corporation"

-tmtype="reg" trademark="Windows">Windows</tm> Explorer or the desktop into

-the Navigator view.</li>

-<li>View filtering is supported by selecting <ph><uicontrol>Filters</uicontrol></ph> from

-the Navigator view <ph><uicontrol>Menu</uicontrol></ph> button. Resources

-can be filtered by name, project type or content type. Files beginning with

-a period are filtered out by default.</li>

-<li>The status line shows the full path of the selected resource.</li>

-<li>Dragging a .java file from the Navigator view into a JSP file will insert

-a usebean tag, the same behavior that is exhibited when a .class file is dragged

-into a JSP file.</li>

-<li>Errors and warnings on resources (including <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm>, HTML/JSP, and Links Builder errors

-and warnings) are indicated with a red error <image alt="Error icon" href="../images/nshowerr.gif"

-placement="inline"></image> or yellow warning <image alt="Warning icon" href="../images/nwarning.gif"

-placement="inline"></image> next to the resource with the error, as well as

-the parent containers up to the project. This applies for all project types,

-not only Web projects.</li>

-<li>Items available from the <ph><uicontrol>New</uicontrol></ph> cascading

-menu in the project pop-up menu are context sensitive.  All menus will have <ph><uicontrol>Project</uicontrol></ph> and <ph><uicontrol>Other</uicontrol

-></ph> options.</li>

-</ul></p></section>

-<section><title>Organization of the Project Explorer view</title><p>The Project

-Explorer view shows a custom view of all Web projects. The following are some

-of the notable top-level objects that appear beneath the project node (based

-on default folder names).</p><p><b>Web content folder</b> - This folder contains

-items to be published to the server. By default, this folder will be named <b>WebContent</b> for

-newly created static and dynamic Web projects. <note>You can change the name

-in the creation wizard Web facet page.</note><ul>

-<li><b>META-INF</b> - This directory contains the <filepath>MANIFEST.MF</filepath> file,

-which is used to map class paths for dependent JAR files that exist in other

-projects in the same Enterprise Application project. An entry in this file

-will update the run-time project class path and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build settings to include the referenced

-JAR files.</li>

-</ul><ul>

-<li><b>WEB-INF</b> - The directory where supporting Web resources for a Web

-application are kept (for example: .xmi files, .xml files, and web.xml.) </li>

-</ul> </p> </section>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
deleted file mode 100644
index b067d6d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project Explorer view and Web development" />
-<meta content="Project Explorer view, overview, Web perspective, project explorer view, version control management, turning on and off, Web development" name="DC.subject" />
-<meta content="Project Explorer view, overview, Web perspective, project explorer view, version control management, turning on and off, Web development" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwebvw" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project Explorer view and Web development</title>
-</head>
-<body id="ccwebvw"><a name="ccwebvw"><!-- --></a>
-
-
-<h1 class="topictitle1">Project Explorer view and Web development</h1>
-
-
-<div>
-<div class="section"><div class="p">The Project Explorer view provides the following notable features: <ul>
-<li><img src="../images/nwin.gif" alt="For Windows" /> You can drag and drop files from Windows<sup>®</sup> Explorer or the desktop into
-the Navigator view.</li>
-
-<li>View filtering is supported by selecting <span><span class="uicontrol">Filters</span></span> from
-the Navigator view <span><span class="uicontrol">Menu</span></span> button. Resources
-can be filtered by name, project type or content type. Files beginning with
-a period are filtered out by default.</li>
-
-<li>The status line shows the full path of the selected resource.</li>
-
-<li>Dragging a .java file from the Navigator view into a JSP file will insert
-a usebean tag, the same behavior that is exhibited when a .class file is dragged
-into a JSP file.</li>
-
-<li>Errors and warnings on resources (including Java™, HTML/JSP, and Links Builder errors
-and warnings) are indicated with a red error <img src="../images/nshowerr.gif" alt="Error icon" /> or yellow warning <img src="../images/nwarning.gif" alt="Warning icon" /> next to the resource with the error, as well as
-the parent containers up to the project. This applies for all project types,
-not only Web projects.</li>
-
-<li>Items available from the <span><span class="uicontrol">New</span></span> cascading
-menu in the project pop-up menu are context sensitive.  All menus will have <span><span class="uicontrol">Project</span></span> and <span><span class="uicontrol">Other</span></span> options.</li>
-
-</ul>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Organization of the Project Explorer view</h4><p>The Project
-Explorer view shows a custom view of all Web projects. The following are some
-of the notable top-level objects that appear beneath the project node (based
-on default folder names).</p>
-<div class="p"><strong>Web content folder</strong> - This folder contains
-items to be published to the server. By default, this folder will be named <strong>WebContent</strong> for
-newly created static and dynamic Web projects. <div class="note"><span class="notetitle">Note:</span> You can change the name
-in the creation wizard Web facet page.</div>
-<ul>
-<li><strong>META-INF</strong> - This directory contains the <span class="filepath">MANIFEST.MF</span> file,
-which is used to map class paths for dependent JAR files that exist in other
-projects in the same Enterprise Application project. An entry in this file
-will update the run-time project class path and Java build settings to include the referenced
-JAR files.</li>
-
-</ul>
-<ul>
-<li><strong>WEB-INF</strong> - The directory where supporting Web resources for a Web
-application are kept (for example: .xmi files, .xml files, and web.xml.) </li>
-
-</ul>
- </div>
- </div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita
deleted file mode 100644
index 880cc3a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002 -->

-<concept id="ccwtover" xml:lang="en-us">

-<title>Web application overview</title>

-<prolog><metadata>

-<keywords><indexterm>Web applications<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The Web development environment provides the tools you need to develop

-Web applications as defined in the <cite>Sun Microsystems <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> and the <cite>Sun Microsystems JSP 1.2 Specification</cite>.

-Web applications can be simple (consisting of only static Web pages) or they

-can be more advanced and include JavaServer Pages (JSP) files and <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> servlets.

-These resources, along with an XML deployment descriptor (and other <xref

-href="cwebresources.dita" scope="peer"><desc></desc> Web resources</xref>, are contained

-within a Web project during development. When you are ready to publish the

-Web application to the Web, you deploy the Web project to the server in the

-form of a Web archive (WAR) file . The end user can then view the Web application

-as a Web site from a URL.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
deleted file mode 100644
index 36bf69b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web application overview" />
-<meta content="Web applications, overview, development phases, information pathways" name="DC.subject" />
-<meta content="Web applications, overview, development phases, information pathways" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwtover" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web application overview</title>
-</head>
-<body id="ccwtover"><a name="ccwtover"><!-- --></a>
-
-
-<h1 class="topictitle1">Web application overview</h1>
-
-
-<div>
-<p>The Web development environment provides the tools you need to develop
-Web applications as defined in the <cite>Sun Microsystems Java™ Servlet
-2.3 Specification</cite> and the <cite>Sun Microsystems JSP 1.2 Specification</cite>.
-Web applications can be simple (consisting of only static Web pages) or they
-can be more advanced and include JavaServer Pages (JSP) files and Java servlets.
-These resources, along with an XML deployment descriptor (and other <a href="cwebresources.html" title="">Web resources</a>, are contained
-within a Web project during development. When you are ready to publish the
-Web application to the Web, you deploy the Web project to the server in the
-form of a Web archive (WAR) file . The end user can then view the Web application
-as a Web site from a URL.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
deleted file mode 100644
index 07a94f1..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cpdjsps" xml:lang="en-us">

-<title>JavaServer Pages (JSP) technology</title>

-<prolog><metadata>

-<keywords><indexterm>JSP pages<indexterm>overview</indexterm></indexterm>

-<indexterm>Web content<indexterm>generating dynamically</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The JavaServer Pages technology enables you to generate dynamic web content,

-such as HTML, DHTML, XHTML, and XML files, to include in a Web application.

-JSP files are one way to implement server-side dynamic page content. JSP files

-allow a Web server, such as Apache Tomcat, to add content dynamically to your

-HTML pages before they are sent to a requesting browser.</p>

-<p>When you deploy a JSP file to a Web server that provides a servlet engine,

-it is preprocessed into a servlet that runs on the Web server. This is in

-contrast with client-side <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> (within <codeph>&lt;SCRIPT></codeph> tags),

-which is run in a browser. A JSP page is ideal for tasks that are better suited

-to execution on the server, such as accessing databases or calling Enterprise <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans.</p>

-<p>You can create and edit a JSP file in the HTML editor by adding your own

-text and images using HTML, JSP tagging, or <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, including <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source

-code inside of scriptlet tags. Typically, JSP files have the file extension

-.jsp. Additionally, the JSP specification suggests that JSP fragment files

-should have file extension .jspf. If this convention is not followed, the

-JSP validator will treat JSP fragments as regular standalone JSP files, and

-compilation errors might be reported.</p>

-<p>The <cite>Sun Microsystems JSP 1.2 Specification</cite> provides the ability

-to create custom JSP tags. Custom tags simplify complex actions and  provide

-developers with greater control over page content. Custom tags are collected

-into a library (taglib). A tag library descriptor file (taglib.tld) is an

-XML document that provides information about the tag library, including the

-taglib short name, library description, and tag descriptions. Refer to the <cite>Sun

-Microsystems JSP 1.2 Specification</cite> for more details.</p>

-<p>To use JSP 1.2 custom taglibs, you can import the tag library .tld and

-.jar files into your project to use them, or associate them as Web Library

-projects. You can also reference a TLD file by using a URI.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
deleted file mode 100644
index 183a375..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="JavaServer Pages (JSP) technology" />
-<meta content="JavaServer pages, overview, dynamic Web content, generating" name="DC.subject" />
-<meta content="JavaServer pages, overview, dynamic Web content, generating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cpdjsps" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>JavaServer Pages (JSP) technology</title>
-</head>
-<body id="cpdjsps"><a name="cpdjsps"><!-- --></a>
-
-
-<h1 class="topictitle1">JavaServer Pages (JSP) technology</h1>
-
-
-<div>
-<p>The JavaServer Pages technology enables you to generate dynamic web content,
-such as HTML, DHTML, XHTML, and XML files, to include in a Web application.
-JSP files are one way to implement server-side dynamic page content. JSP files
-allow a Web server, such as Apache Tomcat, to add content dynamically to your
-HTML pages before they are sent to a requesting browser.</p>
-
-<p>When you deploy a JSP file to a Web server that provides a servlet engine,
-it is preprocessed into a servlet that runs on the Web server. This is in
-contrast with client-side JavaScript™ (within <samp class="codeph">&lt;SCRIPT&gt;</samp> tags),
-which is run in a browser. A JSP page is ideal for tasks that are better suited
-to execution on the server, such as accessing databases or calling Enterprise Java™ beans.</p>
-
-<p>You can create and edit a JSP file in the HTML editor by adding your own
-text and images using HTML, JSP tagging, or JavaScript, including Java source
-code inside of scriptlet tags. Typically, JSP files have the file extension
-.jsp. Additionally, the JSP specification suggests that JSP fragment files
-should have file extension .jspf. If this convention is not followed, the
-JSP validator will treat JSP fragments as regular standalone JSP files, and
-compilation errors might be reported.</p>
-
-<p>The <cite>Sun Microsystems JSP 1.2 Specification</cite> provides the ability
-to create custom JSP tags. Custom tags simplify complex actions and  provide
-developers with greater control over page content. Custom tags are collected
-into a library (taglib). A tag library descriptor file (taglib.tld) is an
-XML document that provides information about the tag library, including the
-taglib short name, library description, and tag descriptions. Refer to the <cite>Sun
-Microsystems JSP 1.2 Specification</cite> for more details.</p>
-
-<p>To use JSP 1.2 custom taglibs, you can import the tag library .tld and
-.jar files into your project to use them, or associate them as Web Library
-projects. You can also reference a TLD file by using a URI.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita
deleted file mode 100644
index 3f1624f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebpagedesign" xml:lang="en-us">

-<title>Web page design</title>

-<prolog><metadata>

-<keywords><indexterm>Web page design<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Web pages are an integral part of every Web application. Each Web page

-should serve to help achieve the overall goal of the entire Web site.</p>

-<p> There are many types of Web pages, ranging from simple HTML pages that

-contain no dynamic elements, to advanced Java-based pages that make use of

-servlets, scripts, forms, or data access components.</p>

-<p>A few of the many items you should consider when designing your pages are

-markup language, links, images, and style sheets.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
deleted file mode 100644
index 4e33359..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web page design" />
-<meta content="Web page design, overview" name="DC.subject" />
-<meta content="Web page design, overview" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebpagedesign" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web page design</title>
-</head>
-<body id="cwebpagedesign"><a name="cwebpagedesign"><!-- --></a>
-
-
-<h1 class="topictitle1">Web page design</h1>
-
-
-<div>
-<p>Web pages are an integral part of every Web application. Each Web page
-should serve to help achieve the overall goal of the entire Web site.</p>
-
-<p> There are many types of Web pages, ranging from simple HTML pages that
-contain no dynamic elements, to advanced Java-based pages that make use of
-servlets, scripts, forms, or data access components.</p>
-
-<p>A few of the many items you should consider when designing your pages are
-markup language, links, images, and style sheets.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita
deleted file mode 100644
index 99b82cd..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebprojects" xml:lang="en-us">

-<title>Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>overview</indexterm></indexterm>

-<indexterm>Web applications<indexterm>creating or importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Web projects hold all of the Web resources that are created and used when

-developing your Web application. The first step to creating or importing a

-Web application is to create either a static or a dynamic Web project. Static

-Web projects are meant to contain only simple Web site resources, such as

-HTML files. Dynamic Web projects are used to structure Web applications that

-will use more complicated, dynamic Web technologies, such as JavaServer Pages

-files, and possibly data access resources.</p>

-<p>Though the Web project is structured on your file system in compliance

-with the J2EE Web application standard for deployment purposes, the Project

-Explorer view is designed to show the most convenient display of project resources

-for use while you are actually developing the Web application. When you are

-finished developing your Web application, you use the Web project to deploy

-the correct resources to the server. These resources will be packaged in a

-file called a Web archive, or WAR file.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
deleted file mode 100644
index 782fcfe..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web projects" />
-<meta content="Web projects, overview, Web applications, creating or importing" name="DC.subject" />
-<meta content="Web projects, overview, Web applications, creating or importing" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebprojects" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web projects</title>
-</head>
-<body id="cwebprojects"><a name="cwebprojects"><!-- --></a>
-
-
-<h1 class="topictitle1">Web projects</h1>
-
-
-<div>
-<p>Web projects hold all of the Web resources that are created and used when
-developing your Web application. The first step to creating or importing a
-Web application is to create either a static or a dynamic Web project. Static
-Web projects are meant to contain only simple Web site resources, such as
-HTML files. Dynamic Web projects are used to structure Web applications that
-will use more complicated, dynamic Web technologies, such as JavaServer Pages
-files, and possibly data access resources.</p>
-
-<p>Though the Web project is structured on your file system in compliance
-with the J2EE Web application standard for deployment purposes, the Project
-Explorer view is designed to show the most convenient display of project resources
-for use while you are actually developing the Web application. When you are
-finished developing your Web application, you use the Web project to deploy
-the correct resources to the server. These resources will be packaged in a
-file called a Web archive, or WAR file.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita
deleted file mode 100644
index 05f8d71..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebresources" xml:lang="en-us">

-<title>Web resources</title>

-<prolog><metadata>

-<keywords><indexterm>Web resources<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>In most cases, all of the resources that you need to create for your Web

-application are developed during Web site or Web page design; however, there

-are additional resources that you may need to include in your Web project

-if you are using more advanced Web technologies in your application.</p>

-<p>These Web resources are not typical Web page files, and are often not the

-resources that you consider part of the final Web site. For example, tag libraries

-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> resources,

-such as JAR files, are resources you might need to include in your Web project. </p>

-<p>In fact, even the WAR file itself could be considered a Web resource, if

-you consider importing or exporting the resource.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
deleted file mode 100644
index c288bc0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web resources" />
-<meta content="Web resources, overview" name="DC.subject" />
-<meta content="Web resources, overview" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebresources" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web resources</title>
-</head>
-<body id="cwebresources"><a name="cwebresources"><!-- --></a>
-
-
-<h1 class="topictitle1">Web resources</h1>
-
-
-<div>
-<p>In most cases, all of the resources that you need to create for your Web
-application are developed during Web site or Web page design; however, there
-are additional resources that you may need to include in your Web project
-if you are using more advanced Web technologies in your application.</p>
-
-<p>These Web resources are not typical Web page files, and are often not the
-resources that you consider part of the final Web site. For example, tag libraries
-and Java™ resources,
-such as JAR files, are resources you might need to include in your Web project. </p>
-
-<p>In fact, even the WAR file itself could be considered a Web resource, if
-you consider importing or exporting the resource.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
deleted file mode 100644
index fb05e74..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwservbn" xml:lang="en-us">

-<title>Servlets</title>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>overview</indexterm></indexterm>

-<indexterm>Web servers<indexterm>generating dynamic content</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Servlets are server-side <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> programs that use the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-API</cite> and its associated classes and methods, as defined in the <cite>Sun

-Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite>. These <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> programs

-extend the functionality of a Web server by generating dynamic content and

-responding to Web client requests. When a browser sends a request to the server,

-the server can send the request information to a servlet, so that the servlet

-can construct the response that is sent back to the browser.</p>

-<p>Just as applets run on a Web browser and extend the browser's capabilities,

-servlets run on a Java-enabled Web server and extend the server's capabilities.

-Because of their flexibility and scalability, servlets are commonly used to

-enable businesses to connect databases to the Web.</p>

-<p>Although a servlet can be a completely self-contained program, you can

-split application development into two portions:  <ul>

-<li>The business logic (content generation), which governs the relationship

-between input, processing, and output</li>

-<li>The presentation logic (content presentation, or graphic design rules),

-which determines how information is presented to the user</li>

-</ul>Using this paradigm, you may choose to have business logic handled by <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans,

-the presentation logic handled by JavaServer Pages (JSP) or HTML files, and

-the HTTP protocol handled by a servlet. <note>JSP files can be used to manage

-both the presentation and business logic for a Web application. JSP files

-use structured markup for presentation, and supply servlet model behavior

-at run time.</note></p>

-<p>You can develop, debug, and deploy servlets, set breakpoints within servlet

-objects, and step through code to make changes that are dynamically folded

-into the running servlet on a running server, without having to restart each

-time.</p>

-<p>For more information about servlets, refer to the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> at <codeph>java.sun.com/products/servlet/download.html</codeph>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
deleted file mode 100644
index 3ab7815..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Servlets" />
-<meta content="servlets, overview, dynamic content" name="DC.subject" />
-<meta content="servlets, overview, dynamic content" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwservbn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Servlets</title>
-</head>
-<body id="cwservbn"><a name="cwservbn"><!-- --></a>
-
-
-<h1 class="topictitle1">Servlets</h1>
-
-
-<div>
-<p>Servlets are server-side Java™ programs that use the <cite>Sun Microsystems Java Servlet
-API</cite> and its associated classes and methods, as defined in the <cite>Sun
-Microsystems Java Servlet 2.3 Specification</cite>. These Java programs
-extend the functionality of a Web server by generating dynamic content and
-responding to Web client requests. When a browser sends a request to the server,
-the server can send the request information to a servlet, so that the servlet
-can construct the response that is sent back to the browser.</p>
-
-<p>Just as applets run on a Web browser and extend the browser's capabilities,
-servlets run on a Java-enabled Web server and extend the server's capabilities.
-Because of their flexibility and scalability, servlets are commonly used to
-enable businesses to connect databases to the Web.</p>
-
-<div class="p">Although a servlet can be a completely self-contained program, you can
-split application development into two portions:  <ul>
-<li>The business logic (content generation), which governs the relationship
-between input, processing, and output</li>
-
-<li>The presentation logic (content presentation, or graphic design rules),
-which determines how information is presented to the user</li>
-
-</ul>
-Using this paradigm, you may choose to have business logic handled by Java beans,
-the presentation logic handled by JavaServer Pages (JSP) or HTML files, and
-the HTTP protocol handled by a servlet. <div class="note"><span class="notetitle">Note:</span> JSP files can be used to manage
-both the presentation and business logic for a Web application. JSP files
-use structured markup for presentation, and supply servlet model behavior
-at run time.</div>
-</div>
-
-<p>You can develop, debug, and deploy servlets, set breakpoints within servlet
-objects, and step through code to make changes that are dynamically folded
-into the running servlet on a running server, without having to restart each
-time.</p>
-
-<p>For more information about servlets, refer to the <cite>Sun Microsystems Java Servlet
-2.3 Specification</cite> at <samp class="codeph">java.sun.com/products/servlet/download.html</samp>.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita
deleted file mode 100644
index 623bc9f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002 -->

-<concept id="cwtfeatures" xml:lang="en-us">

-<title>Web tools features</title>

-<shortdesc> The integrated Web development environment makes it easy to cooperatively

-create, assemble, publish, deploy and maintain dynamic, interactive Web applications.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Web tools<indexterm>features</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The Web development environment provides the following high-level capabilities:

- <ul>

-<li>Dynamic Web project creation, using the J2EE-defined hierarchy, or a static

-version that reduces project overhead when dynamic elements are not required.

- Static Web projects can later be converted to dynamic Web projects.<p></p></li>

-<li>Creation and editing of a Web application deployment descriptor (<filepath>web.xml</filepath>)

- file<p></p></li>

-<li>JSP and HTML file creation, validation, editing, and debugging<p></p></li>

-<li>An extensible view, called the Snippets view, which allows users to catalog

- and organize reusable programming objects, such as HTML, <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm>,

- and JSP markup, along with files and custom tags, that can be embedded in

- existing files<p></p></li>

-<li>Dynamic tag help (content assist) , which displays tag usage and attribute

-information for  HTML, JSP, and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> tags based on cursor location

- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)

-)<p></p></li>

-<li>Cascading style sheet (CSS) editing support<p></p></li>

-<li>HTTP/FTP import<p></p></li>

-<li>FTP export (simple resource copy) to a server<p></p></li>

-<li>WAR file import, export, and validation<p></p></li>

-<li>Servlet creation, which employs the Servlet Wizard to create new servlets.<p></p></li>

-</ul></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
deleted file mode 100644
index ab3323d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web tools features" />
-<meta name="abstract" content="The integrated Web development environment makes it easy to cooperatively create, assemble, publish, deploy and maintain dynamic, interactive Web applications." />
-<meta name="description" content="The integrated Web development environment makes it easy to cooperatively create, assemble, publish, deploy and maintain dynamic, interactive Web applications." />
-<meta content="Web tools, features and capabilities" name="DC.subject" />
-<meta content="Web tools, features and capabilities" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwtfeatures" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web tools features</title>
-</head>
-<body id="cwtfeatures"><a name="cwtfeatures"><!-- --></a>
-
-
-<h1 class="topictitle1">Web tools features</h1>
-
-
-
-<div><p> The integrated Web development environment makes it easy to cooperatively
-create, assemble, publish, deploy and maintain dynamic, interactive Web applications.</p>
-
-<div class="p">The Web development environment provides the following high-level capabilities:
- <ul>
-<li>Dynamic Web project creation, using the J2EE-defined hierarchy, or a static
-version that reduces project overhead when dynamic elements are not required.
- Static Web projects can later be converted to dynamic Web projects.<p />
-</li>
-
-<li>Creation and editing of a Web application deployment descriptor (<span class="filepath">web.xml</span>)
- file<p />
-</li>
-
-<li>JSP and HTML file creation, validation, editing, and debugging<p />
-</li>
-
-<li>An extensible view, called the Snippets view, which allows users to catalog
- and organize reusable programming objects, such as HTML, JavaScript™,
- and JSP markup, along with files and custom tags, that can be embedded in
- existing files<p />
-</li>
-
-<li>Dynamic tag help (content assist) , which displays tag usage and attribute
-information for  HTML, JSP, and JavaScript tags based on cursor location
- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)
-)<p />
-</li>
-
-<li>Cascading style sheet (CSS) editing support<p />
-</li>
-
-<li>HTTP/FTP import<p />
-</li>
-
-<li>FTP export (simple resource copy) to a server<p />
-</li>
-
-<li>WAR file import, export, and validation<p />
-</li>
-
-<li>Servlet creation, which employs the Servlet Wizard to create new servlets.<p />
-</li>
-
-</ul>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita
deleted file mode 100644
index 23e1ee0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwwarovr" xml:lang="en-us">

-<title>Web archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>WAR files<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> A Web application is a group of HTML pages, JSP pages, servlets, resources

-and source file, which can be managed as a single unit. A Web archive (WAR)

-file is a packaged Web application. WAR files can be used to import a Web

-application into a Web server.</p>

-<p>In addition to project resources, the WAR file includes a Web deployment

-descriptor file. The Web deployment descriptor is an XML file that contains

-deployment information, MIME types, session configuration details, and other

-settings for a Web application. The Web deployment descriptor file (<filepath>web.xml</filepath>)

-provides information about the WAR file is shared with the developers, assemblers,

-and deployers in a J2EE environment.</p>

-<p>The Web development environment provides facilities for importing and exporting

-WAR files, using the following wizards: <ul>

-<li><ph>Import Resources from a WAR File</ph>, which requires that you to

-specify a Web project. You can use existing projects or create them as you

-use the wizard.</li>

-<li><ph>Export Resources to a WAR File</ph>, which requires only an export

-location and some optional settings</li>

-</ul></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
deleted file mode 100644
index 16d50c5..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web archive (WAR) files" />
-<meta content="WAR files, overview" name="DC.subject" />
-<meta content="WAR files, overview" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwwarovr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web archive (WAR) files</title>
-</head>
-<body id="cwwarovr"><a name="cwwarovr"><!-- --></a>
-
-
-<h1 class="topictitle1">Web archive (WAR) files</h1>
-
-
-<div>
-<p> A Web application is a group of HTML pages, JSP pages, servlets, resources
-and source file, which can be managed as a single unit. A Web archive (WAR)
-file is a packaged Web application. WAR files can be used to import a Web
-application into a Web server.</p>
-
-<p>In addition to project resources, the WAR file includes a Web deployment
-descriptor file. The Web deployment descriptor is an XML file that contains
-deployment information, MIME types, session configuration details, and other
-settings for a Web application. The Web deployment descriptor file (<span class="filepath">web.xml</span>)
-provides information about the WAR file is shared with the developers, assemblers,
-and deployers in a J2EE environment.</p>
-
-<div class="p">The Web development environment provides facilities for importing and exporting
-WAR files, using the following wizards: <ul>
-<li><span>Import Resources from a WAR File</span>, which requires that you to
-specify a Web project. You can use existing projects or create them as you
-use the wizard.</li>
-
-<li><span>Export Resources to a WAR File</span>, which requires only an export
-location and some optional settings</li>
-
-</ul>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
deleted file mode 100644
index 7c8ea61..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwwedtvw" xml:lang="en-us">

-<title>Workbench integration with Web editors</title>

-<prolog><metadata>

-<keywords><indexterm>Web editors<indexterm>workbench integration</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>There are several editors for use in various contexts for various file

-types. To edit a file using its default editor, double-click on the file name

-in the Project Explorer view, or right-click on the file and select <uicontrol>Open</uicontrol>.

-The editor that is last used to open a file becomes the default for that particular

-file. To edit the file with a different editor, right-click on the file and

-select <uicontrol>Open With</uicontrol> to choose from a list of available

-editors.</p>

-<p>In the workbench, you can associate file-name extensions for different

-types of resources with various editors. A resource extension can have more

-than one editor associated with it; the last editor used for a particular

-extension type is indicated by a black dot before it in the <uicontrol>Open

-With</uicontrol> pop-up menu. You can associate extensions that are known

-to the workbench with additional editors, by using the <b>File Associations</b> preferences

-page, accessed by selecting <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Workbench</uicontrol><uicontrol>File Associations</uicontrol></menucascade>.</p>

-<p>The Properties view provides general capabilities that are advantageous

-to Web editor users. <dl><dlentry>

-<dt>Properties view</dt>

-<dd>The Properties view (<menucascade><uicontrol>Window</uicontrol><uicontrol>Show

-View</uicontrol><uicontrol>Properties</uicontrol></menucascade>) contains

-a list of attributes and editable attribute values. For example, when you

-select an image tag <uicontrol>img</uicontrol> , the width and height values

-appear for editing. In addition, any other attributes allowed by the standard

-specified in the DOCTYPE for the file (such as the HTML 4.0.1 DTD) are listed.

-When you click the value column of a property, you can select from among the

-list of available attribute values. <p>The pop-up menu in the Properties view

-enables you to undo, cut, copy, paste, delete, and select all. The options

-that are available at a given time depends on where the cursor is located

-when you right-click to display the pop-up menu. To see the pop-up menu that

-contains undo, cut, and so on, the property value field must be active. (This

-is accomplished by selecting the property and then selecting its value.) Otherwise,

-the pop-up menu will contain different options.</p> <p>Use the <uicontrol>Restore

-Default Value</uicontrol> button to change any value back to the default setting.</p> <p>After

-you are in the Properties view, you can modify other property values for specific

-tags. To edit another tag using the Properties view, move the cursor within

-the editing area of the Source page or Design page to the tag you want to

-edit. The appropriate properties and values are displayed in the Properties

-view.</p></dd>

-</dlentry></dl></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
deleted file mode 100644
index 546ffce..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Workbench integration with Web editors" />
-<meta content="Web editors, workbench integration" name="DC.subject" />
-<meta content="Web editors, workbench integration" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwwedtvw" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Workbench integration with Web editors</title>
-</head>
-<body id="cwwedtvw"><a name="cwwedtvw"><!-- --></a>
-
-
-<h1 class="topictitle1">Workbench integration with Web editors</h1>
-
-
-<div>
-<p>There are several editors for use in various contexts for various file
-types. To edit a file using its default editor, double-click on the file name
-in the Project Explorer view, or right-click on the file and select <span class="uicontrol">Open</span>.
-The editor that is last used to open a file becomes the default for that particular
-file. To edit the file with a different editor, right-click on the file and
-select <span class="uicontrol">Open With</span> to choose from a list of available
-editors.</p>
-
-<p>In the workbench, you can associate file-name extensions for different
-types of resources with various editors. A resource extension can have more
-than one editor associated with it; the last editor used for a particular
-extension type is indicated by a black dot before it in the <span class="uicontrol">Open
-With</span> pop-up menu. You can associate extensions that are known
-to the workbench with additional editors, by using the <strong>File Associations</strong> preferences
-page, accessed by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">File Associations</span></span>.</p>
-
-<div class="p">The Properties view provides general capabilities that are advantageous
-to Web editor users. <dl>
-<dt class="dlterm">Properties view</dt>
-
-<dd>The Properties view (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-View</span> &gt; <span class="uicontrol">Properties</span></span>) contains
-a list of attributes and editable attribute values. For example, when you
-select an image tag <span class="uicontrol">img</span> , the width and height values
-appear for editing. In addition, any other attributes allowed by the standard
-specified in the DOCTYPE for the file (such as the HTML 4.0.1 DTD) are listed.
-When you click the value column of a property, you can select from among the
-list of available attribute values. <p>The pop-up menu in the Properties view
-enables you to undo, cut, copy, paste, delete, and select all. The options
-that are available at a given time depends on where the cursor is located
-when you right-click to display the pop-up menu. To see the pop-up menu that
-contains undo, cut, and so on, the property value field must be active. (This
-is accomplished by selecting the property and then selecting its value.) Otherwise,
-the pop-up menu will contain different options.</p>
- <p>Use the <span class="uicontrol">Restore
-Default Value</span> button to change any value back to the default setting.</p>
- <p>After
-you are in the Properties view, you can modify other property values for specific
-tags. To edit another tag using the Properties view, move the cursor within
-the editing area of the Source page or Design page to the tag you want to
-edit. The appropriate properties and values are displayed in the Properties
-view.</p>
-</dd>
-
-</dl>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita
deleted file mode 100644
index c35c3f6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjchgxdt" xml:lang="en-us">

-<title>Specifying an implicit document type for an HTML, XHTML, or JSP fragment</title>

-<prolog><metadata>

-<keywords><indexterm>DOCTYPE declarations<indexterm>implicit for fragments</indexterm></indexterm>

-<indexterm>document types<indexterm>implicit for fragments</indexterm></indexterm>

-<indexterm>HTML fragments<indexterm>implicit document types</indexterm></indexterm>

-<indexterm>JSP fragments<indexterm>implicit document types</indexterm></indexterm>

-<indexterm>XHTML fragments<indexterm>implicit document type for fragments</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>An <i>implicit</i> document type is used for content assist (CTRL+Spacebar),

-the Properties view, and other editing contexts when no DOCTYPE declaration

-is specified in an HTML, XHTML, or JSP file. Typically, this feature is used

-for a fragment (partial document) that can be included in other pages using

-JSP include or server-side include.</p><p>To assign an implicit document type

-to an HTML, XHTML, or JSP fragment, do the following: </p> </context>

-<steps>

-<step><cmd>From the Project Explorer view, select the HTML, XHTML, or JSP

-fragment.</cmd></step>

-<step><cmd>Select <ph><uicontrol>Properties</uicontrol></ph> from the file's

-pop-up menu.</cmd></step>

-<step><cmd>In the <uicontrol>Web Content Settings</uicontrol> page, select

-the desired DOCTYPE from the <ph><uicontrol>Document type</uicontrol></ph> drop-down

-list.</cmd><info><p>The <ph><uicontrol>Properties</uicontrol></ph> dialog

-for Web projects also includes an <ph><uicontrol>Web Content Settings</uicontrol></ph> page,

-where you can specify project-default HTML document type. This setting will

-be used if no DOCTYPE declaration is specified in the file, and no default

-document type is specified in the <ph><uicontrol>Web Content Settings</uicontrol></ph> page

-on the <ph><uicontrol>Properties</uicontrol></ph> dialog for the file.</p></info>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
deleted file mode 100644
index 00a974d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//IETF//DTD HTML 4.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html><head>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css"/>
-<title>Specifying an implicit document type for an HTML, XHTML, or JSP fragment</title>
-</head>
-<body id="tjchgxdt"><a name="tjchgxdt"><!-- --></a>
-<h1 class="topictitle1">Specifying an implicit document type for an HTML, XHTML, or JSP fragment</h1>
-<div><div class="section"> <p>An <em>implicit</em> document type is used for content assist (CTRL+Spacebar),
-the Properties view, and other editing contexts when no DOCTYPE declaration
-is specified in an HTML, XHTML, or JSP file. Typically, this feature is used
-for a fragment (partial document) that can be included in other pages using
-JSP include or server-side include.</p>
-<p>To assign an implicit document type
-to an HTML, XHTML, or JSP fragment, do the following: </p>
- </div>
-<ol><li class="stepexpand"><span>From the Project Explorer view, select the HTML, XHTML, or JSP
-fragment.</span></li>
-<li class="stepexpand"><span>Select <span><b>Properties</b></span> from the file's
-pop-up menu.</span></li>
-<li class="stepexpand"><span>In the <b>Web Content Settings</b> page, select
-the desired DOCTYPE from the <span><b>Document type</b></span> drop-down
-list.</span> <p>The <span><b>Properties</b></span> dialog
-for Web projects also includes an <span><b>Web Content Settings</b></span> page,
-where you can specify project-default HTML document type. This setting will
-be used if no DOCTYPE declaration is specified in the file, and no default
-document type is specified in the <span><b>Web Content Settings</b></span> page
-on the <span><b>Properties</b></span> dialog for the file.</p>
-</li>
-</ol>
-</div>
-<div></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita
deleted file mode 100644
index 516efe1..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjcrehtm" xml:lang="en-us">

-<title>Creating HTML and XHTML files and framesets</title>

-<shortdesc>You can use the New HTML File wizard to create HTML and XHTML files

-and framesets. </shortdesc>

-<prolog><metadata>

-<keywords>

-<indexterm>framesets<indexterm>creating</indexterm></indexterm>

-<indexterm>HTML<indexterm>creating files</indexterm></indexterm>

-<indexterm>WML<indexterm>creating files</indexterm></indexterm>

-<indexterm>XHTML<indexterm>creating files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> </context>

-<steps>

-<step><cmd>Create a static or a dynamic Web project if you have not already

-done so.</cmd></step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  </cmd><info>Note

-that if you choose any other folder in which to create the HTML file, then

-it will not be included in the WAR file that is deployed to the server. In

-addition, link validation will not encompass files that are not under the

-WebContent folder.</info></step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>Other</uicontrol><uicontrol>Web</uicontrol><uicontrol>HTML</uicontrol>

-</menucascade>.</cmd><stepresult>The New HTML Page window appears with your

-folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-an html extension (html, htm, xhtml, htpl, wml, shtml, or shtm) in the file

-name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new HTML file, select <uicontrol>Finish.</uicontrol></choice>

-<choice> To use a template file for the initial content of your HTML page,

-select <uicontrol>Next</uicontrol>. The Select HTML Template window appears.

-Select the <uicontrol>Use HTML Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>HTML Templates</uicontrol> link

-to add or remove HTML templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
deleted file mode 100644
index 8af7382..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating HTML and XHTML files and framesets" />
-<meta name="abstract" content="You can use the New HTML File wizard to create HTML and XHTML files and framesets." />
-<meta name="description" content="You can use the New HTML File wizard to create HTML and XHTML files and framesets." />
-<meta content="HTML files, creating, XHTML files, WML files, framesets" name="DC.subject" />
-<meta content="HTML files, creating, XHTML files, WML files, framesets" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcrehtm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating HTML and XHTML files and framesets</title>
-</head>
-<body id="tjcrehtm"><a name="tjcrehtm"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating HTML and XHTML files and framesets</h1>
-
-
-
-<div><p>You can use the New HTML File wizard to create HTML and XHTML files
-and framesets. </p>
-
-<div class="section"> </div>
-
-<ol>
-<li class="stepexpand"><span>Create a static or a dynamic Web project if you have not already
-done so.</span></li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  </span> Note
-that if you choose any other folder in which to create the HTML file, then
-it will not be included in the WAR file that is deployed to the server. In
-addition, link validation will not encompass files that are not under the
-WebContent folder.</li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">HTML</span>
-</span>.</span> The New HTML Page window appears with your
-folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-an html extension (html, htm, xhtml, htpl, wml, shtml, or shtm) in the file
-name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new HTML file, select <span class="uicontrol">Finish.</span></li>
-
-<li> To use a template file for the initial content of your HTML page,
-select <span class="uicontrol">Next</span>. The Select HTML Template window appears.
-Select the <span class="uicontrol">Use HTML Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">HTML Templates</span> link
-to add or remove HTML templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita
deleted file mode 100644
index 5e75b31..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjcrejsp" xml:lang="en-us">

-<title>Creating JavaServer Pages (JSP) files</title>

-<prolog><metadata>

-<keywords><indexterm>JSP files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>Most types of JSP files can be created using the New JSP File

-wizard. To create a basic JSP file using the wizard, complete the following

-steps: </p></context>

-<steps>

-<step><cmd>Create a dynamic Web project if you have not already done so.</cmd>

-</step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  Note that if you

-choose any other folder in which to create the JSP, then it will not be included

-in the WAR file that is deployed to the server. In addition, link validation

-will not encompass files that are not under the WebContent folder.</cmd></step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>JSP</uicontrol></menucascade>.</cmd><stepresult>The New Java Server

-Page window appears with your folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-the jsp extension (jsp, jsv, jtpl, or jspx) in the file name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new JSP file, select <uicontrol>Finish.</uicontrol></choice>

-<choice>To link to a file in the file system and specify path variables, select <uicontrol>Advanced</uicontrol> and

-then make your selections using the <uicontrol>Browse</uicontrol> and <uicontrol>Variables</uicontrol> buttons. </choice>

-<choice> To use a template file for the initial content of your JSP page,

-select <uicontrol>Next</uicontrol>. The Select JSP Template window appears.

-Select the <uicontrol>Use JSP Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>JSP Templates</uicontrol> link

-to add or remove JSP templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
deleted file mode 100644
index 0c56302..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating JavaServer Pages (JSP) files" />
-<meta content="JSP files, creating" name="DC.subject" />
-<meta content="JSP files, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcrejsp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating JavaServer Pages (JSP) files</title>
-</head>
-<body id="tjcrejsp"><a name="tjcrejsp"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating JavaServer Pages (JSP) files</h1>
-
-
-<div>
-<div class="section"><p>Most types of JSP files can be created using the New JSP File
-wizard. To create a basic JSP file using the wizard, complete the following
-steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a dynamic Web project if you have not already done so.</span>
-</li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  Note that if you
-choose any other folder in which to create the JSP, then it will not be included
-in the WAR file that is deployed to the server. In addition, link validation
-will not encompass files that are not under the WebContent folder.</span></li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">JSP</span></span>.</span> The New Java Server
-Page window appears with your folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-the jsp extension (jsp, jsv, jtpl, or jspx) in the file name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new JSP file, select <span class="uicontrol">Finish.</span></li>
-
-<li>To link to a file in the file system and specify path variables, select <span class="uicontrol">Advanced</span> and
-then make your selections using the <span class="uicontrol">Browse</span> and <span class="uicontrol">Variables</span> buttons. </li>
-
-<li> To use a template file for the initial content of your JSP page,
-select <span class="uicontrol">Next</span>. The Select JSP Template window appears.
-Select the <span class="uicontrol">Use JSP Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">JSP Templates</span> link
-to add or remove JSP templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita
deleted file mode 100644
index 548f192..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjdetags" xml:lang="en-us">

-<title>Creating and editing Web pages - overview</title>

-<prolog><metadata>

-<keywords><indexterm>Web pages<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To aid in Web site development and editing, there is local tag

-hover help for all supported tag sets, as well as <xref href="../../org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita"

-scope="peer"><desc></desc>content assist</xref> (Ctrl+Spacebar), a tool that helps you

-insert or finish a tag or function or finish a line of code in a structured

-text editor.</p><p><image alt="For Windows" href="../images/nwin.gif" placement="inline">

-</image> You can toggle among three modes to visually design pages, work with

-HTML, <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> or

-JSP content, and preview your pages. To help you create the visual impact

-you want on your Web sites, the editor includes its own library of reusable

-graphics and two graphic programs for creating, editing, and animating image

-files. </p><p><image alt="For Linux" href="../images/nlinux.gif" placement="inline">

-</image> You can toggle between two modes to visually design pages or work

-with HTML, <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="JavaScript">JavaScript</tm> or JSP content. To help you create

-the visual impact you want on your Web sites, the editor includes its own

-library of reusable graphics and a graphic program for creating, editing,

-and animating image files.</p><note>Use either uppercase or lowercase alphanumeric

-characters consistently when naming HTML files and embedded files (such as

-image files) used in your Web pages, because some server operating systems

-are case sensitive. Do not use spaces or special characters such as exclamation

-points or question marks in file names.</note> </context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
deleted file mode 100644
index ae5e9cf..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating and editing Web pages - overview" />
-<meta content="Web pages, creating" name="DC.subject" />
-<meta content="Web pages, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjdetags" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating and editing Web pages - overview</title>
-</head>
-<body id="tjdetags"><a name="tjdetags"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating and editing Web pages - overview</h1>
-
-
-<div>
-<div class="section"> <p>To aid in Web site development and editing, there is local tag
-hover help for all supported tag sets, as well as <a href="../../org.eclipse.wst.sse.doc.user/topics/csrcedt006.html" title="">content assist</a> (Ctrl+Spacebar), a tool that helps you
-insert or finish a tag or function or finish a line of code in a structured
-text editor.</p>
-<p><img src="../images/nwin.gif" alt="For Windows" /> You can toggle among three modes to visually design pages, work with
-HTML, JavaScript™ or
-JSP content, and preview your pages. To help you create the visual impact
-you want on your Web sites, the editor includes its own library of reusable
-graphics and two graphic programs for creating, editing, and animating image
-files. </p>
-<p><img src="../images/nlinux.gif" alt="For Linux" /> You can toggle between two modes to visually design pages or work
-with HTML, JavaScript or JSP content. To help you create
-the visual impact you want on your Web sites, the editor includes its own
-library of reusable graphics and a graphic program for creating, editing,
-and animating image files.</p>
-<div class="note"><span class="notetitle">Note:</span> Use either uppercase or lowercase alphanumeric
-characters consistently when naming HTML files and embedded files (such as
-image files) used in your Web pages, because some server operating systems
-are case sensitive. Do not use spaces or special characters such as exclamation
-points or question marks in file names.</div>
- </div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
deleted file mode 100644
index 94e4948..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<!-- ArborText, Inc.,  1988-2002, v.4002-->

-<task id="tjprefs" xml:lang="en-us">

-<title>Defining HTML file preferences</title>

-<prolog><metadata>

-<keywords>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p><indexterm>DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm>

-<indexterm>HTML files<indexterm>editing preferences</indexterm></indexterm>

-To define general HTML file preferences, complete the following

-steps::</p></context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences window, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>HTML Files</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Specify the following settings related to saving an HTML source

-page. The defaults are recommended and should only be modified when there

-is a specific reason to do so. </cmd><info><dl><dlentry>

-<dt>Line delimiter</dt>

-<dd>Specify the appropriate EOL character for your environment. The default

-is <uicontrol>No translation</uicontrol>.</dd>

-</dlentry><dlentry>

-<dt>Add this suffix</dt>

-<dd>Specify a default suffix for files that you save. The default is <userinput>html</userinput>.</dd>

-</dlentry><dlentry>

-<dt>Encoding, IANA, (Use workbench default)</dt>

-<dd>Specify the default encoding (code page) for files that you create. The

-default is the Workbench's encoding preference. </dd>

-</dlentry><dlentry>

-<dt>Insert DOCTYPE declaration</dt>

-<dd>Optionally, you can automatically add a DOCTYPE declaration to HTML files.

-The default DOCTYPE is determined when you create an HTML file or a JSP file

-using a wizard. If you add the DOCTYPE declaration, you should include at

-least a Public ID specification, and, optionally, a System ID.</dd>

-</dlentry><dlentry>

-<dt>Insert GENERATOR with META tag</dt>

-<dd>Optionally, select the check box to specify GENERATOR in a META tag in

-the HTML file header.</dd>

-</dlentry><dlentry>

-<dt>Loading files</dt>

-<dd>Specify the default encoding (code page) for files that you open. The

-default is the Workbench's encoding preference. Deselect the <uicontrol>Use

-workbench default</uicontrol> check box to select another encoding.   <note>Encoding

-detection (when loading files) is performed in the following order:   <ul>

-<li>Locate the encoding name embedded in the document.</li>

-<li>When no encoding is embedded in the document, an automatic encoding detector

-attempts to determine encoding used in the document.</li>

-<li>If the encoding still cannot be determined, the encoding defined in the <uicontrol>Encoding</uicontrol> field

-is used.</li>

-</ul> </note> </dd>

-</dlentry></dl> </info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
deleted file mode 100644
index 65ab12d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining HTML file preferences" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjprefs" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining HTML file preferences</title>
-</head>
-<body id="tjprefs"><a name="tjprefs"><!-- --></a>
-
-
-<h1 class="topictitle1">Defining HTML file preferences</h1>
-
-
-<div>
-<div class="section"> <p>
-To define general HTML file preferences, complete the following
-steps::</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences window, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">HTML Files</span></span>.</span></li>
-
-<li class="stepexpand"><span>Specify the following settings related to saving an HTML source
-page. The defaults are recommended and should only be modified when there
-is a specific reason to do so. </span> <dl>
-<dt class="dlterm">Line delimiter</dt>
-
-<dd>Specify the appropriate EOL character for your environment. The default
-is <span class="uicontrol">No translation</span>.</dd>
-
-
-<dt class="dlterm">Add this suffix</dt>
-
-<dd>Specify a default suffix for files that you save. The default is <kbd class="userinput">html</kbd>.</dd>
-
-
-<dt class="dlterm">Encoding, IANA, (Use workbench default)</dt>
-
-<dd>Specify the default encoding (code page) for files that you create. The
-default is the Workbench's encoding preference. </dd>
-
-
-<dt class="dlterm">Insert DOCTYPE declaration</dt>
-
-<dd>Optionally, you can automatically add a DOCTYPE declaration to HTML files.
-The default DOCTYPE is determined when you create an HTML file or a JSP file
-using a wizard. If you add the DOCTYPE declaration, you should include at
-least a Public ID specification, and, optionally, a System ID.</dd>
-
-
-<dt class="dlterm">Insert GENERATOR with META tag</dt>
-
-<dd>Optionally, select the check box to specify GENERATOR in a META tag in
-the HTML file header.</dd>
-
-
-<dt class="dlterm">Loading files</dt>
-
-<dd>Specify the default encoding (code page) for files that you open. The
-default is the Workbench's encoding preference. Deselect the <span class="uicontrol">Use
-workbench default</span> check box to select another encoding.   <div class="note"><span class="notetitle">Note:</span> Encoding
-detection (when loading files) is performed in the following order:   <ul>
-<li>Locate the encoding name embedded in the document.</li>
-
-<li>When no encoding is embedded in the document, an automatic encoding detector
-attempts to determine encoding used in the document.</li>
-
-<li>If the encoding still cannot be determined, the encoding defined in the <span class="uicontrol">Encoding</span> field
-is used.</li>
-
-</ul>
- </div>
- </dd>
-
-</dl>
- </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita
deleted file mode 100644
index 3c481d7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="tservertarget" xml:lang="en-us">

-<title>Server targeting for Web applications</title>

-<prolog><metadata>

-<keywords><indexterm>servers<indexterm>targeting</indexterm></indexterm><indexterm>Web applications<indexterm>server targeting</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>To support different J2EE application servers, the J2EE tooling allows

-you to target a specific server during your Enterprise Application (EAR) project

-development. In most cases, a Web project must target the same server as the

-EAR project in order to deploy the Web application to the server properly. </p>

-<p>After you have a Web project created, you can modify the target server

-using the project's properties dialog. To do this, right-click on the project

-in the Project Explorer view, and select <menucascade><uicontrol>Properties</uicontrol>

-<uicontrol>Server</uicontrol></menucascade>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
deleted file mode 100644
index 6980747..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Server targeting for Web applications" />
-<meta content="servers, targeting, Web applications, server targeting" name="DC.subject" />
-<meta content="servers, targeting, Web applications, server targeting" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tservertarget" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Server targeting for Web applications</title>
-</head>
-<body id="tservertarget"><a name="tservertarget"><!-- --></a>
-
-
-<h1 class="topictitle1">Server targeting for Web applications</h1>
-
-
-<div>
-<p>To support different J2EE application servers, the J2EE tooling allows
-you to target a specific server during your Enterprise Application (EAR) project
-development. In most cases, a Web project must target the same server as the
-EAR project in order to deploy the Web application to the server properly. </p>
-
-<p>After you have a Web project created, you can modify the target server
-using the project's properties dialog. To do this, right-click on the project
-in the Project Explorer view, and select <span class="menucascade"><span class="uicontrol">Properties</span>
- &gt; <span class="uicontrol">Server</span></span>.</p>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita
deleted file mode 100644
index bef37e2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tstylesheet" xml:lang="en-us">

-<title>Creating cascading style sheets</title>

-<shortdesc>Cascading style sheets enable you to define a consistent look and

-feel throughout your Web site by maintaining the contents (Web pages) and

-the design (the style sheet) separately.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>style sheets<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To create a new cascading style sheet:</context>

-<steps>

-<step><cmd>Create a static or a dynamic Web project if you have not already

-done so.</cmd></step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  </cmd><info>Note

-that if you choose any other folder in which to create the CSS file, then

-it will not be included in the WAR file that is deployed to the server. </info>

-</step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>Other</uicontrol><uicontrol>Web</uicontrol><uicontrol>CSS</uicontrol>

-</menucascade>.</cmd><stepresult>The New Cascading Style Sheet window appears

-with your folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-a css extension in the file name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new CSS file, select <uicontrol>Finish.</uicontrol></choice>

-<choice> To use a template file for the initial content of your CSS file,

-select <uicontrol>Next</uicontrol>. The Select CSS Template window appears.

-Select the <uicontrol>Use CSS Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>CSS Templates</uicontrol> link

-to add or remove HTML templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html
deleted file mode 100644
index d3aa09b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating cascading style sheets" />
-<meta name="abstract" content="Cascading style sheets enable you to define a consistent look and feel throughout your Web site by maintaining the contents (Web pages) and the design (the style sheet) separately." />
-<meta name="description" content="Cascading style sheets enable you to define a consistent look and feel throughout your Web site by maintaining the contents (Web pages) and the design (the style sheet) separately." />
-<meta content="style sheets, creating" name="DC.subject" />
-<meta content="style sheets, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tstylesheet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating cascading style sheets</title>
-</head>
-<body id="tstylesheet"><a name="tstylesheet"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating cascading style sheets</h1>
-
-
-
-<div><p>Cascading style sheets enable you to define a consistent look and
-feel throughout your Web site by maintaining the contents (Web pages) and
-the design (the style sheet) separately.</p>
-
-<div class="section">To create a new cascading style sheet:</div>
-
-<ol>
-<li class="stepexpand"><span>Create a static or a dynamic Web project if you have not already
-done so.</span></li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  </span> Note
-that if you choose any other folder in which to create the CSS file, then
-it will not be included in the WAR file that is deployed to the server. 
-</li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">CSS</span>
-</span>.</span> The New Cascading Style Sheet window appears
-with your folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-a css extension in the file name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new CSS file, select <span class="uicontrol">Finish.</span></li>
-
-<li> To use a template file for the initial content of your CSS file,
-select <span class="uicontrol">Next</span>. The Select CSS Template window appears.
-Select the <span class="uicontrol">Use CSS Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">CSS Templates</span> link
-to add or remove HTML templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita
deleted file mode 100644
index e2b3add..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002-->

-<task id="twcreprj" xml:lang="en-us">

-<title>Creating a dynamic Web project</title>

-<shortdesc>You create and maintain the resources for your Web applications

-in Web projects.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>creating dynamic projects</indexterm></indexterm>

-<indexterm>Web applications<indexterm>resources</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> Unlike with <xref href="twcresta.dita" scope="peer"><desc></desc>static</xref> Web

-projects,  dynamic Web projects enable you to create resources such as JavaServer

-Pages and servlets.</p><p>To create a new dynamic Web project, complete the

-following steps:</p></context>

-<steps>

-<step><cmd>Open the J2EE perspective.</cmd></step>

-<step><cmd>In the Project Explorer, right click on Dynamic Web Projects, and

-select <menucascade><uicontrol>New</uicontrol><uicontrol>Dynamic Web Project</uicontrol>

-</menucascade> from the context menu. The New Dynamic Web Project wizard starts.</cmd>

-</step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Project Facets </dt>

-<dd>A facet represents a unit of functionality in a Web project. For example,

-the Dynamic Web Module facet enables the project to be deployed as a dynamic

-Web module. A brief description of a project facet appears in the wizard when

-you select it.  Note that in many instances, you can view the constraints

-for a project facet by right clicking on the facet and selecting project constraints

-from the pop up menu.  </dd>

-</dlentry><dlentry>

-<dt>Target Runtime</dt>

-<dd>Use this field to define a new installed runtime environment. Runtimes

-are used at build time to compile projects.</dd>

-</dlentry><dlentry>

-<dt>Enterprise Application project (EAR Project)</dt>

-<dd>A new or existing Enterprise Application project (EAR Project) must be

-associated with your new Web project to facilitate deployment. If you want

-to override the default settings for the Enterprise Application project, you

-can do so using the wizard. When your Web project is created at the end of

-the wizard, the new Enterprise Application project is also created with the

-name specified in the EAR project field. Note that the default is the name

-of the web project appended with EAR (unless the ear project was selected

-when you opened the wizard.)</dd>

-</dlentry><dlentry>

-<dt>Context Root</dt>

-<dd>The context root is the Web application root, which is the top-level directory

-of your application when it is deployed to the Web server. You can change

-the context root after you create a project using the project Properties dialog,

-which you access from the project's pop-up menu. The context root can also

-be used by the links builder to ensure that your links remain ready to publish

-as you move and rename files inside your project.</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
deleted file mode 100644
index a4699b0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a dynamic Web project" />
-<meta name="abstract" content="You create and maintain the resources for your Web applications in Web projects." />
-<meta name="description" content="You create and maintain the resources for your Web applications in Web projects." />
-<meta content="dynamic Web projects, creating, Web projects, dynamic" name="DC.subject" />
-<meta content="dynamic Web projects, creating, Web projects, dynamic" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcreprj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a dynamic Web project</title>
-</head>
-<body id="twcreprj"><a name="twcreprj"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a dynamic Web project</h1>
-
-
-
-<div><p>You create and maintain the resources for your Web applications
-in Web projects.</p>
-
-<div class="section"> <p> Unlike with <a href="twcresta.html" title="">static</a> Web
-projects,  dynamic Web projects enable you to create resources such as JavaServer
-Pages and servlets.</p>
-<p>To create a new dynamic Web project, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li><span>Open the J2EE perspective.</span></li>
-
-<li><span>In the Project Explorer, right click on Dynamic Web Projects, and
-select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Dynamic Web Project</span>
-</span> from the context menu. The New Dynamic Web Project wizard starts.</span>
-</li>
-
-<li><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Project Facets </dt>
-
-<dd>A facet represents a unit of functionality in a Web project. For example,
-the Dynamic Web Module facet enables the project to be deployed as a dynamic
-Web module. A brief description of a project facet appears in the wizard when
-you select it.  Note that in many instances, you can view the constraints
-for a project facet by right clicking on the facet and selecting project constraints
-from the pop up menu.  </dd>
-
-
-<dt class="dlterm">Target Runtime</dt>
-
-<dd>Use this field to define a new installed runtime environment. Runtimes
-are used at build time to compile projects.</dd>
-
-
-<dt class="dlterm">Enterprise Application project (EAR Project)</dt>
-
-<dd>A new or existing Enterprise Application project (EAR Project) must be
-associated with your new Web project to facilitate deployment. If you want
-to override the default settings for the Enterprise Application project, you
-can do so using the wizard. When your Web project is created at the end of
-the wizard, the new Enterprise Application project is also created with the
-name specified in the EAR project field. Note that the default is the name
-of the web project appended with EAR (unless the ear project was selected
-when you opened the wizard.)</dd>
-
-
-<dt class="dlterm">Context Root</dt>
-
-<dd>The context root is the Web application root, which is the top-level directory
-of your application when it is deployed to the Web server. You can change
-the context root after you create a project using the project Properties dialog,
-which you access from the project's pop-up menu. The context root can also
-be used by the links builder to ensure that your links remain ready to publish
-as you move and rename files inside your project.</dd>
-
-</dl>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita
deleted file mode 100644
index f3e6b59..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcresta" xml:lang="en-us">

-<title>Creating a static Web project</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>static Web projects<indexterm>creating</indexterm></indexterm>

-<indexterm>Web projects<indexterm>creating static</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> In the workbench, you create and maintain resources for Web applications

-in Web projects. If you want to create a static, content-based Web application

-that contains no dynamic elements, such as JSP files or servlets, use the <ph><uicontrol>New

-Static Web Project</uicontrol></ph> wizard. </p><p>To create a new static

-Web project, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open the J2EE perspective </cmd><info></info></step>

-<step><cmd>In the Project Explorer, right click on Other Projects and select <b>New->Other->Web->Static

-Web Project</b> from the context menu. The New Static Web Project wizard starts. </cmd>

-</step>

-<step><cmd>Follow the project wizard prompts</cmd><info></info></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Project Facets </dt>

-<dd>A facet represents a unit of functionality in a Web project. For example,

-the Static Web Module facet enables the project to be deployed as a static

-Web module. A brief description of a project facet appears in the wizard when

-you select it.  Note that in many instances, you can view the constraints

-for a project facet by right clicking on the facet and selecting project constraints

-from the pop up menu.  </dd>

-</dlentry><dlentry>

-<dt>Target Runtime</dt>

-<dd>Use this field to define a new installed runtime environment. Runtimes

-are used at build time to compile projects. </dd>

-</dlentry></dl><dl><dlentry>

-<dt>Web Content Folder</dt>

-<dd>The folder in which you want to store your publishable resources. </dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
deleted file mode 100644
index 45e52f6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a static Web project" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="static Web projects, creating, Web projects, creating static" name="DC.subject" />
-<meta content="static Web projects, creating, Web projects, creating static" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcresta" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a static Web project</title>
-</head>
-<body id="twcresta"><a name="twcresta"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a static Web project</h1>
-
-
-
-<div><p />
-
-<div class="section"><p> In the workbench, you create and maintain resources for Web applications
-in Web projects. If you want to create a static, content-based Web application
-that contains no dynamic elements, such as JSP files or servlets, use the <span><span class="uicontrol">New
-Static Web Project</span></span> wizard. </p>
-<p>To create a new static
-Web project, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the J2EE perspective </span> </li>
-
-<li class="stepexpand"><span>In the Project Explorer, right click on Other Projects and select <strong>New-&gt;Other-&gt;Web-&gt;Static
-Web Project</strong> from the context menu. The New Static Web Project wizard starts. </span>
-</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts</span> </li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Project Facets </dt>
-
-<dd>A facet represents a unit of functionality in a Web project. For example,
-the Static Web Module facet enables the project to be deployed as a static
-Web module. A brief description of a project facet appears in the wizard when
-you select it.  Note that in many instances, you can view the constraints
-for a project facet by right clicking on the facet and selecting project constraints
-from the pop up menu.  </dd>
-
-
-<dt class="dlterm">Target Runtime</dt>
-
-<dd>Use this field to define a new installed runtime environment. Runtimes
-are used at build time to compile projects. </dd>
-
-</dl>
-<dl>
-<dt class="dlterm">Web Content Folder</dt>
-
-<dd>The folder in which you want to store your publishable resources. </dd>
-
-</dl>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita
deleted file mode 100644
index 86699ab..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcrewar" xml:lang="en-us">

-<title>Exporting Web Archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>exporting<indexterm>WAR files</indexterm></indexterm>

-<indexterm>WAR files<indexterm>exporting</indexterm></indexterm>

-<indexterm>Web projects<indexterm>exporting WAR files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> A Web archive (WAR) file is a packaged Web application that

-can be exported to test, publish, and deploy the resources developed within

-a Web project.</p><p>To export a WAR file from a Web project, do the following: </p></context>

-<steps>

-<step><cmd>Right click on a Web project folder and select <b>Export</b> from

-the pop-up menu. Then select<b> WAR file</b> in the Export window and then

-select <b>Next</b>.</cmd></step>

-<step><cmd>Specify the Web project you want to export (this field is primed

-if you used the pop-up menu to open the wizard), and specify a location for

-the new WAR file</cmd></step>

-<step importance="optional"><cmd>Optionally, supply WAR export <ph>Options</ph>,

-such as whether or not to include <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> source files in the WAR, and whether

-to overwrite any existing resources during the export process. </cmd><info>Source

-files are not usually included in a WAR file, because they are not necessary

-for the server to run the web application.</info></step>

-<step><cmd>Click <ph><uicontrol>Finish</uicontrol></ph>.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
deleted file mode 100644
index 15d4537..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting Web Archive (WAR) files" />
-<meta content="WAR files, exporting, War files, Web projects, exporting WAR files, War files" name="DC.subject" />
-<meta content="WAR files, exporting, War files, Web projects, exporting WAR files, War files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcrewar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting Web Archive (WAR) files</title>
-</head>
-<body id="twcrewar"><a name="twcrewar"><!-- --></a>
-
-
-<h1 class="topictitle1">Exporting Web Archive (WAR) files</h1>
-
-
-<div>
-<div class="section"> <p> A Web archive (WAR) file is a packaged Web application that
-can be exported to test, publish, and deploy the resources developed within
-a Web project.</p>
-<p>To export a WAR file from a Web project, do the following: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Right click on a Web project folder and select <strong>Export</strong> from
-the pop-up menu. Then select<strong> WAR file</strong> in the Export window and then
-select <strong>Next</strong>.</span></li>
-
-<li class="stepexpand"><span>Specify the Web project you want to export (this field is primed
-if you used the pop-up menu to open the wizard), and specify a location for
-the new WAR file</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Optionally, supply WAR export <span>Options</span>,
-such as whether or not to include Java™ source files in the WAR, and whether
-to overwrite any existing resources during the export process. </span> Source
-files are not usually included in a WAR file, because they are not necessary
-for the server to run the web application.</li>
-
-<li class="stepexpand"><span>Click <span><span class="uicontrol">Finish</span></span>.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita
deleted file mode 100644
index 66cfcc8..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcvsr" xml:lang="en-us">

-<title>Setting CVS repository defaults</title>

-<prolog><metadata>

-<keywords><indexterm>build output folders<indexterm>ignoring in CVS</indexterm></indexterm>

-<indexterm>CVS<indexterm>setting repository defaults</indexterm></indexterm>

-<indexterm>cvsignore files<indexterm>creating</indexterm></indexterm>

-<indexterm>repositories<indexterm>default CVS settings</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>When you use a CVS repository during team development, you might

-want to use the following setup to ensure that the CVS versioning support

-ignores the project's build output folder:</p> </context>

-<steps>

-<step><cmd>Create a file called .cvsignore in your project's <filepath>WebContent/WEB-INF</filepath> folder.</cmd>

-</step>

-<step><cmd>In this file, add a line with the name of the build output folder

-(for example, <codeph>classes</codeph>).</cmd><info><p>Currently, you have

-the option of creating this file automatically (as a feature) when using the

-New Dynamic Web Project wizard.</p><p>When you synchronize with a CVS team

-stream, the output folder will be ignored.</p></info></step>

-<step><cmd>In addition, you should turn off the <ph><uicontrol>Prune empty

-directories</uicontrol></ph> option. Select <ph><menucascade><uicontrol>Windows</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade></ph>, switch to the <ph><menucascade>

-<uicontrol>Team</uicontrol><uicontrol>CVS</uicontrol></menucascade></ph> properties

-page, and ensure that the <ph><uicontrol>Prune empty directories</uicontrol></ph> check

-box is not checked.</cmd><info><p>If this option is enabled and your Web project's

-source directory is empty, it will be deleted when the project is added to

-your workspace from a CVS repository, causing a <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build error.</p></info></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
deleted file mode 100644
index bea54aa..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting CVS repository defaults" />
-<meta content="CVS, setting repository defaults, cvsignore file, creating" name="DC.subject" />
-<meta content="CVS, setting repository defaults, cvsignore file, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcvsr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting CVS repository defaults</title>
-</head>
-<body id="twcvsr"><a name="twcvsr"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting CVS repository defaults</h1>
-
-
-<div>
-<div class="section"> <p>When you use a CVS repository during team development, you might
-want to use the following setup to ensure that the CVS versioning support
-ignores the project's build output folder:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Create a file called .cvsignore in your project's <span class="filepath">WebContent/WEB-INF</span> folder.</span>
-</li>
-
-<li class="stepexpand"><span>In this file, add a line with the name of the build output folder
-(for example, <samp class="codeph">classes</samp>).</span> <p>Currently, you have
-the option of creating this file automatically (as a feature) when using the
-New Dynamic Web Project wizard.</p>
-<p>When you synchronize with a CVS team
-stream, the output folder will be ignored.</p>
-</li>
-
-<li class="stepexpand"><span>In addition, you should turn off the <span><span class="uicontrol">Prune empty
-directories</span></span> option. Select <span><span class="menucascade"><span class="uicontrol">Windows</span>
- &gt; <span class="uicontrol">Preferences</span></span></span>, switch to the <span><span class="menucascade">
-<span class="uicontrol">Team</span> &gt; <span class="uicontrol">CVS</span></span></span> properties
-page, and ensure that the <span><span class="uicontrol">Prune empty directories</span></span> check
-box is not checked.</span> <p>If this option is enabled and your Web project's
-source directory is empty, it will be deleted when the project is added to
-your workspace from a CVS repository, causing a Java™ build error.</p>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita
deleted file mode 100644
index a797bd3..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twimpwar" xml:lang="en-us">

-<title>Importing Web archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>WAR files<indexterm>importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>A Web Archive (WAR) file is a portable, packaged Web application

-that you can import into your workspace. </p><p> Before importing a WAR file,

-you should first determine if the WAR file contains needed <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source

-files. When importing a WAR file into an existing Web project, the imported

-Web deployment descriptor files are either not changed or overwritten by the

-ones included in the imported WAR file, based on your response to the prompt

-that is provided.  In either case, this action does <i>not</i> represent a

-merging of the two sets of deployment descriptors.  </p>  <p>To import the

-Web project resources in a WAR file into your workspace, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Select <ph><menucascade><uicontrol>File</uicontrol><uicontrol>Import</uicontrol>

-</menucascade></ph>.</cmd></step>

-<step><cmd> In the Import dialog, select <ph><uicontrol>WAR file</uicontrol></ph> and

-then click <ph><uicontrol>Next</uicontrol></ph>. </cmd></step>

-<step><cmd>Locate the WAR file that you want to import using the <ph><uicontrol>Browse</uicontrol></ph> button.</cmd>

-</step>

-<step><cmd> The wizard assumes you want to create a new Web project with the

-same name as the WAR file. If you accept this choice, the project will be

-created with the same servlet version as specified by the WAR file and in

-the same location. If you want to override these settings, you can click <b>New</b> and

-specify your new settings in the Dynamic Web Project wizard.</cmd><info> <p>If

-you want to import the WAR file into an existing Web project, you can select

-the project from the Web project drop-down list. Note that if you select an

-existing project, you must decide whether you want to select the setting to <b>overwrite

-existing resources without warning</b></p></info></step>

-<step><cmd>Click <ph><uicontrol>Finish</uicontrol></ph> to populate the Web

-project.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept"></linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
deleted file mode 100644
index 0ad0a96..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing Web archive (WAR) files" />
-<meta content="WAR files, importing" name="DC.subject" />
-<meta content="WAR files, importing" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twimpwar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing Web archive (WAR) files</title>
-</head>
-<body id="twimpwar"><a name="twimpwar"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing Web archive (WAR) files</h1>
-
-
-<div>
-<div class="section"> <p>A Web Archive (WAR) file is a portable, packaged Web application
-that you can import into your workspace. </p>
-<p> Before importing a WAR file,
-you should first determine if the WAR file contains needed Java™ source
-files. When importing a WAR file into an existing Web project, the imported
-Web deployment descriptor files are either not changed or overwritten by the
-ones included in the imported WAR file, based on your response to the prompt
-that is provided.  In either case, this action does <em>not</em> represent a
-merging of the two sets of deployment descriptors.  </p>
-  <p>To import the
-Web project resources in a WAR file into your workspace, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span>
-</span></span>.</span></li>
-
-<li class="stepexpand"><span> In the Import dialog, select <span><span class="uicontrol">WAR file</span></span> and
-then click <span><span class="uicontrol">Next</span></span>. </span></li>
-
-<li class="stepexpand"><span>Locate the WAR file that you want to import using the <span><span class="uicontrol">Browse</span></span> button.</span>
-</li>
-
-<li class="stepexpand"><span> The wizard assumes you want to create a new Web project with the
-same name as the WAR file. If you accept this choice, the project will be
-created with the same servlet version as specified by the WAR file and in
-the same location. If you want to override these settings, you can click <strong>New</strong> and
-specify your new settings in the Dynamic Web Project wizard.</span>  <p>If
-you want to import the WAR file into an existing Web project, you can select
-the project from the Web project drop-down list. Note that if you select an
-existing project, you must decide whether you want to select the setting to <strong>overwrite
-existing resources without warning</strong></p>
-</li>
-
-<li class="stepexpand"><span>Click <span><span class="uicontrol">Finish</span></span> to populate the Web
-project.</span></li>
-
-</ol>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita
deleted file mode 100644
index 1a9890c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twpcnvrt" xml:lang="en-us">

-<title>Converting static Web projects to dynamic Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>static Web projects<indexterm>converting to dynamic</indexterm></indexterm>

-<indexterm>Web projects<indexterm>converting static to dynamic</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> If you want to add dynamic elements to a static web project,

-such as <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> servlets and JSP files, you must convert the project

-from a static to a dynamic one. To convert a static Web project to a dynamic

-Web project, complete the following steps:</p> </context>

-<steps>

-<step><cmd>Select the project in the Project Explorer view, and then select <ph><uicontrol>Convert

-to a Dynamic Web Project</uicontrol></ph> from the <b>Project</b> menu.</cmd>

-<info>This conversion assumes the  project name and location will be the same.

-The conversion does not change the CSS file specified in the original static

-project, so it will be included in the resulting dynamic Web project. </info>

-</step>

-<step><cmd> Specify the project properties that are available when  <xref

-href="twcreprj.dita" scope="peer"><desc></desc>Creating a Dynamic Web project.</xref></cmd>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
deleted file mode 100644
index 522a484..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Converting static Web projects to dynamic Web projects" />
-<meta content="static Web projects, converting to dynamic, dynamic Web projects, converting from static, Web projects, dynamic" name="DC.subject" />
-<meta content="static Web projects, converting to dynamic, dynamic Web projects, converting from static, Web projects, dynamic" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twpcnvrt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Converting static Web projects to dynamic Web projects</title>
-</head>
-<body id="twpcnvrt"><a name="twpcnvrt"><!-- --></a>
-
-
-<h1 class="topictitle1">Converting static Web projects to dynamic Web projects</h1>
-
-
-<div>
-<div class="section"> <p> If you want to add dynamic elements to a static web project,
-such as Java™ servlets and JSP files, you must convert the project
-from a static to a dynamic one. To convert a static Web project to a dynamic
-Web project, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Select the project in the Project Explorer view, and then select <span><span class="uicontrol">Convert
-to a Dynamic Web Project</span></span> from the <strong>Project</strong> menu.</span>
- This conversion assumes the  project name and location will be the same.
-The conversion does not change the CSS file specified in the original static
-project, so it will be included in the resulting dynamic Web project. 
-</li>
-
-<li class="stepexpand"><span> Specify the project properties that are available when  <a href="twcreprj.html" title="">Creating a Dynamic Web project.</a></span>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
deleted file mode 100644
index afbb10d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twplib" xml:lang="en-us">

-<title>Adding Web library projects</title>

-<prolog><metadata>

-<keywords><indexterm>Web library projects<indexterm>virtual JAR files and

-projects</indexterm></indexterm><indexterm>virtual JAR files associations<indexterm>Web

-library projects</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>Web library projects allow you to associate <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects

-with "virtual" JAR files in a Web project's WEB-INF/lib directory. You can

-reference JAR files that exist elsewhere in the Enterprise Application project

-that contains your Web project, if they are in the Web project's build path,

-and avoid the need to explicitly copy these JAR files into the project's lib

-folder before you publish the Web application to a server.</p><p>To set up

-these associations:</p> </context>

-<steps>

-<step><cmd>Right click on a Web project and select <uicontrol>Properties</uicontrol> from

-the pop-up menu.</cmd><info></info></step>

-<step><cmd>Click on <uicontrol>J2EE Module Dependencies</uicontrol></cmd>

-</step>

-<step><cmd>Set up your associations in the J2EE Module Dependencies window</cmd>

-</step>

-<step><cmd>Click <ph><uicontrol>OK</uicontrol></ph> when you are done.</cmd>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
deleted file mode 100644
index 6aae398..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding Web library projects" />
-<meta content="Web library projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="DC.subject" />
-<meta content="Web library projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twplib" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding Web library projects</title>
-</head>
-<body id="twplib"><a name="twplib"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding Web library projects</h1>
-
-
-<div>
-<div class="section"> <p>Web library projects allow you to associate Java™ projects
-with "virtual" JAR files in a Web project's WEB-INF/lib directory. You can
-reference JAR files that exist elsewhere in the Enterprise Application project
-that contains your Web project, if they are in the Web project's build path,
-and avoid the need to explicitly copy these JAR files into the project's lib
-folder before you publish the Web application to a server.</p>
-<p>To set up
-these associations:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Right click on a Web project and select <span class="uicontrol">Properties</span> from
-the pop-up menu.</span> </li>
-
-<li class="stepexpand"><span>Click on <span class="uicontrol">J2EE Module Dependencies</span></span>
-</li>
-
-<li class="stepexpand"><span>Set up your associations in the J2EE Module Dependencies window</span>
-</li>
-
-<li class="stepexpand"><span>Click <span><span class="uicontrol">OK</span></span> when you are done.</span>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita
deleted file mode 100644
index 23ef25a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twprjset" xml:lang="en-us">

-<title>Setting Web project properties</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>properties settings</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>There are many Web project properties that you can set that affect

-the phases in the lifecycle of your project and its dependencies on other

-Web resources and Web development processes. You might want to verify or update

-these properties after you have updated an existing project or have imported

-Web resources into a project .</p><p>To view or set Web project properties,

-do the following: </p> </context>

-<steps>

-<step><cmd>Right-click on a Web Project, and from the pop-up menu select <ph><uicontrol>Properties</uicontrol></ph>.</cmd>

-</step>

-<step><cmd>Select a property type in the left pane of the Properties dialog

-to view or update properties in the Web project. For each property, you can

-apply changes and modify default settings. Based on whether you have a static

-or a dynamic Web project, the following property types are available:</cmd>

-<info><dl><dlentry>

-<dt>Info</dt>

-<dd>Provides general information about project type, location, and modification

-status. </dd>

-</dlentry><dlentry>

-<dt>BeanInfo Path (Dynamic Web project only)</dt>

-<dd>If you select the Enable Beaninfo Introspection on this project, you can

-specify the contents and order of <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> Bean search paths to provide Bean information

-relevant to the project. You can add, remove, and reorder (using the <ph>Up</ph> and <ph>Down</ph> buttons)

-the packages used to include Bean information.</dd>

-</dlentry><dlentry>

-<dt>Builders</dt>

-<dd>Add, remove, or reorder external tools in the build order. When you select <uicontrol>New</uicontrol> to

-create a new external tool to the list, the New External Tool wizard opens,

-so that you can define the new build tool.</dd>

-</dlentry><dlentry>

-<dt>J2EE (Dynamic Web project only)</dt>

-<dd>Identify Web level specification and modify context root and Web content

-folder name</dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Build

-Path (Dynamic Web project only)</dt>

-<dd>View or change the information about the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build path that you supplied when creating

-the project using the <ph>Create a DynamicWeb Project</ph> wizard. Whenever

-the Web project is rebuilt, any class files that are created or updated will

-be output to the specified output folder. <note>A library entry on the <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build

-path will remain there unless the actual JAR file is deleted from the WEB-INF/lib

-folder. If you remove a library path entry but not the JAR file, the library

-entry will be re-added to the path automatically.</note></dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Compiler

-(Dynamic Web project only)</dt>

-<dd>Define whether to use workspace settings or project setting for compiling <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code,

-including settings for Problems, Style, Compliance and Classfiles, and Build

-Path.</dd>

-</dlentry><dlentry>

-<dt>Javadoc Location (Dynamic Web project only)</dt>

-<dd>Define a default location (URL) for any Javadoc available to the project.</dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> JAR

-Dependencies (Dynamic Web project only)</dt>

-<dd>Define and reorder JAR dependencies for the project. Note that these dependencies

-may differ based on a Web project's association with multiple Enterprise application

-projects.</dd>

-</dlentry><dlentry>

-<dt>JSP Task Tags</dt>

-<dd>Add, edit, or remove JSP task tags and assign tag priorities. These "to

-do" items appear in your Tasks view.</dd>

-</dlentry><dlentry>

-<dt>JSP Compilation</dt>

-<dd>Specify when in the build process a JSP should be set to compile</dd>

-</dlentry><dlentry>

-<dt>JSP Fragment (dynamic Web project only)</dt>

-<dd>Define default encoding, page directive, and content type values for JSP

-fragment documents in the web project.</dd>

-</dlentry><dlentry>

-<dt>Links Validation/Refactoring</dt>

-<dd>Define project-level link management and validation settings. These settings

-override corresponding settings in the Workbench Preference settings for the

-current project.</dd>

-</dlentry><dlentry>

-<dt>Project References</dt>

-<dd>Reference other Web projects that exist on your workbench workspace.</dd>

-</dlentry><dlentry>

-<dt>Server</dt>

-<dd>Select the server instance used to perform necessary development, test,

-and publishing functions for the project.</dd>

-</dlentry><dlentry>

-<dt>Validation</dt>

-<dd>Specify which validators should run for the project, and whether validation

-should occur automatically when resource updates are written to the project.

-The available validators are based on the types of resources in your project.

-By default, validators are automatically run when you save resources in a

-Web project. If you do not want validators to run automatically when you save

-these resources, enable the <uicontrol>Override validation</uicontrol> preferences

-option and disable the <uicontrol>Run validation automatically when you save

-changes to resources</uicontrol> option. <note>You can also  disable automatic

-validation (and builds) for all projects by disabling <uicontrol>Perform build

- automatically on resource modification</uicontrol> from the <uicontrol>Workbench</uicontrol> properties.

-If  you disable automatic builds, you can manually  run a build (and validation)

-by selecting  <menucascade><uicontrol>Project</uicontrol><uicontrol>Rebuild

-project</uicontrol></menucascade>.</note></dd>

-</dlentry><dlentry>

-<dt>Web Content Settings</dt>

-<dd>Provide any applicable Web content settings for a Web project. You can

-specify the document type, CSS profile, and target device.</dd>

-</dlentry><dlentry>

-<dt>Web Project Features</dt>

-<dd>Select the features you want to be enabled for your Web project, such

-as Page Template support.</dd>

-</dlentry></dl></info></step>

-<step><cmd>When you have completed updates to Web project settings, click <ph><uicontrol>OK</uicontrol></ph> to

-save and close the Properties dialog.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
deleted file mode 100644
index 8fcec30..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting Web project properties" />
-<meta content="Web projects, properties settings" name="DC.subject" />
-<meta content="Web projects, properties settings" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twprjset" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting Web project properties</title>
-</head>
-<body id="twprjset"><a name="twprjset"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting Web project properties</h1>
-
-
-<div>
-<div class="section"> <p>There are many Web project properties that you can set that affect
-the phases in the lifecycle of your project and its dependencies on other
-Web resources and Web development processes. You might want to verify or update
-these properties after you have updated an existing project or have imported
-Web resources into a project .</p>
-<p>To view or set Web project properties,
-do the following: </p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Right-click on a Web Project, and from the pop-up menu select <span><span class="uicontrol">Properties</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select a property type in the left pane of the Properties dialog
-to view or update properties in the Web project. For each property, you can
-apply changes and modify default settings. Based on whether you have a static
-or a dynamic Web project, the following property types are available:</span>
- <dl>
-<dt class="dlterm">Info</dt>
-
-<dd>Provides general information about project type, location, and modification
-status. </dd>
-
-
-<dt class="dlterm">BeanInfo Path (Dynamic Web project only)</dt>
-
-<dd>If you select the Enable Beaninfo Introspection on this project, you can
-specify the contents and order of Java™ Bean search paths to provide Bean information
-relevant to the project. You can add, remove, and reorder (using the <span>Up</span> and <span>Down</span> buttons)
-the packages used to include Bean information.</dd>
-
-
-<dt class="dlterm">Builders</dt>
-
-<dd>Add, remove, or reorder external tools in the build order. When you select <span class="uicontrol">New</span> to
-create a new external tool to the list, the New External Tool wizard opens,
-so that you can define the new build tool.</dd>
-
-
-<dt class="dlterm">J2EE (Dynamic Web project only)</dt>
-
-<dd>Identify Web level specification and modify context root and Web content
-folder name</dd>
-
-
-<dt class="dlterm">Java Build
-Path (Dynamic Web project only)</dt>
-
-<dd>View or change the information about the Java build path that you supplied when creating
-the project using the <span>Create a DynamicWeb Project</span> wizard. Whenever
-the Web project is rebuilt, any class files that are created or updated will
-be output to the specified output folder. <div class="note"><span class="notetitle">Note:</span> A library entry on the Java build
-path will remain there unless the actual JAR file is deleted from the WEB-INF/lib
-folder. If you remove a library path entry but not the JAR file, the library
-entry will be re-added to the path automatically.</div>
-</dd>
-
-
-<dt class="dlterm">Java Compiler
-(Dynamic Web project only)</dt>
-
-<dd>Define whether to use workspace settings or project setting for compiling Java code,
-including settings for Problems, Style, Compliance and Classfiles, and Build
-Path.</dd>
-
-
-<dt class="dlterm">Javadoc Location (Dynamic Web project only)</dt>
-
-<dd>Define a default location (URL) for any Javadoc available to the project.</dd>
-
-
-<dt class="dlterm">Java JAR
-Dependencies (Dynamic Web project only)</dt>
-
-<dd>Define and reorder JAR dependencies for the project. Note that these dependencies
-may differ based on a Web project's association with multiple Enterprise application
-projects.</dd>
-
-
-<dt class="dlterm">JSP Task Tags</dt>
-
-<dd>Add, edit, or remove JSP task tags and assign tag priorities. These "to
-do" items appear in your Tasks view.</dd>
-
-
-<dt class="dlterm">JSP Compilation</dt>
-
-<dd>Specify when in the build process a JSP should be set to compile</dd>
-
-
-<dt class="dlterm">JSP Fragment (dynamic Web project only)</dt>
-
-<dd>Define default encoding, page directive, and content type values for JSP
-fragment documents in the web project.</dd>
-
-
-<dt class="dlterm">Links Validation/Refactoring</dt>
-
-<dd>Define project-level link management and validation settings. These settings
-override corresponding settings in the Workbench Preference settings for the
-current project.</dd>
-
-
-<dt class="dlterm">Project References</dt>
-
-<dd>Reference other Web projects that exist on your workbench workspace.</dd>
-
-
-<dt class="dlterm">Server</dt>
-
-<dd>Select the server instance used to perform necessary development, test,
-and publishing functions for the project.</dd>
-
-
-<dt class="dlterm">Validation</dt>
-
-<dd>Specify which validators should run for the project, and whether validation
-should occur automatically when resource updates are written to the project.
-The available validators are based on the types of resources in your project.
-By default, validators are automatically run when you save resources in a
-Web project. If you do not want validators to run automatically when you save
-these resources, enable the <span class="uicontrol">Override validation</span> preferences
-option and disable the <span class="uicontrol">Run validation automatically when you save
-changes to resources</span> option. <div class="note"><span class="notetitle">Note:</span> You can also  disable automatic
-validation (and builds) for all projects by disabling <span class="uicontrol">Perform build
- automatically on resource modification</span> from the <span class="uicontrol">Workbench</span> properties.
-If  you disable automatic builds, you can manually  run a build (and validation)
-by selecting  <span class="menucascade"><span class="uicontrol">Project</span> &gt; <span class="uicontrol">Rebuild
-project</span></span>.</div>
-</dd>
-
-
-<dt class="dlterm">Web Content Settings</dt>
-
-<dd>Provide any applicable Web content settings for a Web project. You can
-specify the document type, CSS profile, and target device.</dd>
-
-
-<dt class="dlterm">Web Project Features</dt>
-
-<dd>Select the features you want to be enabled for your Web project, such
-as Page Template support.</dd>
-
-</dl>
-</li>
-
-<li class="stepexpand"><span>When you have completed updates to Web project settings, click <span><span class="uicontrol">OK</span></span> to
-save and close the Properties dialog.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita
deleted file mode 100644
index ce1102b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twsrvwiz" xml:lang="en-us">

-<title>Creating servlets</title>

-<shortdesc>The servlet wizard helps you create <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> servlets by walking you through the

-creation process and by providing you with output files that you can use or

-that you can modify for use with your Web application. The servlets can run

-on J2EE-compliant Web servers.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To create a servlet, complete the following steps: </p></context>

-<steps>

-<step><cmd>From the J2EE perspective, expand your  <xref href="ccwebprj.dita"

-scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd></step>

-<step><cmd>Right click on the <b>Servlet</b> icon, and select <menucascade>

-<uicontrol>New</uicontrol><uicontrol>Servlet</uicontrol></menucascade> from

-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Servlet</uicontrol> wizard

-appears.</stepresult></step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Modifiers</dt>

-<dd>You can select a modifier in the wizard to specify whether your servlet

-class is public, abstract, or final. Note that classes cannot be both abstract

-and final.</dd>

-</dlentry><dlentry>

-<dt>javax.servlet.Servlet</dt>

-<dd>Although javax.servlet.Servlet is provided as the default interface, you

-can use the wizard to add additional interfaces to implement.</dd>

-</dlentry><dlentry>

-<dt>Interface selection dialog</dt>

-<dd>This dialog appears if you elect to add an interface to your servlet.

-As you type the name of the interface that you are adding, a list of available

-interfaces listed in the Matching types list box updates dynamically to display

-only the interfaces that match the pattern. You should choose an interface

-to see the qualifier, and then click OK when finished.</dd>

-</dlentry><dlentry>

-<dt>Method stubs</dt>

-<dd>You can select any appropriate method stubs to be created in the servlet

-file. The stubs created by using the Inherited abstract methods option must

-be implemented if you do not intend to create an abstract servlet. Note that

-this is not true for Constructors from superclass</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
deleted file mode 100644
index 6168cca..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating servlets" />
-<meta name="abstract" content="The servlet wizard helps you create Java servlets by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The servlets can run on J2EE-compliant Web servers." />
-<meta name="description" content="The servlet wizard helps you create Java servlets by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The servlets can run on J2EE-compliant Web servers." />
-<meta content="servlets, creating" name="DC.subject" />
-<meta content="servlets, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twsrvwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating servlets</title>
-</head>
-<body id="twsrvwiz"><a name="twsrvwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating servlets</h1>
-
-
-
-<div><p>The servlet wizard helps you create Java™ servlets by walking you through the
-creation process and by providing you with output files that you can use or
-that you can modify for use with your Web application. The servlets can run
-on J2EE-compliant Web servers.</p>
-
-<div class="section"> <p>To create a servlet, complete the following steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the J2EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span></li>
-
-<li class="stepexpand"><span>Right click on the <strong>Servlet</strong> icon, and select <span class="menucascade">
-<span class="uicontrol">New</span> &gt; <span class="uicontrol">Servlet</span></span> from
-the pop-up menu.</span>  The <span class="uicontrol">Create Servlet</span> wizard
-appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Modifiers</dt>
-
-<dd>You can select a modifier in the wizard to specify whether your servlet
-class is public, abstract, or final. Note that classes cannot be both abstract
-and final.</dd>
-
-
-<dt class="dlterm">javax.servlet.Servlet</dt>
-
-<dd>Although javax.servlet.Servlet is provided as the default interface, you
-can use the wizard to add additional interfaces to implement.</dd>
-
-
-<dt class="dlterm">Interface selection dialog</dt>
-
-<dd>This dialog appears if you elect to add an interface to your servlet.
-As you type the name of the interface that you are adding, a list of available
-interfaces listed in the Matching types list box updates dynamically to display
-only the interfaces that match the pattern. You should choose an interface
-to see the qualifier, and then click OK when finished.</dd>
-
-
-<dt class="dlterm">Method stubs</dt>
-
-<dd>You can select any appropriate method stubs to be created in the servlet
-file. The stubs created by using the Inherited abstract methods option must
-be implemented if you do not intend to create an abstract servlet. Note that
-this is not true for Constructors from superclass</dd>
-
-</dl>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap
deleted file mode 100644
index f1ed01c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map linking="none" title="Web application development">

-<topicmeta></topicmeta>

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview">

-<topicref href="topics/cwtfeatures.dita" navtitle="Web tools features">

-<topicref href="topics/ccwebvw.dita" navtitle="Project Explorer view and Web development">

-</topicref>

-<topicref href="topics/cwebresources.dita" navtitle="Web resources"></topicref>

-<topicref href="topics/cwebpagedesign.dita" navtitle="Web page design"></topicref>

-</topicref>

-</topicref>

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects">

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files">

-</topicref>

-<topicref href="topics/twcreprj.dita" navtitle="Creating a dynamic Web project">

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications">

-</topicref>

-</topicref>

-<topicref href="topics/twcresta.dita" navtitle="Creating a static Web project">

-<topicref href="topics/twpcnvrt.dita" navtitle="Converting static Web projects to dynamic Web projects">

-</topicref>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects"></topicref>

-</topicref>

-<topicref href="topics/twimpwar.dita" navtitle="Importing Web archive (WAR) files">

-</topicref>

-<topicref href="topics/twcrewar.dita" navtitle="Exporting Web Archive (WAR) files">

-</topicref>

-<topicref href="topics/twplib.dita" navtitle="Adding Web library projects">

-</topicref>

-<topicref href="topics/twprjset.dita" navtitle="Setting Web project properties">

-</topicref>

-</topicref>

-<topicref href="topics/cwwedtvw.dita" navtitle="Workbench integration with Web editors">

-</topicref>

-<topicref href="topics/tjdetags.dita" navtitle="Creating and editing Web pages - overview">

-<topicref href="topics/tjcrehtm.dita" navtitle="Creating HTML and XHTML files and framesets">

-</topicref>

-<topicref href="topics/tjprefs.dita" navtitle="Defining HTML file preferences">

-</topicref>

-<topicref href="topics/tstylesheet.dita" navtitle="Creating cascading style sheets">

-</topicref>

-<topicref href="topics/twsrvwiz.dita" navtitle="Creating servlets">

-<topicref href="topics/cwservbn.dita" navtitle="Servlets"></topicref>

-</topicref>

-<topicref href="topics/tjcrejsp.dita" navtitle="Creating JavaServer Pages (JSP) files">

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</topicref>

-</topicref>

-<topicref href="topics/twcvsr.dita" navtitle="Setting CVS repository defaults">

-</topicref>

-<topicref href="topics/tservertarget.dita" navtitle="Server targeting for Web applications">

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
deleted file mode 100644
index f274bd5..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Web application development" topic="topics/ccwtover.html">
-<topic label="Web application overview" href="topics/ccwtover.html">
-<topic label="Web tools features" href="topics/cwtfeatures.html">
-<topic label="Project Explorer view and Web development" href="topics/ccwebvw.html"/>
-<topic label="Web resources" href="topics/cwebresources.html"/>
-<topic label="Web page design" href="topics/cwebpagedesign.html"/>
-</topic>
-</topic>
-<topic label="Web projects" href="topics/cwebprojects.html">
-<topic label="Web archive (WAR) files" href="topics/cwwarovr.html"/>
-<topic label="Creating a dynamic Web project" href="topics/twcreprj.html">
-<topic label="Dynamic Web projects and applications" href="topics/ccwebprj.html"/>
-</topic>
-<topic label="Creating a static Web project" href="topics/twcresta.html">
-<topic label="Converting static Web projects to dynamic Web projects" href="topics/twpcnvrt.html"/>
-<topic label="Static Web projects" href="topics/ccstatic.html"/>
-</topic>
-<topic label="Importing Web archive (WAR) files" href="topics/twimpwar.html"/>
-<topic label="Exporting Web Archive (WAR) files" href="topics/twcrewar.html"/>
-<topic label="Adding Web library projects" href="topics/twplib.html"/>
-<topic label="Setting Web project properties" href="topics/twprjset.html"/>
-</topic>
-<topic label="Workbench integration with Web editors" href="topics/cwwedtvw.html"/>
-<topic label="Creating and editing Web pages - overview" href="topics/tjdetags.html">
-<topic label="Creating HTML and XHTML files and framesets" href="topics/tjcrehtm.html"/>
-<topic label="Defining HTML file preferences" href="topics/tjprefs.html"/>
-<topic label="Creating cascading style sheets" href="topics/tstylesheet.html"/>
-<topic label="Creating servlets" href="topics/twsrvwiz.html">
-<topic label="Servlets" href="topics/cwservbn.html"/>
-</topic>
-<topic label="Creating JavaServer Pages (JSP) files" href="topics/tjcrejsp.html">
-<topic label="JavaServer Pages (JSP) technology" href="topics/cpdjsps.html"/>
-</topic>
-</topic>
-<topic label="Setting CVS repository defaults" href="topics/twcvsr.html"/>
-<topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore b/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.project b/docs/org.eclipse.wst.xml.ui.infopop/.project
deleted file mode 100644
index 110ff69..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
deleted file mode 100644
index 364fca9..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="webx0060">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating XML related files (DTDs, XML files, XML schemas). Changing the encoding causes any new, XML related files that are created from scratch to use the selected encoding.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html" label="Specifying XML default encoding and line delimiters"/>
-</context>
-<context id="webx0061">
-<description>This page lets you specify the formatting and content assist preferences that will be used when editing an XML file.
-
-Enter a maximum width in the <b>Line width</b> field to specify when a line should be broken to fit onto more than one line. This will be applied when the document is formatted.
-
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted.
-
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
-
-If you prefer to use spaces, select <b>Indent using spaces</b>.
-
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-
-To apply these formatting styles, right-click in your XML document, and click <b>Format &gt; Document</b>.
-
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-
-If you select <b>Strict</b> from the <b>Suggestion strategy</b> list, suggestions that are grammatically valid will be shown first (with bold icons) in the content assist list. Other suggestions that are applicable to the element scope, but not grammatically valid, will be shown below them with a de-emphasized icon. The default value for this field is <b>Lax</b>.
-
-If a DTD or schema (or other model) is not specified for an XML file, selecting <b>Use inferred grammar in absence of DTD/Schema</b> allows the editor to "guess" what elements or attributes are available based on existing content.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html" label="Defining XML editor preferences"/>
-</context>
-<context id="webx0062">
-<description>This page lets you customize the syntax highlighting that the XML editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Defaults</b> button to set the highlighting styles back to their default values. If you only want to reset the value for a particular content type, select it in the <b>Content type</b> field, the click the <b>Restore Default</b> button next to it.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html" label="Setting source highlighting styles"/>
-</context>
-<context id="webx0063">
-<description>This page lets you create new templates and edit existing ones that can be used when editing an XML file. A template is a chunk of predefined code that you can insert into a file.
-
-Click <b>New</b> if you want to create a completely new template.
-
-Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist.
-
-If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the <b>date</b> variable indicates the current date will be inserted.
-
-You can edit, remove, import, or export a template by using the same Preferences page. If you have modified a default template, you can restore it to its default value. You can also restore a removed template if you have not exited from the workbench since it was removed.
-
-If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the <b>Templates</b> preferences page.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html" label="Working with XML templates"/>
-</context>
-<context id="xmlm1200">
-<description>Cleanup options enable you to update a document so that it is well-formed and consistently formatted.
-
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-
-- <b>Compress empty element tags</b>: Compress element tags with no content to one tag with an end tag delimiter (ie: change &lt;tag&gt;&lt;/tag&gt; to &lt;tag/&gt;).
-
-- <b>Insert required attributes</b>: Inserts any missing attributes that are required by the tag to make the element or document well-formed.
-
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html" label="Editing in the Source view"/>
-</context>
-<context id="xcui0500">
-<description>Enter the name of the attribute in the <b>Name</b> field, then enter the value of the attribute in the <b>Value</b> field. Click <b>OK</b>. The attribute will be added to the file.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-</context>
-<context id="xcui0010">
-<description>The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can use the <b>Public ID</b> field to create an association using an XML Catalog entry or the <b>System ID</b> field to create an association using a file in the workbench.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
-</context>
-<context id="xcui0020">
-<description>This should match the name of your XML file's root element.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
-</context>
-<context id="xcui0030">
-<description>The value in this field is the Public Identifier. It is used to associate the XML file (using an XML catalog entry) with a DTD file by providing a hint to the XML processor.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
-</context>
-<context id="xcui0050">
-<description>The value in this field is the DTD the XML file is associated with. You can change the DTD the file is associated with by editing this field. The XML processor will try to use the Public ID to locate the DTD, and if this fails, it will use the System ID to find it.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
-</context>
-<context id="xcui0600">
-<description>Enter the name of the element in the <b>Element name</b> field, then click <b>OK</b>. The element will be added to the file.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-</context>
-<context id="xcui0300">
-<description>A processing instruction is a syntax in XML for passing instructions along to the application using an XML document. The <b>Target</b> field is used to identify the application the instructions belongs to. The <b>Data</b> field contains the instructions.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html" label="Editing XML processing instructions"/>
-</context>
-<context id="xcui0100">
-<description>This is a read-only dialog. Select the entry you want to edit and click <b>Edit</b>.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information"/>
-</context>
-<context id="xcui0200">
-<description>The value in the <b>Namespace Name</b> field is the namespace the XML file belongs to.
-
-All qualified elements and attributes in the XML file associated with the namespace will be prefixed with the <b>Prefix</b> value.
-
-The <b>Location Hint</b> field contains the location of the XML schema the XML file is associated with. An XML Catalog ID or a URI can be specified in this field. You can search for the schema you want to use by clicking <b>Browse</b>. Once you select a file, the <b>Namespace Name</b> and <b>Prefix</b> fields will automatically be filled with the appropriate values from the schema (you must leave the fields blank for this to occur). <b>Note</b>: If you are creating an XML file from an XML schema, you cannot change the <b>Namespace Name</b> or <b>Location Hint</b> values.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information"/>
-</context>
-<context id="xcui0400">
-<description>An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a URI (which contains information about a DTD or XML schema's location). Select the catalog entry you want to associate your XML file with.</description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
deleted file mode 100644
index 60ebab5..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="xml_source_HelpId">
-<description>The XML source view lets you edit a file that is coded in the Extensible Markup Language. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html" label="Editing in the Source view"/>
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index df3c14e..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.ui.infopop; singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml b/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
deleted file mode 100644
index 263c6e1..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
- 
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="xmlm3000">
-<description>The Design view of the XML editor represents your file simultaneously as a table and a tree, which helps make navigation and editing easier. Depending on the kind of file you are working with, content and attribute values can be edited directly in table cells, while pop-up menus on tree elements give alternatives that are valid for that location.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
deleted file mode 100644
index 4e781c5..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="xmlc0101">
-<description>Select the <b>Create XML file from a DTD file</b> radio button to create an XML file from a DTD file. The file will contain the selected root element, populated with any required elements and attributes.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-</context>
-<context id="xmlc0102">
-<description>Select the <b>Create XML file from an XML schema file</b> radio button to create an XML file from an XML schema. The file will contain the selected root element of the XML schema and any elements or attributes it contains.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0103">
-<description>Select the <b>Create XML file from scratch</b> radio button if you want to create an XML file not associated with any XML schema or DTD file.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html" label="Creating empty XML files"/>
-</context>
-<context id="xmlc0500">
-<description>Select the <b>Select file from workbench</b> radio button if you want to create your XML file from a DTD or XML schema that is in the workbench.
-
-Select the <b>Select XML Catalog entry</b> radio button if you want to use a file listed in the XML Catalog to create your XML file.</description>
-</context>
-<context id="xmlc0410">
-<description>The root element of an XML file is the element that contains all other elements in that file. All elements defined in the DTD or all global elements defined in the XML schema are included in this list.
-
-<b>Note</b>: If you do not have any elements in your DTD or any global elements in your XML schema, you cannot create an XML file from it.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0441">
-<description>If you select this check box, both mandatory and optional attributes will be generated. If you do not select it, only mandatory attributes will be generated.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0442">
-<description>If you select this check box, both the mandatory and optional elements will be generated. If you do not select it, only mandatory elements will be generated.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0443">
-<description>If you select this check box, the first choice of a required choice will be generated in your XML file.
-
-For example, if you have the following code in your source file:
-
-<b>&lt;choice&gt; &lt;element name="a" type="string&gt; &lt;element name="b" type="integer&gt; &lt;/choice&gt;</b> 
-
-and you select this check box, an element such as the following will be created in your XML file:
-
-<b>&lt;a&gt;hello&lt;/a&gt;</b> </description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0444">
-<description>If you select this check box, any elements and attributes generated will be filled with sample data, such as <b>&lt;text&gt;EmptyText&lt;/text&gt;.</b> Otherwise, they will be empty - that is, <b>&lt;text&gt;&lt;/text&gt;.</b> </description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
-</context>
-<context id="xmlc0210">
-<description>The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-</context>
-<context id="xmlc0220">
-<description>The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.</description>
-<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/about.html b/docs/org.eclipse.wst.xml.ui.infopop/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
deleted file mode 100644
index 29a969b..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
-               EditorXmlContexts.xml,\
-               EditorXmlContexts2.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml
-src.includes = XMLWizardContexts.xml,\
-               TableTree.xml
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties b/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
deleted file mode 100644
index 8725f94..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-
-pluginName     = XML infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
deleted file mode 100644
index 2287c84..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorXmlContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="EditorXmlContexts2.xml" plugin ="org.eclipse.core.runtime"/>
-       <contexts file="TableTree.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="XMLWizardContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
-
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore b/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore
deleted file mode 100644
index b53298e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.wst.xmleditor.doc.user_1.0.0.jar
-bak
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.project b/docs/org.eclipse.wst.xmleditor.doc.user/.project
deleted file mode 100644
index 2e33af6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xmleditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml
deleted file mode 100644
index 380e99e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
-			<property name="args.input" location="XMLBuilderrel.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 96e38c0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xmleditor.doc.user; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
deleted file mode 100644
index 09ea42a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map collection-type="sequence" title="Developing XML files">

-<topicref href="topics/cworkXML.dita" linking="sourceonly" navtitle="Working with XML files"><?Pub Caret1?>

-<topicref href="topics/ccreatxm.dita" navtitle="Creating XML files">

-<topicref href="topics/tcretxml.dita" id="xmlcretxml" navtitle="Creating empty XML files">

-</topicref>

-<topicref href="topics/tcrexdtd.dita" navtitle="Generating XML files from DTDs">

-</topicref>

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-</topicref>

-<topicref href="topics/rlimitations_slushXML.dita" navtitle="Limitations of XML Editor"

-toc="no"></topicref>

-<topicref href="topics/txedttag.dita" navtitle="Editing XML files">

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor">

-<topicref href="topics/txprefs.dita" navtitle="Defining XML editor preferences">

-<topicref href="topics/ttaghilt.dita" id="taghilt" navtitle="Setting source highlighting styles">

-</topicref>

-<topicref href="topics/tedtenc.dita" navtitle="Specifying XML default encoding line delimiters">

-<topicref href="topics/cxmlenc.dita" navtitle="XML and HTML encodings"></topicref>

-</topicref>

-<topicref href="topics/tsugstrat.dita" navtitle="Setting the XML source suggestion strategy used by content assist">

-</topicref>

-</topicref>

-</topicref>

-<topicref href="topics/txedtdes.dita" id="txedtdes" linking="none" navtitle="Editing in the Design view">

-<topicref href="topics/tedtdoc.dita" id="tedtdoc" navtitle="Editing DOCTYPE declarations">

-</topicref>

-<topicref href="topics/tedtsch.dita" id="tedtsch" navtitle="Editing namespace information">

-</topicref>

-<topicref href="topics/tedtproc.dita" id="tedtproc" navtitle="Editing XML processing instructions">

-</topicref>

-</topicref>

-<topicref href="topics/txedtsrc.dita" id="txedsrc" linking="none" navtitle="Editing in the Source view">

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<topicref href="topics/twmacro.dita" id="twmacro" navtitle="Working with XML templates">

-</topicref>

-</topicref>

-<topicref href="topics/tedtcnst.dita" id="tedtcnt" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<topicref href="topics/txsityp.dita" navtitle="Using xsi:type"></topicref>

-<topicref href="topics/rextctn.dita" id="rextctn" navtitle="Editing XML documents with multiple namespaces">

-</topicref>

-</topicref>

-<topicref href="topics/twxvalid.dita" id="xmlvalid" navtitle="Validating XML files">

-</topicref>

-<topicref href="topics/cxmlcat.dita" linking="none" navtitle="XML file associations with DTDs and XML schemas">

-<topicref href="topics/txmlcat.dita" id="txmlcat" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<topicref href="topics/tedtgram.dita" id="tedtgram" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-</topicref>

-<topicref href="topics/rxmlbicons.dita" id="ricons" navtitle="Icons used in the XML editor">

-</topicref>

-</topicref>

-</map>

-<?Pub *0000003143?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
deleted file mode 100644
index 94554d5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Developing XML files" topic="topics/cworkXML.html">
-<topic label="Working with XML files" href="topics/cworkXML.html">
-<topic label="Creating XML files" href="topics/ccreatxm.html">
-<topic label="Creating XML files" href="topics/tcretxml.html"/>
-<topic label="Generating XML files from DTDs" href="topics/tcrexdtd.html"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-</topic>
-<topic label="Editing XML files" href="topics/txedttag.html">
-<topic label="XML editor" href="topics/cwxmledt.html">
-<topic label="Defining XML editor preferences" href="topics/txprefs.html">
-<topic label="Setting source highlighting styles" href="topics/ttaghilt.html"/>
-<topic label="Specifying XML default encoding line delimiters" href="topics/tedtenc.html">
-<topic label="XML and HTML encodings" href="topics/cxmlenc.html"/>
-</topic>
-<topic label="Setting the XML source suggestion strategy used by content assist" href="topics/tsugstrat.html"/>
-</topic>
-</topic>
-<topic label="Editing in the Design view" href="topics/txedtdes.html">
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-</topic>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html">
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-</topic>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<topic label="Using xsi:type" href="topics/txsityp.html"/>
-<topic label="Editing XML documents with multiple namespaces" href="topics/rextctn.html"/>
-</topic>
-<topic label="Validating XML files" href="topics/twxvalid.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html">
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-</topic>
-<topic label="Icons used in the XML editor" href="topics/rxmlbicons.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
deleted file mode 100644
index 74ddb7c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map>

-<topicgroup collection-type="family"><?Pub Caret1?>

-<topicref href="topics/tcretxml.dita" id="xmlcretxml" navtitle="Creating empty XML files">

-</topicref>

-<topicref href="topics/tcrexdtd.dita" navtitle="Generating XML files from DTDs">

-</topicref>

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-<topicref href="topics/txedttag.dita" linking="targetonly" navtitle="Editing XML files">

-</topicref>

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedttag.dita" linking="sourceonly" navtitle="Editing XML files">

-</topicref>

-<topicref href="topics/cwxmledt.dita" linking="targetonly" navtitle="XML editor">

-</topicref>

-<topicref href="topics/txedtdes.dita" linking="targetonly" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/txedtsrc.dita" linking="targetonly" navtitle="Editing in the Source view">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-<topicref href="topics/tedtcnst.dita" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<topicref href="topics/tedtdoc.dita" navtitle="Editing DOCTYPE declarations">

-</topicref>

-<topicref href="topics/txmlcat.dita" id="txmlcat" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<topicref href="topics/tedtgram.dita" id="tedtgram" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-<topicref href="topics/tedtcnst.dita" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-<topicref href="topics/txmlcat.dita" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<topicref href="topics/tedtgram.dita" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/tedtproc.dita" id="tedtproc" linking="targetonly" navtitle="Editing XML processing instructions">

-</topicref>

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/twxvalid.dita" navtitle="Validating XML files"></topicref>

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-<topicref href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"

-linking="targetonly" navtitle="XML namespaces" scope="peer"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-<topicref href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"

-linking="targetonly" navtitle="XML namespaces" scope="peer"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" id="txedsrc" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/twmacro.dita" navtitle="Working with XML templates">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/ttaghilt.dita" navtitle="Setting source highlighting styles">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<topicref href="topics/twmacro.dita" navtitle="Working with XML templates">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<topicref href="topics/tsugstrat.dita" navtitle="XML source suggestion strategy">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtdoc.dita" navtitle="Editing DOCTYPE declarations">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtproc.dita" navtitle="Editing XML processing instructions">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/rxmlbicons.dita" navtitle="Icons used in the XML editor">

-</topicref>

-</topicgroup>

-</map>

-<?Pub *0000006002?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml
deleted file mode 100644
index 400ab50..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc topic="topics/tcretxml.html">
-<topic label="Creating XML files" href="topics/tcretxml.html"/>
-<topic label="Generating XML files from DTDs" href="topics/tcrexdtd.html"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-<topic label="Editing XML files" href="topics/txedttag.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing XML files" href="topics/txedttag.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Validating XML files" href="topics/twxvalid.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-<topic label="XML namespaces" href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="XML namespaces" href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Setting source highlighting styles" href="topics/ttaghilt.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Setting the XML source suggestion strategy used by content assist" href="topics/tsugstrat.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Icons used in the XML editor" href="topics/rxmlbicons.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/about.html b/docs/org.eclipse.wst.xmleditor.doc.user/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
deleted file mode 100644
index 9f51d54..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = XMLBuildermap_toc.xml,\
-               about.html,\
-               images/,\
-               org.eclipse.wst.xmleditor.doc.userindex.xml,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
deleted file mode 100644
index 6b0872c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
deleted file mode 100644
index 28c2ccb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
deleted file mode 100644
index 3300f82..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
deleted file mode 100644
index 492c14f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
deleted file mode 100644
index bea9974..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
deleted file mode 100644
index afabdda..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
deleted file mode 100644
index 4742b8c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
deleted file mode 100644
index 74436d8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
deleted file mode 100644
index 049cac6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif
deleted file mode 100644
index b4ea849..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs b/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs
deleted file mode 100644
index 795be84..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable b/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
deleted file mode 100644
index e423242..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
deleted file mode 100644
index 66ea04d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

-org.eclipse.wst.xmleditor.doc.user=org.eclipse.wst.xmleditor.doc.user\n1.0.300.qualifier

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index 5d57cad..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
deleted file mode 100644
index 56fe33a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,29 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html=0

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments b/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
deleted file mode 100644
index 19b5d0c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
deleted file mode 100644
index f0c28f1..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XMLBuildermap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-<extension
-        point="org.eclipse.help.index">
-        <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
-  </extension>
-  
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html
deleted file mode 100644
index 384cdcd..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_43" href="#IDX1_43">C</a>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_45" href="#IDX1_45">E</a>
-<a name="IDX0_4C" href="#IDX1_4C">L</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
-<ul class="indexlist">
-<li>character encoding
-<ul class="indexlist">
-<li><a href="topics/cxmlenc.html#cxmlenc">text in files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>DOCTYPE declarations
-<ul class="indexlist">
-<li><a href="topics/tedtdoc.html#tedtdoc">XML editor</a>
-</li>
-</ul>
-</li>
-<li>DTD
-<ul class="indexlist">
-<li><a href="topics/tcrexdtd.html#tcrexdtd">generating XML files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
-<ul class="indexlist">
-<li>encodings
-<ul class="indexlist">
-<li><a href="topics/cxmlenc.html#cxmlenc">supported character sets</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4C" href="#IDX0_4C">L</a></strong>
-<ul class="indexlist">
-<li>line delimiters
-<ul class="indexlist">
-<li><a href="topics/tedtenc.html#tedtenc">XML files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>preferences
-<ul class="indexlist">
-<li><a href="topics/txprefs.html#txprefs">XML editor</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XML catalog
-<ul class="indexlist">
-<li><a href="topics/txmlcat.html#txmlcat">adding entries</a>
-</li>
-<li><a href="topics/cxmlcat.html#cxmlcat">overview</a>
-</li>
-</ul>
-</li>
-<li>XML editor
-<ul class="indexlist">
-<li><a href="topics/twcdast.html#twcdast">content assist</a>
-</li>
-<li><a href="topics/txedtdes.html#txedtdes">Design view</a>
-</li>
-<li><a href="topics/tedtdoc.html#tedtdoc">DOCTYPE declarations</a>
-</li>
-<li><a href="topics/tedtcnst.html#tedtcnst">editing with constraints</a>
-</li>
-<li><a href="topics/rxmlbicons.html#ricons">icons</a>
-</li>
-<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
-</li>
-<li><a href="topics/cwxmledt.html#cwxmledt">overview</a>
-</li>
-<li><a href="topics/txprefs.html#txprefs">preferences</a>
-</li>
-<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
-</li>
-<li><a href="topics/ttaghilt.html#ttaghilt">setting source highlighting styles</a>
-</li>
-<li><a href="topics/tsugstrat.html#xmlsourcesuggestionstrategy">source suggestion strategy</a>
-</li>
-<li><a href="topics/txedtsrc.html#txedtsrc">Source view</a>
-</li>
-<li><a href="topics/tedtgram.html#tedtgram">updating XML files</a>
-</li>
-<li><a href="topics/txedttag.html#txedttag">XML files</a>
-</li>
-</ul>
-</li>
-<li>XML files
-<ul class="indexlist">
-<li><a href="topics/cxmlcat.html#cxmlcat">associations</a>
-</li>
-<li><a href="topics/twcdast.html#twcdast">content assist</a>
-</li>
-<li><a href="topics/tcretxml.html#tcretxml">creating</a>
-</li>
-<li><a href="topics/txedttag.html#txedttag">editing</a>
-</li>
-<li><a href="topics/tedtcnst.html#tedtcnst">editing with constraints</a>
-</li>
-<li><a href="topics/tcrexdtd.html#tcrexdtd">generating from DTDs</a>
-</li>
-<li><a href="topics/tcrexxsd.html#tcrexxsd">generating from XML schemas</a>
-</li>
-<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
-</li>
-<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
-</li>
-<li><a href="topics/tedtenc.html#tedtenc">specifying line delimiters</a>
-</li>
-<li><a href="topics/tedtgram.html#tedtgram">updating with associated changes</a>
-</li>
-<li><a href="topics/twxvalid.html#twxvalid">validating</a>
-</li>
-</ul>
-</li>
-<li>XML schemas
-<ul class="indexlist">
-<li><a href="topics/tcrexxsd.html#tcrexxsd">generating XML files</a>
-</li>
-</ul>
-</li>
-<li>XML templates
-<ul class="indexlist">
-<li><a href="topics/twmacro.html#twmacro">working with predefined code</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
deleted file mode 100644
index 4b66584..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="XML files">
-    <entry keyword="creating">
-      <topic href="topics/tcretxml.html#tcretxml" title="Creating XML files"/>
-    </entry>
-    <entry keyword="generating from DTDs">
-      <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
-    </entry>
-    <entry keyword="generating from XML schemas">
-      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
-    </entry>
-    <entry keyword="editing">
-      <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
-    </entry>
-    <entry keyword="specifying line delimiters">
-      <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
-    </entry>
-    <entry keyword="namespace information">
-      <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
-    </entry>
-    <entry keyword="processing instructions">
-      <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
-    </entry>
-    <entry keyword="content assist">
-      <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
-    </entry>
-    <entry keyword="editing with constraints">
-      <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
-    </entry>
-    <entry keyword="validating">
-      <topic href="topics/twxvalid.html#twxvalid" title="Validating XML files"/>
-    </entry>
-    <entry keyword="associations">
-      <topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
-    </entry>
-    <entry keyword="updating with associated changes">
-      <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="DTD">
-    <entry keyword="generating XML files">
-      <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
-    </entry>
-  </entry>
-  <entry keyword="XML schemas">
-    <entry keyword="generating XML files">
-      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="XML editor">
-    <entry keyword="XML files">
-      <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cwxmledt.html#cwxmledt" title="XML editor"/>
-    </entry>
-    <entry keyword="preferences">
-      <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
-    </entry>
-    <entry keyword="setting source highlighting styles">
-      <topic href="topics/ttaghilt.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-    <entry keyword="source suggestion strategy">
-      <topic href="topics/tsugstrat.html#xmlsourcesuggestionstrategy" title="Setting the XML source suggestion strategy used by content assist"/>
-    </entry>
-    <entry keyword="Design view">
-      <topic href="topics/txedtdes.html#txedtdes" title="Editing in the Design view"/>
-    </entry>
-    <entry keyword="DOCTYPE declarations">
-      <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
-    </entry>
-    <entry keyword="namespace information">
-      <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
-    </entry>
-    <entry keyword="processing instructions">
-      <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
-    </entry>
-    <entry keyword="Source view">
-      <topic href="topics/txedtsrc.html#txedtsrc" title="Editing in the Source view"/>
-    </entry>
-    <entry keyword="content assist">
-      <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
-    </entry>
-    <entry keyword="editing with constraints">
-      <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
-    </entry>
-    <entry keyword="updating XML files">
-      <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
-    </entry>
-    <entry keyword="icons">
-      <topic href="topics/rxmlbicons.html#ricons" title="Icons used in the XML editor"/>
-    </entry>
-  </entry>
-  <entry keyword="preferences">
-    <entry keyword="XML editor">
-      <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="line delimiters">
-    <entry keyword="XML files">
-      <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
-    </entry>
-  </entry>
-  <entry keyword="character encoding">
-    <entry keyword="text in files">
-      <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
-    </entry>
-  </entry>
-  <entry keyword="encodings">
-    <entry keyword="supported character sets">
-      <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
-    </entry>
-  </entry>
-  <entry keyword="DOCTYPE declarations">
-    <entry keyword="XML editor">
-      <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
-    </entry>
-  </entry>
-  <entry keyword="XML templates">
-    <entry keyword="working with predefined code">
-      <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="XML catalog">
-    <entry keyword="overview">
-      <topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
-    </entry>
-    <entry keyword="adding entries">
-      <topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
deleted file mode 100644
index 13ed1ee..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-
-pluginName     = XML editor
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
deleted file mode 100644
index f0c28f1..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XMLBuildermap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-<extension
-        point="org.eclipse.help.index">
-        <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
-  </extension>
-  
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
deleted file mode 100644
index 9019048..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="creatingxmlfiles" xml:lang="en-us">

-<title>Creating XML files</title>

-<shortdesc>This section contains information on creating XML files:</shortdesc>

-<conbody></conbody>

-<related-links>

-<linklist>

-<link href="tcretxml.dita"><linktext>Creating empty XML files</linktext></link>

-<link href="tcrexdtd.dita"><linktext>Generating XML files from a DTDs</linktext>

-</link>

-<link href="tcrexxsd.dita"><linktext>Generating XML files from XML

-schemas</linktext></link>

-</linklist>

-</related-links>

-</concept>

-<?Pub *0000000718?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
deleted file mode 100644
index 1ebbd51..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML files" />
-<meta name="abstract" content="This section contains information on creating XML files:" />
-<meta name="description" content="This section contains information on creating XML files:" />
-<meta scheme="URI" name="DC.Relation" content="tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexxsd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="creatingxmlfiles" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML files</title>
-</head>
-<body id="creatingxmlfiles"><a name="creatingxmlfiles"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML files</h1>
-
-
-<div><p>This section contains information on creating XML files:</p>
-</div>
-
-<div>
-<div class="linklist">
-<div><a href="tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating empty XML files</a></div>
-<div><a href="tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from a DTDs</a></div>
-<div><a href="tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML
-schemas</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
deleted file mode 100644
index e4aa40e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML files" />
-<meta name="abstract" content="This section contains information on the following:" />
-<meta name="description" content="This section contains information on the following:" />
-<meta scheme="URI" name="DC.Relation" content="ccreatxm.html" />
-<meta scheme="URI" name="DC.Relation" content="txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="twxvalid.html" />
-<meta scheme="URI" name="DC.Relation" content="cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="rxmlbicons.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithxmlfiles" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML files</title>
-</head>
-<body id="workingwithxmlfiles"><a name="workingwithxmlfiles"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML files</h1>
-
-
-<div><p>This section contains information on the following:</p>
-</div>
-
-<div>
-<div class="linklist">
-<div><a href="ccreatxm.html" title="This section contains information on creating XML files:">Creating XML files</a></div>
-<div><a href="txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-<div><a href="twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
-<div><a href="cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML
-schema</a></div>
-<div><a href="rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
deleted file mode 100644
index a6fa3e1..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithxmlfiles" xml:lang="en-us">

-<title>Working with XML files</title>

-<shortdesc>This section contains information on the following:</shortdesc>

-<conbody></conbody>

-<related-links>

-<linklist>

-<link href="ccreatxm.dita"><linktext>Creating XML files</linktext></link>

-<link href="txedttag.dita"><linktext>Editing XML files</linktext>

-</link>

-<link href="twxvalid.dita"><linktext>Validating XML files</linktext></link>

-<link href="cxmlcat.dita"><linktext>XML file associations with DTDs and XML

-schema</linktext></link>

-<link href="rxmlbicons.dita"><linktext>Icons used in the XML editor</linktext>

-</link>

-</linklist>

-</related-links>

-</concept>

-<?Pub *0000000871?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
deleted file mode 100644
index 34a2e0f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<concept id="cwxmledt" xml:lang="en-us">

-<title>XML editor</title>

-<titlealts>

-<searchtitle>XML editor</searchtitle>

-</titlealts>

-<shortdesc>The XML editor is a tool for creating and viewing XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>You can use it to perform a variety of tasks such as:</p>

-<ul>

-<li>Creating new, empty XML files or generating them from existing DTDs or

-existing XML schemas</li>

-<li>Editing XML files</li>

-<li>Importing existing XML files for structured viewing</li>

-<li>Associating XML files with DTDs or XML schemas</li>

-</ul>

-<p>The XML editor has two main views - the Source view and the Design view.

-You can also use the <b>Outline</b> view to insert and delete elements.</p>

-<section><title>Source view</title><p>The Source view enables you to view

-and work directly with a file's source code. Many of the XML editing features

-in the XML editor Source view are very similar to those available in the Source

-view of Page Designer.</p><p>The Source view has many text editing features,

-such as: <ul>

-<li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>

-<li> Content assist, which uses the information in a DTD or schema content

-model to provide a list of acceptable continuations depending on where the

-cursor is located in an XML file, or what has just been type</li>

-<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute

-value, one double-click selects that value, another double click selects the

-attribute-value pair, and a third double-click selects the entire tag. This

-makes it easier to copy and paste commonly used pieces of XML.</li>

-</ul></p></section>

-<section><title>Design view</title><p>The XML editor also has a Design view.

-In it: <ul>

-<li>The XML file is represented simultaneously as a table and a tree. This

-helps make navigation and editing easier.</li>

-<li>Content and attribute values can be edited directly in the table cells,

-while pop-up menus on the tree nodes give alternatives that are valid for

-that location.  For example, the <uicontrol>Add child</uicontrol> menu item

-will list only those elements from a DTD or XML schema which would be valid

-children at that point (as long as grammar constraints are on).</li>

-</ul></p><p>The Design view is especially helpful if you are new to XML, or

-need to do form-oriented editing. For example, you could use the Create XML

-File wizard to create a template XML file for a job description form from

-a job description DTD. After those steps are completed, you would

-only have to fill in the form data using the Design view.</p><p>The following

-links provide more information about the XML editor:</p></section>

-</conbody>

-</concept>

-<?Pub *0000002994?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
deleted file mode 100644
index 0515a1d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML editor" />
-<meta name="abstract" content="The XML editor is a tool for creating and viewing XML files." />
-<meta name="description" content="The XML editor is a tool for creating and viewing XML files." />
-<meta content="XML editor, overview" name="DC.subject" />
-<meta content="XML editor, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twxvalid.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwxmledt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML editor</title>
-</head>
-<body id="cwxmledt"><a name="cwxmledt"><!-- --></a>
-
-
-<h1 class="topictitle1">XML editor</h1>
-
-
-
-
-<div><p>The XML editor is a tool for creating and viewing XML files.</p>
-
-<p>You can use it to perform a variety of tasks such as:</p>
-
-<ul>
-<li>Creating new, empty XML files or generating them from existing DTDs or
-existing XML schemas</li>
-
-<li>Editing XML files</li>
-
-<li>Importing existing XML files for structured viewing</li>
-
-<li>Associating XML files with DTDs or XML schemas</li>
-
-</ul>
-
-<p>The XML editor has two main views - the Source view and the Design view.
-You can also use the <strong>Outline</strong> view to insert and delete elements.</p>
-
-<div class="section"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
-and work directly with a file's source code. Many of the XML editing features
-in the XML editor Source view are very similar to those available in the Source
-view of Page Designer.</p>
-<div class="p">The Source view has many text editing features,
-such as: <ul>
-<li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>
-
-<li> Content assist, which uses the information in a DTD or schema content
-model to provide a list of acceptable continuations depending on where the
-cursor is located in an XML file, or what has just been type</li>
-
-<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute
-value, one double-click selects that value, another double click selects the
-attribute-value pair, and a third double-click selects the entire tag. This
-makes it easier to copy and paste commonly used pieces of XML.</li>
-
-</ul>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Design view</h4><div class="p">The XML editor also has a Design view.
-In it: <ul>
-<li>The XML file is represented simultaneously as a table and a tree. This
-helps make navigation and editing easier.</li>
-
-<li>Content and attribute values can be edited directly in the table cells,
-while pop-up menus on the tree nodes give alternatives that are valid for
-that location.  For example, the <span class="uicontrol">Add child</span> menu item
-will list only those elements from a DTD or XML schema which would be valid
-children at that point (as long as grammar constraints are on).</li>
-
-</ul>
-</div>
-<p>The Design view is especially helpful if you are new to XML, or
-need to do form-oriented editing. For example, you could use the Create XML
-File wizard to create a template XML file for a job description form from
-a job description DTD. After those steps are completed, you would
-only have to fill in the form data using the Design view.</p>
-<p>The following
-links provide more information about the XML editor:</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="../topics/tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="../topics/tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
deleted file mode 100644
index fc8a56b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cxmlcat" xml:lang="en-us">

-<title>XML file associations with DTDs and XML schemas</title>

-<titlealts>

-<searchtitle>XML file associations with DTDs and XML schemas</searchtitle>

-</titlealts>

-<shortdesc>When an XML file is associated with a DTD or XML schema, it is

-bound by any structural rules contained in the DTD or XML schema. To be considered

-a valid XML file, a document must be accompanied by a DTD or an XML schema,

-and conform to all of the declarations in the DTD or the XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML catalog<indexterm>overview</indexterm></indexterm>

-<indexterm>XML files<indexterm>associations</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>

-<ol>

-<li>Direct association - The XML file contains either the name of a DTD in

-its doctype declaration (for example, &lt;!DOCTYPE root-element SYSTEM " <varname>dtdfile.dtd</varname>"

->, where  <varname>dtdfile.dtd</varname> is the name of the DTD file) or it

-contains the path of an XML schema in the schemaLocation attribute of the

-XML file root element (for example, &lt;xsi:schemaLocation="http://www.ibm.com

- <varname>schema.xsd</varname>">, where  <varname>schema.xsd</varname> is

-the name of the XML schema.</li>

-<li>XML Catalog entry - You can register DTD and XML schema files in the XML

-Catalog and associate them with a  <varname>Key</varname> that represents

-them. You can then refer to a DTD or XML schema file  <varname>Key</varname> from

-an XML file instead of referring directly to the DTD or XML schema file. An

-XML Catalog entry contains two parts - the Key (which represents the DTD or

-XML schema) and a URI (which contains information about the DTD or XML schema

-location).</li>

-</ol>

-<section><title>How an association works</title><b>Associating an XML file

-with a DTD </b><p>If an XML file is associated with a DTD, a DOCTYPE tag such

-as the following one is included in the XML file:<codeblock>&lt;!DOCTYPE root-name PUBLIC "<varname>InvoiceId</varname>" "<varname>C:\mydtds\Invoice.dtd</varname

->">

-</codeblock></p><p><varname>InvoiceId</varname> is the public identifier of

-the DTD file. It is used to associate the XML file with a DTD file (in this

-case, the DTD file is  <varname>Invoice.dtd</varname>). If the public identifier

-InvoiceId corresponds to the  <varname>Key</varname> of the XML Catalog entry

-for Invoice.dtd, then the  <varname>URI</varname> of the XML Catalog entry

-(which contains information about the location of Invoice.dtd) is used to

-locate the DTD. Otherwise, the DOCTYPE's system identifier ( <varname>"C:\mydtds\Invoice.dtd"</varname>),

-which refers directly to the file system location of the DTD, is used to locate

-the DTD.</p><p> <b>Note</b>: You can also use a system identifier as a Key

-in an XML Catalog entry. If you use a system identifier as a Key, a DOCTYPE

-tag such as the following one is included in an XML file:</p><codeblock>&lt;!DOCTYPE Root-name SYSTEM "<varname>MyDTD.dtd</varname>"> </codeblock

-><p>where  <varname>MyDTD.dtd</varname> is the system identifier that corresponds

-to the Key of an XML Catalog entry.</p></section>

-<section><b>Associating an XML file with an XML schema</b><p>If an XML file

-is associated with an XML schema, one or more schema location attributes are

-included in the XML file. The information in the schemaLocation is provided

-as a "hint" to the XML processor. The following examples show schemaLocation

-attributes.</p><p> <b>Example 1 </b><codeblock>&lt;purchaseOrder xmlns="http://www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd">

-&lt;shipTo country="US">

-...</codeblock>    </p><p><b>Example 2 </b><codeblock>&lt;purchaseOrder xmlns="http://www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com PO.xsd">

-&lt;shipTo country="US">

-....</codeblock>  </p><p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')

-refers directly to the file system location or URI of the XML schema. In this

-case, the schema file will be located by the XML processor directly.</p><p>In

-Example 2, the schemaLocation 'hint' ('PO.xsd') refers to an XML Catalog entry.

-PO.xsd corresponds to the  <varname>Key</varname> of the XML Catalog entry

-for PurchaseOrder.xsd, and the URI of the XML Catalog entry (which contains

-information about the location of PurchaseOrder.xsd) will be used to located

-the XML schema.</p><p>In both examples, <codeph>http://www.ibm.com</codeph> in

-the <codeph>xsi:schemaLocation</codeph> tag is a URI that identifies the namespace

-for the XML schema.</p><p>You can also use a namespace as a Key for an XML

-Catalog entry. If you use a namespace as a Key, a schemaLocation tag such

-as the following one is included in an XML file:<codeblock>&lt;purchaseOrder xmlns:="www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "></codeblock></p><p>The

-schemaLocation attribute points to both the Key and the actual location of

-the schema.</p><p><b>DTD or XML schema resides on a remote server</b></p><p>Several

-functions in the XML editor, such as validation and content assist, require

-the availability of a DTD or an XML schema. The product documentation provides

-usage information for cases when the DTD or XML schema resides on your local

-machine. However, in many cases, the DTD or XML schema can reside on a remote

-server, for example:</p><p><codeph>&lt;!DOCTYPE Catalog PUBLIC "abc/Catalog"

-"http://xyz.abc.org/dtds/catalog.dtd"></codeph></p><p>Normally, this case

-poses no problem, because the DTD or XML schema can be retrieved from the

-remote server. However, if you are behind a firewall, and do not have a SOCKSified

-system, the workbench currently does not provide a way for you to specify

-a socks server for retrieving a DTD or XML schema. If you are unable to SOCKSify

-your system, the workaround for this problem is to retrieve a copy of the

-DTD or XML schema (using a Web browser, for example) and save that copy on

-your local machine. Then, you can either place a local copy in the same project

-as your XML file, or use the XML Catalog to associate a public identifier

-with the DTD's (local) location.</p><p><b>Note</b>: If you have an XML file

-associated with an XML schema or DTD that is elsewhere in the network, and

-you are working on a machine disconnected from the network, you can follow

-the steps described previously if you want to use content assist or validate

-your XML file.  </p></section>

-<section><title>Advantages of XML Catalog entry associations</title><p>If

-you create a direct association between an XML file and an XML schema or DTD

-file, any time you change the location of the schema or DTD you have to track

-down and update all of the referencing XML files with the new location of

-the DTD or schema. If, however, you associate an XML file with an XML schema

-or DTD Key, then, when you change the location of the schema or DTD, you only

-have to update the XML Catalog entry, instead of each individual XML file.</p><p>For

-example, you have a DTD called "Building.dtd", which is associated with five

-XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.

-You move the DTD file Building.dtd to a new location. If you have a direction

-association between Building.dtd and all the XML files, you will have to update

-the &lt;DOCTTYPE> declaration in each XML file to reflect the new location

-of Building.dtd. If, however, you have an XML Catalog association, and all

-the XML files just refer to the Key of Building.dtd, then you only have to

-update the URI and all the XML files will point to the new location of Building.dtd.</p></section>

-<section><title>Updating an entry in the XML Catalog</title><p>After you have

-updated an entry in the XML Catalog, you might need to refresh the XML editor

-view so that it uses the new information. To do this, click the <uicontrol>Reload

-Dependencies</uicontrol> toolbar button <image href="../images/rldgrmr.gif">

-<alt>This graphic is the Reload Dependencies toolbar button</alt></image> and

-the view will be updated using the current XML Catalog settings. You only

-need to refresh the XML editor view when you have an XML file open that references

-the XML Catalog entry that was updated.</p><p>For more information, refer

-to the related tasks.</p></section>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
deleted file mode 100644
index cb76c14..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML file associations with DTDs and XML schemas" />
-<meta name="abstract" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
-<meta name="description" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
-<meta content="XML files, associating with DTDs, associating with XML schemas, XML catalog, overview" name="DC.subject" />
-<meta content="XML files, associating with DTDs, associating with XML schemas, XML catalog, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtproc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlcat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML file associations with DTDs and XML schemas</title>
-</head>
-<body id="cxmlcat"><a name="cxmlcat"><!-- --></a>
-
-
-<h1 class="topictitle1">XML file associations with DTDs and XML schemas</h1>
-
-
-
-
-<div><p>When an XML file is associated with a DTD or XML schema, it is
-bound by any structural rules contained in the DTD or XML schema. To be considered
-a valid XML file, a document must be accompanied by a DTD or an XML schema,
-and conform to all of the declarations in the DTD or the XML schema.</p>
-
-<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>
-
-<ol>
-<li>Direct association - The XML file contains either the name of a DTD in
-its doctype declaration (for example, &lt;!DOCTYPE root-element SYSTEM " <var class="varname">dtdfile.dtd</var>"
-&gt;, where  <var class="varname">dtdfile.dtd</var> is the name of the DTD file) or it
-contains the path of an XML schema in the schemaLocation attribute of the
-XML file root element (for example, &lt;xsi:schemaLocation="http://www.ibm.com
- <var class="varname">schema.xsd</var>"&gt;, where  <var class="varname">schema.xsd</var> is
-the name of the XML schema.</li>
-
-<li>XML Catalog entry - You can register DTD and XML schema files in the XML
-Catalog and associate them with a  <var class="varname">Key</var> that represents
-them. You can then refer to a DTD or XML schema file  <var class="varname">Key</var> from
-an XML file instead of referring directly to the DTD or XML schema file. An
-XML Catalog entry contains two parts - the Key (which represents the DTD or
-XML schema) and a URI (which contains information about the DTD or XML schema
-location).</li>
-
-</ol>
-
-<div class="section"><h4 class="sectiontitle">How an association works</h4><strong>Associating an XML file
-with a DTD </strong><div class="p">If an XML file is associated with a DTD, a DOCTYPE tag such
-as the following one is included in the XML file:<pre>&lt;!DOCTYPE root-name PUBLIC "<var class="varname">InvoiceId</var>" "<var class="varname">C:\mydtds\Invoice.dtd</var>"&gt;
-</pre>
-</div>
-<p><var class="varname">InvoiceId</var> is the public identifier of
-the DTD file. It is used to associate the XML file with a DTD file (in this
-case, the DTD file is  <var class="varname">Invoice.dtd</var>). If the public identifier
-InvoiceId corresponds to the  <var class="varname">Key</var> of the XML Catalog entry
-for Invoice.dtd, then the  <var class="varname">URI</var> of the XML Catalog entry
-(which contains information about the location of Invoice.dtd) is used to
-locate the DTD. Otherwise, the DOCTYPE's system identifier ( <var class="varname">"C:\mydtds\Invoice.dtd"</var>),
-which refers directly to the file system location of the DTD, is used to locate
-the DTD.</p>
-<p> <strong>Note</strong>: You can also use a system identifier as a Key
-in an XML Catalog entry. If you use a system identifier as a Key, a DOCTYPE
-tag such as the following one is included in an XML file:</p>
-<pre>&lt;!DOCTYPE Root-name SYSTEM "<var class="varname">MyDTD.dtd</var>"&gt; </pre>
-<p>where  <var class="varname">MyDTD.dtd</var> is the system identifier that corresponds
-to the Key of an XML Catalog entry.</p>
-</div>
-
-<div class="section"><strong>Associating an XML file with an XML schema</strong><p>If an XML file
-is associated with an XML schema, one or more schema location attributes are
-included in the XML file. The information in the schemaLocation is provided
-as a "hint" to the XML processor. The following examples show schemaLocation
-attributes.</p>
-<div class="p"> <strong>Example 1 </strong><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd"&gt;
-&lt;shipTo country="US"&gt;
-...</pre>
-    </div>
-<div class="p"><strong>Example 2 </strong><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com PO.xsd"&gt;
-&lt;shipTo country="US"&gt;
-....</pre>
-  </div>
-<p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')
-refers directly to the file system location or URI of the XML schema. In this
-case, the schema file will be located by the XML processor directly.</p>
-<p>In
-Example 2, the schemaLocation 'hint' ('PO.xsd') refers to an XML Catalog entry.
-PO.xsd corresponds to the  <var class="varname">Key</var> of the XML Catalog entry
-for PurchaseOrder.xsd, and the URI of the XML Catalog entry (which contains
-information about the location of PurchaseOrder.xsd) will be used to located
-the XML schema.</p>
-<p>In both examples, <samp class="codeph">http://www.ibm.com</samp> in
-the <samp class="codeph">xsi:schemaLocation</samp> tag is a URI that identifies the namespace
-for the XML schema.</p>
-<div class="p">You can also use a namespace as a Key for an XML
-Catalog entry. If you use a namespace as a Key, a schemaLocation tag such
-as the following one is included in an XML file:<pre>&lt;purchaseOrder xmlns:="www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "&gt;</pre>
-</div>
-<p>The
-schemaLocation attribute points to both the Key and the actual location of
-the schema.</p>
-<p><strong>DTD or XML schema resides on a remote server</strong></p>
-<p>Several
-functions in the XML editor, such as validation and content assist, require
-the availability of a DTD or an XML schema. The product documentation provides
-usage information for cases when the DTD or XML schema resides on your local
-machine. However, in many cases, the DTD or XML schema can reside on a remote
-server, for example:</p>
-<p><samp class="codeph">&lt;!DOCTYPE Catalog PUBLIC "abc/Catalog"
-"http://xyz.abc.org/dtds/catalog.dtd"&gt;</samp></p>
-<p>Normally, this case
-poses no problem, because the DTD or XML schema can be retrieved from the
-remote server. However, if you are behind a firewall, and do not have a SOCKSified
-system, the workbench currently does not provide a way for you to specify
-a socks server for retrieving a DTD or XML schema. If you are unable to SOCKSify
-your system, the workaround for this problem is to retrieve a copy of the
-DTD or XML schema (using a Web browser, for example) and save that copy on
-your local machine. Then, you can either place a local copy in the same project
-as your XML file, or use the XML Catalog to associate a public identifier
-with the DTD's (local) location.</p>
-<p><strong>Note</strong>: If you have an XML file
-associated with an XML schema or DTD that is elsewhere in the network, and
-you are working on a machine disconnected from the network, you can follow
-the steps described previously if you want to use content assist or validate
-your XML file.  </p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Advantages of XML Catalog entry associations</h4><p>If
-you create a direct association between an XML file and an XML schema or DTD
-file, any time you change the location of the schema or DTD you have to track
-down and update all of the referencing XML files with the new location of
-the DTD or schema. If, however, you associate an XML file with an XML schema
-or DTD Key, then, when you change the location of the schema or DTD, you only
-have to update the XML Catalog entry, instead of each individual XML file.</p>
-<p>For
-example, you have a DTD called "Building.dtd", which is associated with five
-XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
-You move the DTD file Building.dtd to a new location. If you have a direction
-association between Building.dtd and all the XML files, you will have to update
-the &lt;DOCTTYPE&gt; declaration in each XML file to reflect the new location
-of Building.dtd. If, however, you have an XML Catalog association, and all
-the XML files just refer to the Key of Building.dtd, then you only have to
-update the URI and all the XML files will point to the new location of Building.dtd.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Updating an entry in the XML Catalog</h4><p>After you have
-updated an entry in the XML Catalog, you might need to refresh the XML editor
-view so that it uses the new information. To do this, click the <span class="uicontrol">Reload
-Dependencies</span> toolbar button <img src="../images/rldgrmr.gif" alt="This graphic is the Reload Dependencies toolbar button" /> and
-the view will be updated using the current XML Catalog settings. You only
-need to refresh the XML editor view when you have an XML file open that references
-the XML Catalog entry that was updated.</p>
-<p>For more information, refer
-to the related tasks.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
deleted file mode 100644
index 21aa590..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="cxmlenc" xml:lang="en-us">

-<title>XML and HTML encodings</title>

-<titlealts>

-<searchtitle>XML and HTML encodings</searchtitle>

-</titlealts>

-<shortdesc>Encodings enable you to specify what character encoding your text

-is in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>character encoding<indexterm>text in files</indexterm></indexterm>

-<indexterm>encodings<indexterm>supported character sets</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The IANA name is used in the encoding statement of an XML file, or charset

-directive in an HTML file.</p>

-<p>The HTML and XML editors support the following encodings:</p>

-<table rowheader="firstcol">

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<thead>

-<row>

-<entry colname="COLSPEC0" valign="top"> <p><b>XML Encoding (IANA Name)</b></p> </entry>

-<entry colname="COLSPEC1" valign="top"> <p><b>Description</b></p> </entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry> <p>BIG5</p> </entry>

-<entry> <p>Big5, Traditional Chinese</p> </entry>

-</row>

-<row>

-<entry> <p>EUC-JP</p> </entry>

-<entry> <p>EUC encoding, Japanese</p> </entry>

-</row>

-<row>

-<entry> <p>EUC-KR</p> </entry>

-<entry> <p>EUC encoding, Korean</p> </entry>

-</row>

-<row>

-<entry> <p>GB2312</p> </entry>

-<entry> <p>GBK, Simplified Chinese</p> </entry>

-</row>

-<row>

-<entry>GB18030</entry>

-<entry>National Standard, Chinese</entry>

-</row>

-<row>

-<entry>IBM864</entry>

-<entry>PC Arabic (encoding not supported by the Page Designer Design page.

-)</entry>

-</row>

-<row>

-<entry> <p>ISO-2022-JP</p> </entry>

-<entry> <p>ISO 2022, Japanese</p> </entry>

-</row>

-<row>

-<entry> <p>ISO-2022-KR</p> </entry>

-<entry> <p>ISO 2022, Korean</p> </entry>

-</row>

-<row>

-<entry> <p>ISO-8859-1</p> </entry>

-<entry> <p>ISO Latin-1</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-2</entry>

-<entry>Central/East European (Slavic)</entry>

-</row>

-<row>

-<entry>ISO-8859-3</entry>

-<entry>Southern European</entry>

-</row>

-<row>

-<entry>ISO-8859-4</entry>

-<entry>ISO 8859-4, Cyrillic</entry>

-</row>

-<row>

-<entry>ISO-8859-5</entry>

-<entry>ISO 8859-5, Cyrillic</entry>

-</row>

-<row>

-<entry> <p>ISO-8859-6</p> </entry>

-<entry> <p>Arabic (Logical)</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-7</entry>

-<entry>Greek</entry>

-</row>

-<row>

-<entry> <p>ISO-8859-8-I</p> </entry>

-<entry> <p>Hebrew (Logical)</p> </entry>

-</row>

-<row>

-<entry> <p>ISO-8859-8</p> </entry>

-<entry> <p>Hebrew (Visual)(encoding supported, but not supported by the Page

-Designer Design page)</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-9</entry>

-<entry>Turkish</entry>

-</row>

-<row>

-<entry> <p>SHIFT_JIS</p> </entry>

-<entry> <p>Shift-JIS, Japanese</p> </entry>

-</row>

-<row>

-<entry>TIS-620</entry>

-<entry>TISI, Thai</entry>

-</row>

-<row>

-<entry> <p>US-ASCII</p> </entry>

-<entry> <p>US ASCII</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-8</p> </entry>

-<entry> <p>ISO 10646/Unicode, one-byte encoding</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16</p> </entry>

-<entry> <p>ISO 10646/Unicode, two-byte encoding</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16BE</p> </entry>

-<entry> <p>Unicode BigEndian</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16LE</p> </entry>

-<entry> <p>Unicode LittleEndian</p> </entry>

-</row>

-<row>

-<entry>WINDOWS-874</entry>

-<entry>Thai, <tm tmclass="special" tmowner="Microsoft Corporation" tmtype="reg"

-trademark="Microsoft">Microsoft</tm></entry>

-</row>

-<row>

-<entry> <p>WINDOWS-1252</p> </entry>

-<entry> <p>ISO Latin-1</p> </entry>

-</row>

-<row>

-<entry> <p>WINDOWS-1255</p> </entry>

-<entry> <p>Hebrew</p> </entry>

-</row>

-<row>

-<entry> <p>WINDOWS-1256</p> </entry>

-<entry> <p>Arabic</p> </entry>

-</row>

-<row>

-<entry>X-EUC-JP</entry>

-<entry>EUC encoding, Japanese (alias for EUC-JP)</entry>

-</row>

-<row>

-<entry>X-SJIS</entry>

-<entry>Shift-JIS, Japanese (alias for SHIFT_JIS)</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</conbody>

-</concept>

-<?Pub *0000003991?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
deleted file mode 100644
index 26b1018..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML and HTML encodings" />
-<meta name="abstract" content="Encodings enable you to specify what character encoding your text is in." />
-<meta name="description" content="Encodings enable you to specify what character encoding your text is in." />
-<meta content="Encodings, HTML, XML" name="DC.subject" />
-<meta content="Encodings, HTML, XML" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlenc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML and HTML encodings</title>
-</head>
-<body id="cxmlenc"><a name="cxmlenc"><!-- --></a>
-
-
-<h1 class="topictitle1">XML and HTML encodings</h1>
-
-
-
-
-<div><p>Encodings enable you to specify what character encoding your text
-is in.</p>
-
-<p>The IANA name is used in the encoding statement of an XML file, or charset
-directive in an HTML file.</p>
-
-<p>The HTML and XML editors support the following encodings:</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" class="firstcol" id="N1007B"> <p><strong>XML Encoding (IANA Name)</strong></p>
- </th>
-
-<th valign="top" id="N1008D"> <p><strong>Description</strong></p>
- </th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<th valign="top" class="firstcol" id="N100AB" headers="N1007B "> <p>BIG5</p>
- </th>
-
-<td valign="top" headers="N100AB N1008D "> <p>Big5, Traditional Chinese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N100CB" headers="N1007B "> <p>EUC-JP</p>
- </th>
-
-<td valign="top" headers="N100CB N1008D "> <p>EUC encoding, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N100EB" headers="N1007B "> <p>EUC-KR</p>
- </th>
-
-<td valign="top" headers="N100EB N1008D "> <p>EUC encoding, Korean</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1010B" headers="N1007B "> <p>GB2312</p>
- </th>
-
-<td valign="top" headers="N1010B N1008D "> <p>GBK, Simplified Chinese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1012B" headers="N1007B ">GB18030</th>
-
-<td valign="top" headers="N1012B N1008D ">National Standard, Chinese</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1013F" headers="N1007B ">IBM864</th>
-
-<td valign="top" headers="N1013F N1008D ">PC Arabic (encoding not supported by the Page Designer Design page.
-)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10153" headers="N1007B "> <p>ISO-2022-JP</p>
- </th>
-
-<td valign="top" headers="N10153 N1008D "> <p>ISO 2022, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10173" headers="N1007B "> <p>ISO-2022-KR</p>
- </th>
-
-<td valign="top" headers="N10173 N1008D "> <p>ISO 2022, Korean</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10193" headers="N1007B "> <p>ISO-8859-1</p>
- </th>
-
-<td valign="top" headers="N10193 N1008D "> <p>ISO Latin-1</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101B3" headers="N1007B ">ISO-8859-2</th>
-
-<td valign="top" headers="N101B3 N1008D ">Central/East European (Slavic)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101C7" headers="N1007B ">ISO-8859-3</th>
-
-<td valign="top" headers="N101C7 N1008D ">Southern European</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101DB" headers="N1007B ">ISO-8859-4</th>
-
-<td valign="top" headers="N101DB N1008D ">ISO 8859-4, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101EF" headers="N1007B ">ISO-8859-5</th>
-
-<td valign="top" headers="N101EF N1008D ">ISO 8859-5, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10203" headers="N1007B "> <p>ISO-8859-6</p>
- </th>
-
-<td valign="top" headers="N10203 N1008D "> <p>Arabic (Logical)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10223" headers="N1007B ">ISO-8859-7</th>
-
-<td valign="top" headers="N10223 N1008D ">Greek</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10237" headers="N1007B "> <p>ISO-8859-8-I</p>
- </th>
-
-<td valign="top" headers="N10237 N1008D "> <p>Hebrew (Logical)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10257" headers="N1007B "> <p>ISO-8859-8</p>
- </th>
-
-<td valign="top" headers="N10257 N1008D "> <p>Hebrew (Visual)(encoding supported, but not supported by the Page
-Designer Design page)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10277" headers="N1007B ">ISO-8859-9</th>
-
-<td valign="top" headers="N10277 N1008D ">Turkish</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1028B" headers="N1007B "> <p>SHIFT_JIS</p>
- </th>
-
-<td valign="top" headers="N1028B N1008D "> <p>Shift-JIS, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102AB" headers="N1007B ">TIS-620</th>
-
-<td valign="top" headers="N102AB N1008D ">TISI, Thai</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102BF" headers="N1007B "> <p>US-ASCII</p>
- </th>
-
-<td valign="top" headers="N102BF N1008D "> <p>US ASCII</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102DF" headers="N1007B "> <p>UTF-8</p>
- </th>
-
-<td valign="top" headers="N102DF N1008D "> <p>ISO 10646/Unicode, one-byte encoding</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102FF" headers="N1007B "> <p>UTF-16</p>
- </th>
-
-<td valign="top" headers="N102FF N1008D "> <p>ISO 10646/Unicode, two-byte encoding</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1031F" headers="N1007B "> <p>UTF-16BE</p>
- </th>
-
-<td valign="top" headers="N1031F N1008D "> <p>Unicode BigEndian</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1033F" headers="N1007B "> <p>UTF-16LE</p>
- </th>
-
-<td valign="top" headers="N1033F N1008D "> <p>Unicode LittleEndian</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1035F" headers="N1007B ">WINDOWS-874</th>
-
-<td valign="top" headers="N1035F N1008D ">Thai, Microsoft<sup>®</sup></td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1037C" headers="N1007B "> <p>WINDOWS-1252</p>
- </th>
-
-<td valign="top" headers="N1037C N1008D "> <p>ISO Latin-1</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1039C" headers="N1007B "> <p>WINDOWS-1255</p>
- </th>
-
-<td valign="top" headers="N1039C N1008D "> <p>Hebrew</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N103BC" headers="N1007B "> <p>WINDOWS-1256</p>
- </th>
-
-<td valign="top" headers="N103BC N1008D "> <p>Arabic</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N103DC" headers="N1007B ">X-EUC-JP</th>
-
-<td valign="top" headers="N103DC N1008D ">EUC encoding, Japanese (alias for EUC-JP)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N103F0" headers="N1007B ">X-SJIS</th>
-
-<td valign="top" headers="N103F0 N1008D ">Shift-JIS, Japanese (alias for SHIFT_JIS)</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
deleted file mode 100644
index dbfc5b2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<concept id="cxmltool" xml:lang="en-us">

-<title>XML tools - overview</title>

-<titlealts>

-<searchtitle>XML tools - overview</searchtitle>

-</titlealts>

-<shortdesc>This product provides a comprehensive visual XML development environment.

-The tool set includes components for building DTDs, XML schemas, and XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML tools<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The following XML tools are available. </p>

-<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You

-can use it to create new XML files, either from scratch, existing DTDs, or

-existing XML schemas. You can also use it to edit XML files, associate them

-with DTDs or schemas, and validate them. </p>

-<p> The <b>DTD editor</b> is a tool for creating and viewing DTDs.   </p>

-<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating

-XML schemas. You can use the XML schema editor to perform tasks such as creating

-XML schema components and importing and viewing XML schemas. </p>

-<p><b>Notes:</b></p>

-<section>Exercise caution when opening large files with any of the XML editors.

-If the memory limits of the workbench are exceeded, it will abruptly close

-without saving any data (and without warning or error messages). The number

-of elements in an XML file, not its size, is the best indicator of how much

-memory will be required. Memory requirements also depend on what else is open

-in the workbench - in some cases you can open a fifteen megabytes file, but

-in other cases a one megabyte file might cause problems. Therefore, we recommend

-you save all data in the workbench before opening large XML files. This is

-a permanent restriction.</section>

-<section conref="rlimitations_slushXML.dita#rlimitations_slushXML/unresolv_URI"></section>

-</conbody>

-</concept>

-<?Pub *0000002064?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
deleted file mode 100644
index 7669633..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML tools - overview</title>
-</head>
-<body id="cxmltool"><a name="cxmltool"><!-- --></a>
-
-<h1 class="topictitle1">XML tools - overview</h1>
-<div><p>This product provides a comprehensive visual XML development environment.
-The tool set includes components for building DTDs, XML schemas, and XML files.</p><p>The following XML tools are available:</p>
-<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You
-can use it to create new XML files, either from scratch, existing DTDs, or
-existing XML schemas. You can also use it to edit XML files, associate them
-with DTDs or schemas, and validate them.</p>
-<p>The <b>DTD editor</b> is a tool for creating and viewing DTDs. </p>
-<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating 
-XML schemas. You can use the XML schema editor to perform tasks such as creating 
-XML schema components and importing and viewing XML schemas. </p>
-<div class="skipspace">Exercise caution when opening large files with any of the XML editors.
-If the memory limits of the workbench are exceeded, it will abruptly close
-without saving any data (and without warning or error messages). The number
-of elements in an XML file, not its size, is the best indicator of how much
-memory will be required. Memory requirements also depend on what else is open
-in the workbench - in some cases you can open a 15 megabytes file, but in
-other cases a one-megabyte file may cause problems. Therefore, we recommend
-you save all data in the workbench before opening large XML files. This is
-a permanent restriction.</div>
-<div class="skipspace"><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita
deleted file mode 100644
index b2be714..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rextctn" xml:lang="en-us">

-<title>Editing XML documents with multiple namespaces</title>

-<titlealts>

-<searchtitle>Editing XML documents with multiple namespaces</searchtitle>

-</titlealts>

-<shortdesc>You can use the XML schema <codeph>any</codeph> element to extend

-the content model of an XML document.</shortdesc>

-<refbody>

-<section><p>For example, you have an XML schema file called Book.xsd that

-contains a complex type called BookType. BookType contains 4 elements (title,

-author, year, and ISBN) and one  <codeph>any</codeph> element. The namespace

-for the <codeph>any</codeph>  element is  <codeph>##any</codeph>. This means

-that in an instance document, you can insert any XML element to extend the

-definition of the BookType.</p><p>You can also provide a more specific namespace.

-For example, you have another schema called My_Book.xsd, which contains a

-complex type called My_BookType. My_BookType contains 4 elements (title, author,

-year, and ISBN) and one  <codeph>any</codeph> element, but in this case the

-namespace for the  BookType element is www.wesley.com. This means that in

-an instance document, you can insert any XML element to extend the definition

-of the BookType, provided that they belong to the namespace http://www.wesley.com.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
deleted file mode 100644
index ee9086b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML documents with multiple namespaces" />
-<meta name="abstract" content="You can use the XML schema any element to extend the content model of an XML document." />
-<meta name="description" content="You can use the XML schema any element to extend the content model of an XML document." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rextctn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML documents with multiple namespaces</title>
-</head>
-<body id="rextctn"><a name="rextctn"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML documents with multiple namespaces</h1>
-
-
-
-<div><p>You can use the XML schema <samp class="codeph">any</samp> element to extend
-the content model of an XML document.</p>
-
-<div class="section"><p>For example, you have an XML schema file called Book.xsd that
-contains a complex type called BookType. BookType contains 4 elements (title,
-author, year, and ISBN) and one  <samp class="codeph">any</samp> element. The namespace
-for the <samp class="codeph">any</samp>  element is  <samp class="codeph">##any</samp>. This means
-that in an instance document, you can insert any XML element to extend the
-definition of the BookType.</p>
-<p>You can also provide a more specific namespace.
-For example, you have another schema called My_Book.xsd, which contains a
-complex type called My_BookType. My_BookType contains 4 elements (title, author,
-year, and ISBN) and one  <samp class="codeph">any</samp> element, but in this case the
-namespace for the  BookType element is www.wesley.com. This means that in
-an instance document, you can insert any XML element to extend the definition
-of the BookType, provided that they belong to the namespace http://www.wesley.com.</p>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita
deleted file mode 100644
index c7ee4b0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rlimitations_slushXML" xml:lang="en-us">

-<title>Limitations of XML Editor</title>

-<titlealts>

-<searchtitle>Limitations of XML Editor</searchtitle>

-</titlealts>

-<shortdesc>This section describes known product aspect limitations and workarounds.</shortdesc>

-<refbody>

-<!--Use this template to single source the readme information.  The content for the readme information is maintained in this topic and is inserted into the related topic using the conref attribute. This file will not be surfaced in your navigation.-->

-<section id="unresolv_URI"><!--No defect associated with this. It is from the 5.1. readme.--><p>The

-behavior of the XML parser when encountering an unresolvable URI (for example,

-in a DOCTYPE declaration) is to report a fatal IO error and stop any further

-processing. An unresolved URI is seen neither as a syntactic nor a semantic

-error and as such, the parser does not attempt to handle it. Essentially,

-the document remains unchecked. This is a known problem.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
deleted file mode 100644
index dfece6a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of XML Editor" />
-<meta name="abstract" content="This section describes known product aspect limitations and workarounds." />
-<meta name="description" content="This section describes known product aspect limitations and workarounds." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rlimitations_slushXML" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of XML Editor</title>
-</head>
-<body id="rlimitations_slushXML"><a name="rlimitations_slushXML"><!-- --></a>
-
-
-<h1 class="topictitle1">Limitations of XML Editor</h1>
-
-
-
-<div><p>This section describes known product aspect limitations and workarounds.</p>
-
-
-<div class="section" id="rlimitations_slushXML__unresolv_URI"><a name="rlimitations_slushXML__unresolv_URI"><!-- --></a><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
deleted file mode 100644
index a398b07..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<?Pub Inc?>

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the XML editor</title>

-<titlealts>

-<searchtitle>Icons used in the XML editor</searchtitle>

-</titlealts>

-<shortdesc>The following XML editor icons appear in the Outline and Design

-view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>icons</indexterm></indexterm></keywords>

-</metadata></prolog>

-<refbody>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<tbody>

-<row>

-<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry>

-<entry colname="COLSPEC1" valign="bottom"><b>Description</b></entry>

-</row>

-<row>

-<entry> <image href="../images/nattrib.gif"><alt>This graphic is the attribute

-icon</alt></image> </entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry> <image href="../images/cdatasection.gif"><alt>This graphic is the

-character data icon</alt></image></entry>

-<entry>character data (CDATA) section</entry>

-</row>

-<row>

-<entry> <image href="../images/comment_obj.gif"><alt>This graphic is the comment

-icon</alt></image></entry>

-<entry>comment</entry>

-</row>

-<row>

-<entry> <image href="../images/doctype.gif"><alt>This graphic is the DOCTYPE

-icon</alt></image></entry>

-<entry>DOCTYPE declaration</entry>

-</row>

-<row>

-<entry> <image href="../images/nelem.gif"><alt>This graphic is the element

-icon</alt></image> </entry>

-<entry>element</entry>

-</row>

-<row>

-<entry> <image href="../images/proinst_obj.gif"><alt>This graphic is the processing

-instructions icon</alt></image></entry>

-<entry>processing instructions</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

-<?Pub *0000001824?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
deleted file mode 100644
index 50087a8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the XML editor" />
-<meta name="abstract" content="The following XML editor icons appear in the Outline and Design view." />
-<meta name="description" content="The following XML editor icons appear in the Outline and Design view." />
-<meta content="XML editor, icons" name="DC.subject" />
-<meta content="XML editor, icons" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Icons used in the XML editor</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the XML editor</h1>
-
-
-
-
-<div><p>The following XML editor icons appear in the Outline and Design
-view.</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<tbody>
-<tr>
-<td valign="bottom"><strong>Icon</strong></td>
-
-<td valign="bottom"><strong>Description</strong></td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/nattrib.gif" alt="This graphic is the attribute&#10;icon" /> </td>
-
-<td valign="top">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/cdatasection.gif" alt="This graphic is the&#10;character data icon" /></td>
-
-<td valign="top">character data (CDATA) section</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/comment_obj.gif" alt="This graphic is the comment&#10;icon" /></td>
-
-<td valign="top">comment</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/doctype.gif" alt="This graphic is the DOCTYPE&#10;icon" /></td>
-
-<td valign="top">DOCTYPE declaration</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/nelem.gif" alt="This graphic is the element&#10;icon" /> </td>
-
-<td valign="top">element</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/proinst_obj.gif" alt="This graphic is the processing&#10;instructions icon" /></td>
-
-<td valign="top">processing instructions</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
deleted file mode 100644
index ad0b19e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tcretxml" xml:lang="en-us">

-<title>Creating XML files</title>

-<titlealts>

-<searchtitle>Creating XML files</searchtitle>

-</titlealts>

-<shortdesc>You can create a new XML file which you can then edit in the XML

-editor. You create a new XML file that is not associated with a DTD or XML

-schema file, so there are no restrictions on the kind of content it can contain.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To create a new

-XML file, follow these instructions:</p></context>

-<steps>

-<step><cmd>If necessary, create a project to contain the XML file.</cmd></step>

-<step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>

-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol><uicontrol>XML</uicontrol>

-<uicontrol>XML</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the project or folder that will contain the XML file.</cmd>

-</step>

-<step><cmd>In the <uicontrol>File name</uicontrol> field, type the name of

-the XML file, for example <userinput>MyXMLFile.xml</userinput>. The name of

-your XML file  <varname>must</varname> end in <userinput>.xml</userinput>.</cmd>

-</step>

-<step><cmd>Click <uicontrol>Next.</uicontrol></cmd></step>

-<step><cmd>Click the <uicontrol>Create XML file from an XML template</uicontrol> radio

-button.</cmd></step>

-<step><cmd>Click  <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
deleted file mode 100644
index 63438a9..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML files" />
-<meta name="abstract" content="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain." />
-<meta name="description" content="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain." />
-<meta content="XML files, creating" name="DC.subject" />
-<meta content="XML files, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcretxml" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML files</title>
-</head>
-<body id="tcretxml"><a name="tcretxml"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML files</h1>
-
-
-
-
-<div><p>You can create a new XML file which you can then edit in the XML
-editor. You create a new XML file that is not associated with a DTD or XML
-schema file, so there are no restrictions on the kind of content it can contain.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To create a new
-XML file, follow these instructions:</p>
-</div>
-
-<ol>
-<li><span>If necessary, create a project to contain the XML file.</span></li>
-
-<li><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">XML</span>
- &gt; <span class="uicontrol">XML</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li><span>Select the project or folder that will contain the XML file.</span>
-</li>
-
-<li><span>In the <span class="uicontrol">File name</span> field, type the name of
-the XML file, for example <kbd class="userinput">MyXMLFile.xml</kbd>. The name of
-your XML file  <var class="varname">must</var> end in <kbd class="userinput">.xml</kbd>.</span>
-</li>
-
-<li><span>Click <span class="uicontrol">Next.</span></span></li>
-
-<li><span>Click the <span class="uicontrol">Create XML file from an XML template</span> radio
-button.</span></li>
-
-<li><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="../topics/tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
deleted file mode 100644
index fe8a065..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tcrexdtd" xml:lang="en-us">

-<title>Generating XML files from DTDs</title>

-<titlealts>

-<searchtitle>Generate an XML file from a DTD</searchtitle>

-</titlealts>

-<shortdesc>You can generate an XML file from your DTD if you want to quickly

-create an XML file based on your DTD file. Generating an XML file from your

-DTD saves you time by creating an XML file that is already associated with

-your DTD, and contains at least some of the elements and attributes in your

-DTD.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>generating from DTDs</indexterm></indexterm>

-<indexterm>DTD<indexterm>generating XML files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>After you have generated your XML file, you can further customize

-it in the XML editor.</p><p>The following instructions were written for the

-Resource perspective, but they will also work in many other perspectives.</p><p>To

-create an XML file from a DTD file follow these steps:</p></context>

-<steps>

-<step><cmd>In the Navigator view, right-click the DTD file that you want to

-work with.</cmd></step>

-<step><cmd>From its pop-up menu click <menucascade><uicontrol>Generate</uicontrol>

-<uicontrol>XML File</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select a project or folder to contain the XML file and type a name

-for it.</cmd><info>The name of the file must end in <userinput>.xml</userinput>.</info>

-</step>

-<step><cmd>Click  <uicontrol>Next</uicontrol>.</cmd></step>

-<step><cmd>Select the <uicontrol>Root element</uicontrol> of the XML file.</cmd>

-<info>The root element of an XML file is the element that contains all other

-elements in that file. All the elements that you have defined in the DTD will

-be shown in the <uicontrol>Root element</uicontrol> list.</info></step>

-<step><cmd>Select from the following content options:  </cmd>

-<choices>

-<choice><uicontrol>Create optional attributes</uicontrol>. Both mandatory

-and optional attributes will be generated.</choice>

-<choice><uicontrol>Create optional elements</uicontrol>. Both mandatory and

-optional elements will be generated.</choice>

-<choice><uicontrol>Create first choice of required choice</uicontrol>. The

-first option of a required choice will be generated in your XML file.</choice>

-<choice><uicontrol>Fill elements and attributes with data</uicontrol>. Any

-elements and attributes generated will be filled with sample data.</choice>

-</choices>

-<info> <p>If you do not select any of these options, then only the minimum

-amount of content required for the XML file will be created.</p></info></step>

-<step><cmd>Specify the <uicontrol>Public ID</uicontrol> or <uicontrol>System

-ID</uicontrol>.</cmd><info>You do not need to specify both. If you do, the

-Public ID will be used before the System ID. </info></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result><p>The XML file will only contain the selected root element and any

-elements or attributes contained in the root element. You can now add elements,

-attributes, entities, and notations to the XML file, however, they must follow

-the rules established in the DTD that you used to create the XML file.</p></result>

-</taskbody>

-</task>

-<?Pub *0000003334?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
deleted file mode 100644
index f4c76ce..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Generating XML files from DTDs" />
-<meta name="abstract" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta name="description" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta content="XML files, generating from DTDs" name="DC.subject" />
-<meta content="XML files, generating from DTDs" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrexdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Generate an XML file from a DTD</title>
-</head>
-<body id="tcrexdtd"><a name="tcrexdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Generating XML files from DTDs</h1>
-
-
-
-
-<div><p>You can generate an XML file from your DTD if you want to quickly
-create an XML file based on your DTD file. Generating an XML file from your
-DTD saves you time by creating an XML file that is already associated with
-your DTD, and contains at least some of the elements and attributes in your
-DTD.</p>
-
-<div class="section"><p>After you have generated your XML file, you can further customize
-it in the XML editor.</p>
-<p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives.</p>
-<p>To
-create an XML file from a DTD file follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Navigator view, right-click the DTD file that you want to
-work with.</span></li>
-
-<li class="stepexpand"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span>
- &gt; <span class="uicontrol">XML File</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select a project or folder to contain the XML file and type a name
-for it.</span> The name of the file must end in <kbd class="userinput">.xml</kbd>.
-</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span>
- The root element of an XML file is the element that contains all other
-elements in that file. All the elements that you have defined in the DTD will
-be shown in the <span class="uicontrol">Root element</span> list.</li>
-
-<li class="stepexpand"><span>Select from the following content options:  </span>
-<ul>
-<li><span class="uicontrol">Create optional attributes</span>. Both mandatory
-and optional attributes will be generated.</li>
-
-<li><span class="uicontrol">Create optional elements</span>. Both mandatory and
-optional elements will be generated.</li>
-
-<li><span class="uicontrol">Create first choice of required choice</span>. The
-first option of a required choice will be generated in your XML file.</li>
-
-<li><span class="uicontrol">Fill elements and attributes with data</span>. Any
-elements and attributes generated will be filled with sample data.</li>
-
-</ul>
-
-  <p>If you do not select any of these options, then only the minimum
-amount of content required for the XML file will be created.</p>
-</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span>.</span> You do not need to specify both. If you do, the
-Public ID will be used before the System ID. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section"><p>The XML file will only contain the selected root element and any
-elements or attributes contained in the root element. You can now add elements,
-attributes, entities, and notations to the XML file, however, they must follow
-the rules established in the DTD that you used to create the XML file.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="../topics/tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
deleted file mode 100644
index 20df2b6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<?Pub Inc?>

-<task id="tcrexxsd" xml:lang="en-us">

-<title>Generating XML files from XML schemas</title>

-<titlealts>

-<searchtitle>Generating an XML file from an XML schema</searchtitle>

-</titlealts>

-<shortdesc>You can generate an XML file from your XML schema if you want to

-quickly create an XML file based on your XML schema file. Generating an XML

-file from your XML schema saves you time by creating an XML file that is already

-associated with your XML schema, and contains at least some of the elements

-and attributes in your XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>generating from XML schemas</indexterm></indexterm>

-<indexterm>XML schemas<indexterm>generating XML files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>After you have generated your XML file, you can further customize

-it in the XML editor.</p><p>The following instructions were written for the

-Resource perspective, but they will also work in many other perspectives.</p><p>To

-generate an XML file from a schema file follow these steps:</p></context>

-<steps>

-<step><cmd>In the Navigator view, right-click the XML schema file that you

-want to work with.</cmd></step>

-<step><cmd>From its pop-up menu click <menucascade><uicontrol>Generate</uicontrol>

-<uicontrol>XML File</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select a project or folder to contain the XML file, type a name

-for it and click <uicontrol>Next</uicontrol>.</cmd><info>The name of the file

-must end in<systemoutput>.xml.</systemoutput> </info></step>

-<step><cmd>Click the <uicontrol>Root element</uicontrol> of the XML file.</cmd>

-<info>The root element of an XML file is the element that contains all other

-elements in that file. All of the global elements you have defined in the

-XML schema will be included in the Root element list. If you do not have any

-global elements in your XML schema, you cannot create an XML file from it.</info>

-</step>

-<step><cmd>Select from the following content options:</cmd>

-<choices>

-<choice><uicontrol>Create optional attributes</uicontrol>. Both mandatory

-and optional attributes will be generated.</choice>

-<choice><uicontrol>Create optional elements</uicontrol>. Both mandatory and

-optional elements will be generated.</choice>

-<choice><uicontrol>Create first choice of required choice</uicontrol>. The

-first option of a required choice will be generated in your XML file.</choice>

-<choice><uicontrol>Fill elements and attributes with data</uicontrol>. Any

-elements and attributes generated will be filled with sample data.</choice>

-</choices>

-<info>If you do not select any of these options, then only the minimum amount

-of content required for the XML file will be created.</info></step>

-<step><cmd>The Namespace information section contains information about the

-target namespace of the XML schema, its prefix, and the schema location.</cmd>

-<info>For more information about namespaces and namespace prefixes, refer

-to the related references.</info></step>

-<step><cmd>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</cmd>

-</step>

-<step><cmd>The value in the <uicontrol>Namespace Name</uicontrol> field is

-the target namespace of the XML schema.</cmd><info>Your XML file should be

-associated with the same namespace as its XML schema is associated with.</info>

-</step>

-<step><cmd>All qualified elements and attributes in the XML file associated

-with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>

-</step>

-<step><cmd>The  <uicontrol>Location Hint</uicontrol> field contains the location

-of the XML schema.</cmd></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>, then <uicontrol>Finish</uicontrol>.</cmd>

-</step>

-</steps>

-<result><p>The XML file will contain the selected root element and any elements

-or attributes contained in the root element. It also contains information

-about the XML file namespace and location. You can now add elements and attributes

-to the XML file.</p><p><b>Note:</b> In certain cases, when an XML file is

-generated from a complex XML schema file, the XML file might not be valid.

-If this occurs, you can open the generated file in the XML editor and correct

-any errors that occur. Usually, only a few errors need to be fixed. The following

-XML schema constructs might present problems:</p><ol>

-<li>Restrictions. Sometimes restricted elements are erroneously generated. </li>

-<li>Facets: Default generated data values might not conform to complex facets

-(for example, patterns).</li>

-<li>Abstract elements. abstract elements are sometimes erroneously generated.</li>

-</ol></result>

-</taskbody>

-</task>

-<?Pub *0000004757?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
deleted file mode 100644
index 0d32765..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Generating XML files from XML schemas" />
-<meta name="abstract" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta name="description" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta content="XML files, generating from XML schemas" name="DC.subject" />
-<meta content="XML files, generating from XML schemas" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrexxsd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Generating an XML file from an XML schema</title>
-</head>
-<body id="tcrexxsd"><a name="tcrexxsd"><!-- --></a>
-
-
-<h1 class="topictitle1">Generating XML files from XML schemas</h1>
-
-
-
-
-<div><p>You can generate an XML file from your XML schema if you want to
-quickly create an XML file based on your XML schema file. Generating an XML
-file from your XML schema saves you time by creating an XML file that is already
-associated with your XML schema, and contains at least some of the elements
-and attributes in your XML schema.</p>
-
-<div class="section"><p>After you have generated your XML file, you can further customize
-it in the XML editor.</p>
-<p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives.</p>
-<p>To
-generate an XML file from a schema file follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Navigator view, right-click the XML schema file that you
-want to work with.</span></li>
-
-<li class="stepexpand"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span>
- &gt; <span class="uicontrol">XML File</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select a project or folder to contain the XML file, type a name
-for it and click <span class="uicontrol">Next</span>.</span> The name of the file
-must end in<tt class="sysout">.xml.</tt> </li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Root element</span> of the XML file.</span>
- The root element of an XML file is the element that contains all other
-elements in that file. All of the global elements you have defined in the
-XML schema will be included in the Root element list. If you do not have any
-global elements in your XML schema, you cannot create an XML file from it.
-</li>
-
-<li class="stepexpand"><span>Select from the following content options:</span>
-<ul>
-<li><span class="uicontrol">Create optional attributes</span>. Both mandatory
-and optional attributes will be generated.</li>
-
-<li><span class="uicontrol">Create optional elements</span>. Both mandatory and
-optional elements will be generated.</li>
-
-<li><span class="uicontrol">Create first choice of required choice</span>. The
-first option of a required choice will be generated in your XML file.</li>
-
-<li><span class="uicontrol">Fill elements and attributes with data</span>. Any
-elements and attributes generated will be filled with sample data.</li>
-
-</ul>
-
- If you do not select any of these options, then only the minimum amount
-of content required for the XML file will be created.</li>
-
-<li class="stepexpand"><span>The Namespace information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location.</span>
- For more information about namespaces and namespace prefixes, refer
-to the related references.</li>
-
-<li class="stepexpand"><span>Select the entry you want to edit and click <span class="uicontrol">Edit</span>.</span>
-</li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
-the target namespace of the XML schema.</span> Your XML file should be
-associated with the same namespace as its XML schema is associated with.
-</li>
-
-<li class="stepexpand"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</span>
-</li>
-
-<li class="stepexpand"><span>The  <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>, then <span class="uicontrol">Finish</span>.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML file will contain the selected root element and any elements
-or attributes contained in the root element. It also contains information
-about the XML file namespace and location. You can now add elements and attributes
-to the XML file.</p>
-<p><strong>Note:</strong> In certain cases, when an XML file is
-generated from a complex XML schema file, the XML file might not be valid.
-If this occurs, you can open the generated file in the XML editor and correct
-any errors that occur. Usually, only a few errors need to be fixed. The following
-XML schema constructs might present problems:</p>
-<ol>
-<li>Restrictions. Sometimes restricted elements are erroneously generated. </li>
-
-<li>Facets: Default generated data values might not conform to complex facets
-(for example, patterns).</li>
-
-<li>Abstract elements. abstract elements are sometimes erroneously generated.</li>
-
-</ol>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="../topics/tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
deleted file mode 100644
index 63f1b5c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtcnst" xml:lang="en-us">

-<title>Editing with DTD or XML schema constraints</title>

-<titlealts>

-<searchtitle>Editing with DTD or XML schema constraints</searchtitle>

-</titlealts>

-<shortdesc>In the Design view, when you edit an XML file that has a set of

-constraints (that is, a set of rules) defined by a DTD or an XML schema, you

-can turn the constraints on and off to provide flexibility in the way you

-edit, but still maintain the validity of the document periodically.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>editing with constraints</indexterm></indexterm>

-<indexterm>XML files<indexterm>editing with constraints</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> When the constraints are turned on, and you are working in the

-Design view, the XML editor prevents you from inserting elements, attributes,

-or attribute values not permitted by the rules of the XML schema or DTD, and

-from removing necessary or predefined sets of tags and values. In this mode,

-an element's content must be valid to use the XML editor's guided editing

-options.</p><p>You might want to turn the constraints off for an XML file

-if you need more flexibility. For example, you want to try working with elements

-or attributes not permitted by the associated DTD or XML schema, without actually

-removing the association with the DTD or XML schema.</p><p>To turn the constraints

-for an XML file off, click <uicontrol>XML > Turn Grammar Constraints Off</uicontrol>.

-After you have turned the constraints off for a file, you can insert or delete

-any element or attribute regardless of the DTD or XML schema rules. You can

-create new elements or attributes that are not in the DTD or schema - these

-Design view prompts will only appear when you have turned constraints off.

-The file might not be valid, however, if you do this. </p><p>The following

-instructions were written for the Resource perspective, but they will also

-work in many other perspectives.</p><p>The following example shows what you

-can do if you turn the constraints of a DTD off:</p></context>

-<steps>

-<step><cmd>Open the XML file in the XML editor (right-click the file in the

-Navigator view and click <uicontrol>Open With > XML Editor</uicontrol>). </cmd>

-</step>

-<step><cmd>You have a DTD that specifies that an element requires at least

-one of a specific child element:  </cmd><info><codeblock>&lt;!ELEMENT parentElement (childElement+)>

-</codeblock></info></step>

-<step><cmd>If, in an XML file associated with your DTD, you attempt to remove

-the final child element of the element with the DTD constraints turned on,

-the editor will not allow you to do this, as it will make the document invalid.</cmd>

-<info>You can confirm this by using the element's pop-up menu to verify that

-the <uicontrol>Remove</uicontrol> option is grayed out.</info></step>

-<step><cmd>To turn the DTD constraints off, click <uicontrol>XML > Turn Grammar

-Constraints Off</uicontrol>. </cmd></step>

-<step><cmd>If you attempt to remove the same child element with constraints

-off, the editor will allow you to.</cmd></step>

-<step><cmd>To correct the invalid document, you will have to re-add the necessary

-element, or remove the invalid tagging or value.</cmd></step>

-</steps>

-<result>If you introduce errors into your files, you must save and validate

-the file in order to see a list of the errors you have introduced. They will

-be listed in the Problems view. After you fix the errors, you must save and

-validate your file again to see if the file is now valid.</result>

-</taskbody>

-</task>

-<?Pub *0000003854?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
deleted file mode 100644
index ab8acd7..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing with DTD or XML schema constraints" />
-<meta name="abstract" content="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta name="description" content="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta content="XML editor, editing, with DTD or XML schema constraints, XML files, with DTD or XML schema constraints" name="DC.subject" />
-<meta content="XML editor, editing, with DTD or XML schema constraints, XML files, with DTD or XML schema constraints" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtcnst" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing with DTD or XML schema constraints</title>
-</head>
-<body id="tedtcnst"><a name="tedtcnst"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing with DTD or XML schema constraints</h1>
-
-
-
-
-<div><p>In the Design view, when you edit an XML file that has a set of
-constraints (that is, a set of rules) defined by a DTD or an XML schema, you
-can turn the constraints on and off to provide flexibility in the way you
-edit, but still maintain the validity of the document periodically.</p>
-
-<div class="section"><p> When the constraints are turned on, and you are working in the
-Design view, the XML editor prevents you from inserting elements, attributes,
-or attribute values not permitted by the rules of the XML schema or DTD, and
-from removing necessary or predefined sets of tags and values. In this mode,
-an element's content must be valid to use the XML editor's guided editing
-options.</p>
-<p>You might want to turn the constraints off for an XML file
-if you need more flexibility. For example, you want to try working with elements
-or attributes not permitted by the associated DTD or XML schema, without actually
-removing the association with the DTD or XML schema.</p>
-<p>To turn the constraints
-for an XML file off, click <span class="uicontrol">XML &gt; Turn Grammar Constraints Off</span>.
-After you have turned the constraints off for a file, you can insert or delete
-any element or attribute regardless of the DTD or XML schema rules. You can
-create new elements or attributes that are not in the DTD or schema - these
-Design view prompts will only appear when you have turned constraints off.
-The file might not be valid, however, if you do this. </p>
-<p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</p>
-<p>The following example shows what you
-can do if you turn the constraints of a DTD off:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file in the XML editor (right-click the file in the
-Navigator view and click <span class="uicontrol">Open With &gt; XML Editor</span>). </span>
-</li>
-
-<li class="stepexpand"><span>You have a DTD that specifies that an element requires at least
-one of a specific child element:  </span> <pre>&lt;!ELEMENT parentElement (childElement+)&gt;
-</pre>
-</li>
-
-<li class="stepexpand"><span>If, in an XML file associated with your DTD, you attempt to remove
-the final child element of the element with the DTD constraints turned on,
-the editor will not allow you to do this, as it will make the document invalid.</span>
- You can confirm this by using the element's pop-up menu to verify that
-the <span class="uicontrol">Remove</span> option is grayed out.</li>
-
-<li class="stepexpand"><span>To turn the DTD constraints off, click <span class="uicontrol">XML &gt; Turn Grammar
-Constraints Off</span>. </span></li>
-
-<li class="stepexpand"><span>If you attempt to remove the same child element with constraints
-off, the editor will allow you to.</span></li>
-
-<li class="stepexpand"><span>To correct the invalid document, you will have to re-add the necessary
-element, or remove the invalid tagging or value.</span></li>
-
-</ol>
-
-<div class="section">If you introduce errors into your files, you must save and validate
-the file in order to see a list of the errors you have introduced. They will
-be listed in the Problems view. After you fix the errors, you must save and
-validate your file again to see if the file is now valid.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
deleted file mode 100644
index 5f5a682..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtdoc" xml:lang="en-us">

-<title>Editing DOCTYPE declarations</title>

-<titlealts>

-<searchtitle>Editing DOCTYPE declarations</searchtitle>

-</titlealts>

-<shortdesc>The DOCTYPE declaration in an XML file is used at the beginning

-of it to associate it with a DTD file. You can edit your DOCTYPE declaration

-to change the DTD file your XML file is associated with.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DOCTYPE declarations<indexterm>XML editor</indexterm></indexterm>

-<indexterm>XML editor<indexterm>DOCTYPE declarations</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit your DOCTYPE

-declaration, follow these steps:</p></context>

-<steps>

-<step><cmd>In the Design view of the XML editor, right-click <uicontrol>DOCTYPE</uicontrol> and

-click <uicontrol>Edit DOCTYPE</uicontrol>.</cmd></step>

-<step><cmd>The value in the <uicontrol>Root element name</uicontrol> field

-should match the root element of your XML file exactly.</cmd><info>You should

-only edit the value in this field if your root element changes.</info></step>

-<step><cmd>You can select a Public ID for any existing XML Catalog entries

-by clicking <uicontrol>Browse</uicontrol>. </cmd><info>The value in the <uicontrol>Public

-ID</uicontrol> field is the Public Identifier. It is used to associate the

-XML file (using an XML Catalog entry) with a DTD file. For more information

-on XML Catalog entries, refer to the related tasks.</info></step>

-<step><cmd>The value in the <uicontrol>System ID</uicontrol> field is the

-DTD the XML file is associated with. Type the path of the DTD file (or browse

-for it) you want the XML file associated with in this field. </cmd><info>  <b>Note</b>:

-When the XML file is processed by the XML processor, it will first try to

-use the Public ID to locate the DTD, and if this fails, it will use the System

-ID to find it.</info></step>

-<step><cmd>Click  <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<postreq>If you do not have a DOCTYPE declaration in your XML file, you can

-right-click in the Design view and click <uicontrol>Add DTD Information</uicontrol> to

-add one.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
deleted file mode 100644
index 4d877a3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing DOCTYPE declarations" />
-<meta name="abstract" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
-<meta name="description" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
-<meta content="XML editor, editing, DOCTYPE declarations, XML files" name="DC.subject" />
-<meta content="XML editor, editing, DOCTYPE declarations, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtdoc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing DOCTYPE declarations</title>
-</head>
-<body id="tedtdoc"><a name="tedtdoc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing DOCTYPE declarations</h1>
-
-
-
-
-<div><p>The DOCTYPE declaration in an XML file is used at the beginning
-of it to associate it with a DTD file. You can edit your DOCTYPE declaration
-to change the DTD file your XML file is associated with.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your DOCTYPE
-declaration, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view of the XML editor, right-click <span class="uicontrol">DOCTYPE</span> and
-click <span class="uicontrol">Edit DOCTYPE</span>.</span></li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Root element name</span> field
-should match the root element of your XML file exactly.</span> You should
-only edit the value in this field if your root element changes.</li>
-
-<li class="stepexpand"><span>You can select a Public ID for any existing XML Catalog entries
-by clicking <span class="uicontrol">Browse</span>. </span> The value in the <span class="uicontrol">Public
-ID</span> field is the Public Identifier. It is used to associate the
-XML file (using an XML Catalog entry) with a DTD file. For more information
-on XML Catalog entries, refer to the related tasks.</li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">System ID</span> field is the
-DTD the XML file is associated with. Type the path of the DTD file (or browse
-for it) you want the XML file associated with in this field. </span>   <strong>Note</strong>:
-When the XML file is processed by the XML processor, it will first try to
-use the Public ID to locate the DTD, and if this fails, it will use the System
-ID to find it.</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">If you do not have a DOCTYPE declaration in your XML file, you can
-right-click in the Design view and click <span class="uicontrol">Add DTD Information</span> to
-add one.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
deleted file mode 100644
index 92ec6ed..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtenc" xml:lang="en-us">

-<title>Specifying XML default encoding line delimiters</title>

-<titlealts>

-<searchtitle>Specifying line delimiters</searchtitle>

-</titlealts>

-<shortdesc>This page lets you specify the line delimiter and the text encoding

-that will be used when you create or save an XML related file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>specifying line delimiters</indexterm></indexterm>

-<indexterm>line delimiters<indexterm>XML files</indexterm></indexterm>

-</keywords>

-<keywords></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To specify the line delimiter you want to use:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol></menucascade>.</cmd>

-</step>

-<step><cmd>In the <uicontrol>Line delimiter</uicontrol> list, select the operating

-system that applies to your development or deployment platform. </cmd></step>

-<step><cmd>From the <uicontrol>Encoding</uicontrol> field, specify

-the default character encoding set that is used when creating XML related

-files (DTDs, XML files, XML schemas). Changing the encoding causes any new,

-XML related files that are created from scratch to use the selected encoding.</cmd>

-</step>

-<step><cmd>Click  <uicontrol>Apply</uicontrol>, then <uicontrol>OK</uicontrol>.</cmd>

-</step>

-</steps>

-<result></result>

-</taskbody>

-</task>

-<?Pub *0000001698?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
deleted file mode 100644
index 4f0cfd7..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying XML default encoding line delimiters" />
-<meta name="abstract" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
-<meta name="description" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
-<meta content="XML files, specifying, line delimiters, encoding" name="DC.subject" />
-<meta content="XML files, specifying, line delimiters, encoding" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtenc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying line delimiters</title>
-</head>
-<body id="tedtenc"><a name="tedtenc"><!-- --></a>
-
-
-<h1 class="topictitle1">Specifying XML default encoding line delimiters</h1>
-
-
-
-
-<div><p>This page lets you specify the line delimiter and the text encoding
-that will be used when you create or save an XML related file.</p>
-
-<div class="section"><p>To specify the line delimiter you want to use:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span></span>.</span>
-</li>
-
-<li><span>In the <span class="uicontrol">Line delimiter</span> list, select the operating
-system that applies to your development or deployment platform. </span></li>
-
-<li><span>From the <span class="uicontrol">Encoding</span> field, specify
-the default character encoding set that is used when creating XML related
-files (DTDs, XML files, XML schemas). Changing the encoding causes any new,
-XML related files that are created from scratch to use the selected encoding.</span>
-</li>
-
-<li><span>Click  <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span>.</span>
-</li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
deleted file mode 100644
index 83dc689..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtgram" xml:lang="en-us">

-<title>Updating XML files with changes made to DTDs and schemas</title>

-<titlealts>

-<searchtitle>Updating XML files with changes made to DTDs and schemas</searchtitle>

-</titlealts>

-<shortdesc>If you make changes to a DTD file or XML schema associated with

-an XML file (that is currently open), click <uicontrol>XML > Reload Dependencies</uicontrol> to

-update the XML file with these changes. The changes will be reflected in the

-guided editing mechanisms available in the editor, such as content assist.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>updating XML files</indexterm></indexterm>

-<indexterm>XML files<indexterm>updating with associated changes</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example, you have a DTD file called "Contact.dtd" and an XML

-file called "Contact.xml" associated with it. Contact.dtd contains a root

-element called  <uicontrol>Contact</uicontrol> that can contain any of the

-following children elements:  <uicontrol>Name</uicontrol>,  <uicontrol>PostalAddress</uicontrol>,

- <uicontrol>Email</uicontrol>. If you remove the child element  <uicontrol>Email</uicontrol> from

-the DTD, you will no longer be able to add an  <uicontrol>Email</uicontrol> child

-element to your root element Contact in your Contact.xml file. This change,

-however, will not come into effect until you save your changes in the DTD

-and click <uicontrol>XML > Reload Dependencies</uicontrol> in the XML editor.

-Until you click it, you will still be able to add <uicontrol>Email</uicontrol> elements

-to Contact.xml.</p><p>This feature is very handy when you are making updates

-to both DTDs and XML schemas and XML files that are associated with DTDs and

-XML schemas.</p></context>

-</taskbody>

-</task>

-<?Pub *0000002040?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
deleted file mode 100644
index d1aba1d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Updating XML files with changes made to DTDs and schemas" />
-<meta name="abstract" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
-<meta name="description" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
-<meta content="XML editor, updating, XML files with associated changes, XML files, updating with associated changes" name="DC.subject" />
-<meta content="XML editor, updating, XML files with associated changes, XML files, updating with associated changes" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtgram" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Updating XML files with changes made to DTDs and schemas</title>
-</head>
-<body id="tedtgram"><a name="tedtgram"><!-- --></a>
-
-
-<h1 class="topictitle1">Updating XML files with changes made to DTDs and schemas</h1>
-
-
-
-
-<div><p>If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML &gt; Reload Dependencies</span> to
-update the XML file with these changes. The changes will be reflected in the
-guided editing mechanisms available in the editor, such as content assist.</p>
-
-<div class="section"><p>For example, you have a DTD file called "Contact.dtd" and an XML
-file called "Contact.xml" associated with it. Contact.dtd contains a root
-element called  <span class="uicontrol">Contact</span> that can contain any of the
-following children elements:  <span class="uicontrol">Name</span>,  <span class="uicontrol">PostalAddress</span>,
- <span class="uicontrol">Email</span>. If you remove the child element  <span class="uicontrol">Email</span> from
-the DTD, you will no longer be able to add an  <span class="uicontrol">Email</span> child
-element to your root element Contact in your Contact.xml file. This change,
-however, will not come into effect until you save your changes in the DTD
-and click <span class="uicontrol">XML &gt; Reload Dependencies</span> in the XML editor.
-Until you click it, you will still be able to add <span class="uicontrol">Email</span> elements
-to Contact.xml.</p>
-<p>This feature is very handy when you are making updates
-to both DTDs and XML schemas and XML files that are associated with DTDs and
-XML schemas.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
deleted file mode 100644
index 0450ec7..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtproc" xml:lang="en-us">

-<title>Editing XML processing instructions</title>

-<titlealts>

-<searchtitle>Editing XML processing instructions</searchtitle>

-</titlealts>

-<shortdesc>If you have instructions you want to pass along to an application

-using an XML document, you can use a processing instruction. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>processing instructions</indexterm></indexterm>

-<indexterm>XML files<indexterm>processing instructions</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit a processing

-instruction, follow these steps:</p></context>

-<steps>

-<step><cmd>In the Design view of the XML editor, right-click your processing

-instruction, and click <uicontrol>Edit Processing Instruction</uicontrol>.</cmd>

-</step>

-<step><cmd>The <uicontrol>Target</uicontrol> field is used to identify the

-application the instructions belongs to.</cmd></step>

-<step><cmd>The <uicontrol>Data</uicontrol> field contains the instructions.</cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<postreq>To create a new processing instruction, right-click in the Design

-view, and click <uicontrol>Add Child</uicontrol>, <uicontrol>Add Before</uicontrol> or <uicontrol>Add

-After</uicontrol>, then click <uicontrol>Add Processing Instruction</uicontrol>.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
deleted file mode 100644
index c00534a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML processing instructions" />
-<meta name="abstract" content="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction." />
-<meta name="description" content="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction." />
-<meta content="XML editor, editing, processing instructions, editing, XML files" name="DC.subject" />
-<meta content="XML editor, editing, processing instructions, editing, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtproc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML processing instructions</title>
-</head>
-<body id="tedtproc"><a name="tedtproc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML processing instructions</h1>
-
-
-
-
-<div><p>If you have instructions you want to pass along to an application
-using an XML document, you can use a processing instruction. </p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit a processing
-instruction, follow these steps:</p>
-</div>
-
-<ol>
-<li><span>In the Design view of the XML editor, right-click your processing
-instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.</span>
-</li>
-
-<li><span>The <span class="uicontrol">Target</span> field is used to identify the
-application the instructions belongs to.</span></li>
-
-<li><span>The <span class="uicontrol">Data</span> field contains the instructions.</span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">To create a new processing instruction, right-click in the Design
-view, and click <span class="uicontrol">Add Child</span>, <span class="uicontrol">Add Before</span> or <span class="uicontrol">Add
-After</span>, then click <span class="uicontrol">Add Processing Instruction</span>.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
deleted file mode 100644
index f016bfc..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtsch" xml:lang="en-us">

-<title>Editing namespace information</title>

-<titlealts>

-<searchtitle>Editing namespace information</searchtitle>

-</titlealts>

-<shortdesc>Your namespace information is used to provide various information

-about the XML file, such as the XML schema and namespace it is associated

-with. If desired, you can change the schema and namespace your XML file is

-associated with or add a new association. Modifying any associations can impact

-what content is allowed in the XML file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>namespace information</indexterm></indexterm>

-<indexterm>XML files<indexterm>namespace information</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit your schema

-information, follow these steps:</p></context>

-<steps>

-<step><cmd>In the Design view of the XML editor, right-click your root element

-and click <uicontrol>Edit Namespaces</uicontrol>.</cmd></step>

-<step><cmd>Your XML file can be associated with more than one namespace or

-schema.</cmd><info>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</info>

-</step>

-<step><cmd>The value in the <uicontrol>Namespace Name</uicontrol> field is

-a namespace the XML file is associated with.</cmd><info>Your XML file should

-be associated with the same namespace(s) its XML schema is associated with.

-For more information about namespaces, refer to the related reference.</info>

-</step>

-<step><cmd>All qualified elements and attributes in the XML file associated

-with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>

-</step>

-<step><cmd>The <uicontrol>Location Hint</uicontrol> field contains the location

-of the XML schema the XML file is associated with.</cmd><info>An XML Catalog

-Key or a namespace name can be specified in this field. Click <uicontrol>Browse</uicontrol> to

-view all XML schemas in the workbench and XML Catalog.</info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>, then click <uicontrol>OK</uicontrol> again.</cmd>

-</step>

-</steps>

-<result><p>If you want to create a new association, click <uicontrol>Add</uicontrol> instead

-of <uicontrol>Edit</uicontrol>. You can then either click the <uicontrol>Specify

-From Registered Namespace</uicontrol> radio button and select the namespace

-declarations you want to add or click the <uicontrol>Specify New Namespace</uicontrol> radio

-button and fill in the fields as necessary.</p></result>

-<postreq>If you do not have namespace information in your XML file, you can

-right-click your root element in the Design view and click <uicontrol>Edit

-Namespaces</uicontrol> to add it. If you do not have a root element, you must

-create one before you can add the namespace information.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
deleted file mode 100644
index d269381..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing namespace information" />
-<meta name="abstract" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
-<meta name="description" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
-<meta content="XML editor, editing, namespace information, XML files" name="DC.subject" />
-<meta content="XML editor, editing, namespace information, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtsch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing namespace information</title>
-</head>
-<body id="tedtsch"><a name="tedtsch"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing namespace information</h1>
-
-
-
-
-<div><p>Your namespace information is used to provide various information
-about the XML file, such as the XML schema and namespace it is associated
-with. If desired, you can change the schema and namespace your XML file is
-associated with or add a new association. Modifying any associations can impact
-what content is allowed in the XML file.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your schema
-information, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view of the XML editor, right-click your root element
-and click <span class="uicontrol">Edit Namespaces</span>.</span></li>
-
-<li class="stepexpand"><span>Your XML file can be associated with more than one namespace or
-schema.</span> Select the entry you want to edit and click <span class="uicontrol">Edit</span>.
-</li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
-a namespace the XML file is associated with.</span> Your XML file should
-be associated with the same namespace(s) its XML schema is associated with.
-For more information about namespaces, refer to the related reference.
-</li>
-
-<li class="stepexpand"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</span>
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema the XML file is associated with.</span> An XML Catalog
-Key or a namespace name can be specified in this field. Click <span class="uicontrol">Browse</span> to
-view all XML schemas in the workbench and XML Catalog.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>, then click <span class="uicontrol">OK</span> again.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>If you want to create a new association, click <span class="uicontrol">Add</span> instead
-of <span class="uicontrol">Edit</span>. You can then either click the <span class="uicontrol">Specify
-From Registered Namespace</span> radio button and select the namespace
-declarations you want to add or click the <span class="uicontrol">Specify New Namespace</span> radio
-button and fill in the fields as necessary.</p>
-</div>
-
-<div class="section">If you do not have namespace information in your XML file, you can
-right-click your root element in the Design view and click <span class="uicontrol">Edit
-Namespaces</span> to add it. If you do not have a root element, you must
-create one before you can add the namespace information.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
deleted file mode 100644
index 2f5d1b5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="xmlsourcesuggestionstrategy" xml:lang="en-us">

-<title>Setting the XML source suggestion strategy used by content assist</title>

-<shortdesc>You can customize the formatting of the suggestions given by content

-assist by choosing a suggestion strategy preference. When the suggestion strategy

-is set to "Strict", suggestions that are 'strictly' grammatically valid will

-be displayed first in the list of options and highlighted by bold icons. Other

-suggestions that are applicable to this element's scope but are not grammatically

-valid, will be displayed lower in the list with de-emphasized icons. When

-the suggestion strategy is set to "Lax", all suggestions will displayed in

-the list with de-emphasized icons.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>source suggestion strategy</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To set the suggestion strategy used by content assist:</context>

-<steps>

-<step><cmd>From the menu bar, Click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade></cmd></step>

-<step><cmd>Select <menucascade><uicontrol>Web and XML</uicontrol><uicontrol>XML

-Files</uicontrol><uicontrol>XML Source</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Beside Suggestion strategy in the Content assist section, select

-the appropriate setting (for example, <uicontrol>Strict</uicontrol>).</cmd>

-</step>

-</steps>

-<example><p>The following screen capture demonstrates content assist with

-the suggestion strategy set to "Strict":</p><image href="../images/suggestion.gif"

-placement="break"><alt>Example of Strict Suggestion Strategy</alt></image></example>

-</taskbody>

-</task>

-<?Pub *0000001917?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
deleted file mode 100644
index 274ff98..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting the XML source suggestion strategy used by content assist" />
-<meta name="abstract" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to &quot;Strict&quot;, suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to &quot;Lax&quot;, all suggestions will displayed in the list with de-emphasized icons." />
-<meta name="description" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to &quot;Strict&quot;, suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to &quot;Lax&quot;, all suggestions will displayed in the list with de-emphasized icons." />
-<meta content="XML editor, setting, source suggestion strategy" name="DC.subject" />
-<meta content="XML editor, setting, source suggestion strategy" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="xmlsourcesuggestionstrategy" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting the XML source suggestion strategy used by content assist</title>
-</head>
-<body id="xmlsourcesuggestionstrategy"><a name="xmlsourcesuggestionstrategy"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting the XML source suggestion strategy used by content assist</h1>
-
-
-
-<div><p>You can customize the formatting of the suggestions given by content
-assist by choosing a suggestion strategy preference. When the suggestion strategy
-is set to "Strict", suggestions that are 'strictly' grammatically valid will
-be displayed first in the list of options and highlighted by bold icons. Other
-suggestions that are applicable to this element's scope but are not grammatically
-valid, will be displayed lower in the list with de-emphasized icons. When
-the suggestion strategy is set to "Lax", all suggestions will displayed in
-the list with de-emphasized icons.</p>
-
-<div class="section">To set the suggestion strategy used by content assist:</div>
-
-<ol>
-<li><span>From the menu bar, Click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span></span></span></li>
-
-<li><span>Select <span class="menucascade"><span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML
-Files</span> &gt; <span class="uicontrol">XML Source</span></span>.</span></li>
-
-<li><span>Beside Suggestion strategy in the Content assist section, select
-the appropriate setting (for example, <span class="uicontrol">Strict</span>).</span>
-</li>
-
-</ol>
-
-<div class="example"><p>The following screen capture demonstrates content assist with
-the suggestion strategy set to "Strict":</p>
-<br /><img src="../images/suggestion.gif" alt="Example of Strict Suggestion Strategy" /><br /></div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
deleted file mode 100644
index d150697..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="ttaghilt" xml:lang="en-us">

-<title>Setting source highlighting styles</title>

-<titlealts>

-<searchtitle>Setting source highlighting styles</searchtitle>

-</titlealts>

-<shortdesc>If desired, you can change various aspects of how the XML source

-code is displayed in the Source view of the XML editor, such as the colors

-the tags will be displayed in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>setting source highlighting styles</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To set highlighting styles for the XML code, follow these steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol> XML

-Styles</uicontrol></menucascade>.</cmd></step>

-<step><cmd>In the <uicontrol>Content type</uicontrol> list, select the source

-tag type that you wish to set a highlighting style for. You can also click

-text in the sample text to specify the source tag type that you wish to set

-a highlighting style for.</cmd></step>

-<step><cmd>Click the <uicontrol>Foreground</uicontrol> box.</cmd></step>

-<step><cmd>Select the color that you want the text of the tag to appear in

-and click <uicontrol>OK</uicontrol>.</cmd></step>

-<step><cmd>Click the <uicontrol>Background</uicontrol> box.</cmd></step>

-<step><cmd>Select the color that you want to appear behind the tag and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the <uicontrol>Bold</uicontrol> check box if you want to

-make the type bold.</cmd></step>

-<step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting

-styles back to their default values. If you only want to reset the value for

-a particular content type, select it in the <uicontrol>Content type </uicontrol> field,

-the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>

-</steps>

-<result></result>

-</taskbody>

-</task>

-<?Pub *0000002262?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
deleted file mode 100644
index de2dd48..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting source highlighting styles" />
-<meta name="abstract" content="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in." />
-<meta name="description" content="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in." />
-<meta content="XML editor, setting source highlighting styles" name="DC.subject" />
-<meta content="XML editor, setting source highlighting styles" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ttaghilt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting source highlighting styles</title>
-</head>
-<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting source highlighting styles</h1>
-
-
-
-
-<div><p>If desired, you can change various aspects of how the XML source
-code is displayed in the Source view of the XML editor, such as the colors
-the tags will be displayed in.</p>
-
-<div class="section"><p>To set highlighting styles for the XML code, follow these steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol"> XML
-Styles</span></span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Content type</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also click
-text in the sample text to specify the source tag type that you wish to set
-a highlighting style for.</span></li>
-
-<li><span>Click the <span class="uicontrol">Foreground</span> box.</span></li>
-
-<li><span>Select the color that you want the text of the tag to appear in
-and click <span class="uicontrol">OK</span>.</span></li>
-
-<li><span>Click the <span class="uicontrol">Background</span> box.</span></li>
-
-<li><span>Select the color that you want to appear behind the tag and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
-make the type bold.</span></li>
-
-<li><span>Click <span class="uicontrol">Restore Default</span> to set the highlighting
-styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <span class="uicontrol">Content type </span> field,
-the click the <span class="uicontrol">Restore Default</span> button next to it. </span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span> to save your changes.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
deleted file mode 100644
index 16ba4e3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<?Pub Inc?>

-<task id="twcdast" xml:lang="en-us">

-<title>Using XML content assist</title>

-<titlealts>

-<searchtitle>Using XML content assist</searchtitle>

-</titlealts>

-<shortdesc>You can use content assist to help you finish a tag or line of

-code in the Source view of the XML editor. You can also use content assist

-to insert templates into your XML code.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>content assist</indexterm></indexterm>

-<indexterm>XML files<indexterm>content assist</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The placement of the cursor in your source file provides the context

-for the content assist to offer suggestions for completion.</p><p>You can

-launch content assist in either of the following ways:</p><ul>

-<li>From the <uicontrol>Edit</uicontrol> menu, click <uicontrol>Content Assist</uicontrol>,

-or</li>

-<li>Press Ctrl+Space</li>

-</ul><p>In addition, you can set up an option that causes content assist to

-pop up automatically when certain characters are typed. To set up this option,

-click <menucascade><uicontrol>Window</uicontrol><uicontrol> Preferences</uicontrol>

-</menucascade> to open the Preferences window, then click <menucascade><uicontrol>Web

-and XML</uicontrol><uicontrol>XML Files </uicontrol><uicontrol>XML Source</uicontrol>

-</menucascade> . In the <uicontrol>Content assist</uicontrol> group box, select

-the <uicontrol>Automatically make suggestions</uicontrol> check box, and supply

-any additional characters that should trigger content assist.</p><p>If your

-cursor is in a position where content assist is available, a pop-up list of

-available choices is displayed when you launch content assist. The list is

-based on the context and whether a DTD or XML schema is associated with the

-XML file being edited. For example, if you have an Address element that can

-contain any of the following children elements: Name, Street, City, Zip Code,

-Country, and Province, and you place your cursor after any of them and launch

-content assist, all of the child elements will be listed in the content assist

-list.</p><p>The content assist list displays all valid tags for the current

-cursor position, including templates. If your grammar constraints are turned

-off, all available tags, not just valid ones are displayed. </p><p> </p><p>As

-you type the first one or two letters of the tag that you want, the list automatically

-refreshes with alphabetized choices that match your input.</p><p><b>Note</b>:

-The list only refreshes as described if you first type <userinput>&lt;</userinput> before

-prompting for content assist.</p><p>Scroll down and select the tag that you

-want to use by double-clicking on it. </p></context>

-</taskbody>

-</task>

-<?Pub *0000003061?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
deleted file mode 100644
index f70e050..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Using XML content assist" />
-<meta name="abstract" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
-<meta name="description" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
-<meta content="XML editor, editing, content assist, XML files" name="DC.subject" />
-<meta content="XML editor, editing, content assist, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twmacro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tsugstrat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcdast" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Using XML content assist</title>
-</head>
-<body id="twcdast"><a name="twcdast"><!-- --></a>
-
-
-<h1 class="topictitle1">Using XML content assist</h1>
-
-
-
-
-<div><p>You can use content assist to help you finish a tag or line of
-code in the Source view of the XML editor. You can also use content assist
-to insert templates into your XML code.</p>
-
-<div class="section"><p>The placement of the cursor in your source file provides the context
-for the content assist to offer suggestions for completion.</p>
-<p>You can
-launch content assist in either of the following ways:</p>
-<ul>
-<li>From the <span class="uicontrol">Edit</span> menu, click <span class="uicontrol">Content Assist</span>,
-or</li>
-
-<li>Press Ctrl+Space</li>
-
-</ul>
-<p>In addition, you can set up an option that causes content assist to
-pop up automatically when certain characters are typed. To set up this option,
-click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol"> Preferences</span>
-</span> to open the Preferences window, then click <span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">XML Files </span> &gt; <span class="uicontrol">XML Source</span>
-</span> . In the <span class="uicontrol">Content assist</span> group box, select
-the <span class="uicontrol">Automatically make suggestions</span> check box, and supply
-any additional characters that should trigger content assist.</p>
-<p>If your
-cursor is in a position where content assist is available, a pop-up list of
-available choices is displayed when you launch content assist. The list is
-based on the context and whether a DTD or XML schema is associated with the
-XML file being edited. For example, if you have an Address element that can
-contain any of the following children elements: Name, Street, City, Zip Code,
-Country, and Province, and you place your cursor after any of them and launch
-content assist, all of the child elements will be listed in the content assist
-list.</p>
-<p>The content assist list displays all valid tags for the current
-cursor position, including templates. If your grammar constraints are turned
-off, all available tags, not just valid ones are displayed. </p>
-<p> </p>
-<p>As
-you type the first one or two letters of the tag that you want, the list automatically
-refreshes with alphabetized choices that match your input.</p>
-<p><strong>Note</strong>:
-The list only refreshes as described if you first type <kbd class="userinput">&lt;</kbd> before
-prompting for content assist.</p>
-<p>Scroll down and select the tag that you
-want to use by double-clicking on it. </p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
-<div><a href="../topics/tsugstrat.html" title="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to &quot;Strict&quot;, suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to &quot;Lax&quot;, all suggestions will displayed in the list with de-emphasized icons.">Setting the XML source suggestion strategy used by content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
deleted file mode 100644
index c7ebd9a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="twmacro" xml:lang="en-us">

-<title>Working with XML templates</title>

-<titlealts>

-<searchtitle>Working with XML templates</searchtitle>

-</titlealts>

-<shortdesc>XML content assist provides a comment template, a chunk of predefined

-code that you can insert into a file. You may find a template useful when

-you have a certain piece of code you want to reuse several times, and you

-do not want to write it out every time.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML templates<indexterm>working with predefined code</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can use a default template as provided, customize that template,

-or create your own templates.</p>For example, you can work on a group of XML

-pages that should all contain a table with a specific appearance. Create a

-template that contains the tags for that table, including the appropriate

-attributes and attribute values for each tag. (You can copy and paste the

-tags from a structured text editor into the template's <uicontrol>Pattern</uicontrol> field.)

-Then select the name of the template from a content assist proposal list whenever

-you want to insert your custom table into an XML file.<p>To create a new XML

-template follow these steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML

-Templates</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol> if you want to create a completely

-new template.</cmd></step>

-<step><cmd>Supply a new template <uicontrol>Name</uicontrol> and <uicontrol>Description</uicontrol>.</cmd>

-</step>

-<step><cmd>Specify the <uicontrol>Context</uicontrol> for the template.</cmd>

-<info>This is the context in which the template is available in the proposal

-list when content assist is requested. </info></step>

-<step><cmd>Specify the <uicontrol>Pattern</uicontrol> for your template using

-the appropriate tags, attributes, or attribute values to be inserted by content

-assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Insert Variable</uicontrol> button

-and select the variable to be inserted. </cmd><info>For example, the <b>date</b> variable

-indicates the current date will be inserted. </info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-<postreq>You can edit, remove, import, or export a template by using the same

-preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed. <p>If you have a template

-that you do not want to remove but you no longer want it to appear in the

-content assist list, go to the <b>XML Templates</b> preferences page and clear

-its check box.</p></postreq>

-</taskbody>

-</task>

-<?Pub *0000003427?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
deleted file mode 100644
index 5cfc519..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML templates" />
-<meta name="abstract" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta name="description" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="XML templates, creating, editing, XML templates, removing, importing, exporting" name="DC.subject" />
-<meta content="XML templates, creating, editing, XML templates, removing, importing, exporting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twmacro" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML templates</title>
-</head>
-<body id="twmacro"><a name="twmacro"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML templates</h1>
-
-
-
-
-<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You may find a template useful when
-you have a certain piece of code you want to reuse several times, and you
-do not want to write it out every time.</p>
-
-<div class="section"><p>You can use a default template as provided, customize that template,
-or create your own templates.</p>
-For example, you can work on a group of XML
-pages that should all contain a table with a specific appearance. Create a
-template that contains the tags for that table, including the appropriate
-attributes and attribute values for each tag. (You can copy and paste the
-tags from a structured text editor into the template's <span class="uicontrol">Pattern</span> field.)
-Then select the name of the template from a content assist proposal list whenever
-you want to insert your custom table into an XML file.<p>To create a new XML
-template follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML
-Templates</span></span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span> if you want to create a completely
-new template.</span></li>
-
-<li class="stepexpand"><span>Supply a new template <span class="uicontrol">Name</span> and <span class="uicontrol">Description</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Context</span> for the template.</span>
- This is the context in which the template is available in the proposal
-list when content assist is requested. </li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by content
-assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Insert Variable</span> button
-and select the variable to be inserted. </span> For example, the <strong>date</strong> variable
-indicates the current date will be inserted. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-<div class="section">You can edit, remove, import, or export a template by using the same
-preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed. <p>If you have a template
-that you do not want to remove but you no longer want it to appear in the
-content assist list, go to the <strong>XML Templates</strong> preferences page and clear
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
deleted file mode 100644
index 09e77a0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twxvalid" xml:lang="en-us">

-<title>Validating XML files</title>

-<titlealts>

-<searchtitle>Validating XML files</searchtitle>

-</titlealts>

-<shortdesc>When you validate your XML file, the XML validator will check to

-see that your file is valid and well-formed.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The XML editor will process XML files that are invalid or not

-well-formed. The editor uses heuristics to open a file using the best interpretation

-of the tagging that it can. For example, an element with a missing end tag

-is simply assumed to end at the end of the document. As you make updates to

-a file, the editor incrementally reinterprets your document, changing the

-highlighting, tree view, and so on. Many formation errors are easy to spot

-in the syntax highlighting, so you can easily correct obvious errors on-the-fly.

-However, there will be other cases when it will be beneficial to perform formal

-validation on your documents.</p></context>

-<steps>

-<step><cmd>You can validate your file by selecting it in the Navigator view,

-right-clicking it, and clicking <uicontrol>Validate</uicontrol>.</cmd>

-</step>

-</steps>

-<result><p>Any validation problems are indicated in the Problems view. </p></result>

-<postreq><p>In the Problems view, you can double-click on individual errors,

-and you will be taken to the invalid tag in the file, so that you can make

-corrections. </p><p><b>Note</b>: If you receive an error message indicating

-that the Problems view is full, you can increase the number of error messages

-allowed by selecting <menucascade><uicontrol>Properties</uicontrol><uicontrol>Validation</uicontrol>

-</menucascade> from the project's pop-up menu and specifying the maximum number

-of error messages allowed. You must select the <uicontrol>Override validation

-preferences</uicontrol> check box in order to be able to do this.</p><p>As

-well, you can set up a project's properties so that different types of project

-resources are automatically validated when you save them. From a project's

-pop-up menu select <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.

-Any validators you can run against your project will be listed in the Validation

-page.</p></postreq>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

-<linktext>Validating code in enterprise applications</linktext></link>

-</related-links>

-</task>

-<?Pub *0000002727?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
deleted file mode 100644
index 0b9ab90..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating XML files" />
-<meta name="abstract" content="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed." />
-<meta name="description" content="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed." />
-<meta content="XML files, validating" name="DC.subject" />
-<meta content="XML files, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twxvalid" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating XML files</title>
-</head>
-<body id="twxvalid"><a name="twxvalid"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating XML files</h1>
-
-
-
-
-<div><p>When you validate your XML file, the XML validator will check to
-see that your file is valid and well-formed.</p>
-
-<div class="section"><p>The XML editor will process XML files that are invalid or not
-well-formed. The editor uses heuristics to open a file using the best interpretation
-of the tagging that it can. For example, an element with a missing end tag
-is simply assumed to end at the end of the document. As you make updates to
-a file, the editor incrementally reinterprets your document, changing the
-highlighting, tree view, and so on. Many formation errors are easy to spot
-in the syntax highlighting, so you can easily correct obvious errors on-the-fly.
-However, there will be other cases when it will be beneficial to perform formal
-validation on your documents.</p>
-</div>
-
-
-<div class="p"><span>You can validate your file by selecting it in the Navigator view,
-right-clicking it, and clicking <span class="uicontrol">Validate</span>.</span>
-</div>
-
-
-<div class="section"><p>Any validation problems are indicated in the Problems view. </p>
-</div>
-
-<div class="section"><p>In the Problems view, you can double-click on individual errors,
-and you will be taken to the invalid tag in the file, so that you can make
-corrections. </p>
-<p><strong>Note</strong>: If you receive an error message indicating
-that the Problems view is full, you can increase the number of error messages
-allowed by selecting <span class="menucascade"><span class="uicontrol">Properties</span> &gt; <span class="uicontrol">Validation</span>
-</span> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You must select the <span class="uicontrol">Override validation
-preferences</span> check box in order to be able to do this.</p>
-<p>As
-well, you can set up a project's properties so that different types of project
-resources are automatically validated when you save them. From a project's
-pop-up menu select <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
-Any validators you can run against your project will be listed in the Validation
-page.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
deleted file mode 100644
index c0b5f94..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<?Pub Inc?>

-<task id="txedtdes" xml:lang="en-us">

-<title>Editing in the Design view</title>

-<titlealts>

-<searchtitle>Editing in the Design view</searchtitle>

-</titlealts>

-<shortdesc>The XML editor has a Design view, which represents the XML file

-simultaneously as a table and a tree. This helps make navigation and editing

-easier. Content and attribute values can be edited directly in the table cells,

-while pop-up menus on the tree elements give alternatives that are valid for

-that particular element.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>Design view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> For example, the <uicontrol>Add child</uicontrol> menu item will

-list only those elements from a DTD or XML schema which would be valid children

-at that point.</p><p>When you have an XML file associated with an XML schema

-or DTD file, certain tags and rules for that file have already been established,

-which is why the Design view can provide prompts (via a pop-up menu) for those

-tags. When you create an XML file that is not associated with an XML schema

-or DTD file, it has no tags or rules associated with it, so the Design view

-cannot provide prompts for specific tags, but it can provide prompts to create

-new elements and attributes.</p><p>For any XML file associated with an XML

-schema or DTD file, you can use the Design view to add any items defined in

-the XML schema or DTD (such as elements and attributes) to the XML file. You

-can also use it to add processing instructions and comments to all XML files.</p><p>For

-more information on the icons used in the Design view, refer to the related

-reference.</p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-edit an XML file in the Design view, follow these steps:</p></context>

-<steps>

-<step><cmd>Open the XML file that you want to work with in the XML editor

-(right-click the file in the Navigator view and click <uicontrol>Open With

-> XML Editor</uicontrol>). If necessary, click the <uicontrol>Design</uicontrol> tab.</cmd>

-</step>

-<step><cmd>To expand all the items in your XML file, click the <uicontrol>Expand

-All</uicontrol> toolbar button  <image href="../images/expand_all.gif"><alt>This

-graphic is the Expand All toolbar button</alt></image>.</cmd></step>

-<step><cmd>To collapse them, click the <uicontrol>Collapse All</uicontrol> toolbar

-button  <image href="../images/collapse_all.gif"><alt>This graphic is the

-Collapse All toolbar button</alt></image>.</cmd></step>

-<step><cmd>Right-click the item that you want to work with.</cmd><info>Some

-or all of the following options (as applicable) will be available from the

-pop-up menu that appears:<ul>

-<li> <uicontrol>Add DTD Information</uicontrol> - Click this if you want to

-associate the XML file with a DTD.</li>

-<li> <uicontrol>Edit DOCTYPE</uicontrol> - Click this if you want to edit

-the DOCTYPE declaration. Refer to the related task for more details.</li>

-<li> <uicontrol>Edit Namespaces</uicontrol> - Click this if you want to edit

-the existing namespace information or create a new association with a namespace.

-Refer to the related task for more details.</li>

-<li> <uicontrol>Edit Processing Instruction</uicontrol> - Click this if you

-want to edit the processing instruction. Refer to the related task for more

-details.</li>

-<li> <uicontrol>Remove</uicontrol> - Click this if you want to remove the

-item that you have selected from the XML file. This option will not be available

-if the item you want to remove must exist (for example, in your DTD, you have

-declared that "One or more" of the item must always exist in your XML file,

-and the item you have selected is the only one that exists in your XML file).</li>

-<li> <uicontrol>Add Attribute</uicontrol> - Click this if you want to add

-an attribute to the element that you selected. Any attributes you are allowed

-to add to the element will be listed. After you have added the attribute to

-the XML file, you can click in the right-hand column to change the value of

-the attribute. If the attribute has set values, they will appear in a list.</li>

-<li> <uicontrol>Add Child</uicontrol> - Click this to add another element,

-a comment, or a processing instruction as a child of the parent element.</li>

-<li> <uicontrol>Add Before</uicontrol>  - Click this to add a child element,

-comment, or processing instruction that can go before the item you have selected.

-For example, if you have a parent element called "CD Collections" that can

-contain an unlimited amount of children called "CD", you could click a CD

-element and click <menucascade><uicontrol>Add Before</uicontrol><uicontrol> CD</uicontrol>

-</menucascade> , as a CD element can go before another CD element.</li>

-<li> <uicontrol>Add After</uicontrol> - Click this to add a child element,

-comment, or processing instruction that can go after the item you have selected.

-For example, if you have a parent element called "CD Collections" that can

-contain an unlimited amount of children called "CD", you could click a CD

-element and click  <menucascade><uicontrol>Add After</uicontrol><uicontrol> CD</uicontrol>

-</menucascade>, as a CD element can go after another CD element.</li>

-<li> <uicontrol>Replace With</uicontrol> - Click this if you want to replace

-one item with another. This option is not available if you turn grammar constraints

-off or if there are no valid alternatives for you to replace the item with.</li>

-</ul></info></step>

-<step><cmd>Click the appropriate option.</cmd></step>

-</steps>

-<result><p>Any changes you make in the Design view are also reflected in the

-Source view and the Outline view.</p></result>

-</taskbody>

-</task>

-<?Pub *0000005971?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
deleted file mode 100644
index ace05b2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing in the Design view" />
-<meta name="abstract" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
-<meta name="description" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
-<meta content="XML editor, editing, in the Design view" name="DC.subject" />
-<meta content="XML editor, editing, in the Design view" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtproc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rxmlbicons.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedtdes" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing in the Design view</title>
-</head>
-<body id="txedtdes"><a name="txedtdes"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing in the Design view</h1>
-
-
-
-
-<div><p>The XML editor has a Design view, which represents the XML file
-simultaneously as a table and a tree. This helps make navigation and editing
-easier. Content and attribute values can be edited directly in the table cells,
-while pop-up menus on the tree elements give alternatives that are valid for
-that particular element.</p>
-
-<div class="section"><p> For example, the <span class="uicontrol">Add child</span> menu item will
-list only those elements from a DTD or XML schema which would be valid children
-at that point.</p>
-<p>When you have an XML file associated with an XML schema
-or DTD file, certain tags and rules for that file have already been established,
-which is why the Design view can provide prompts (via a pop-up menu) for those
-tags. When you create an XML file that is not associated with an XML schema
-or DTD file, it has no tags or rules associated with it, so the Design view
-cannot provide prompts for specific tags, but it can provide prompts to create
-new elements and attributes.</p>
-<p>For any XML file associated with an XML
-schema or DTD file, you can use the Design view to add any items defined in
-the XML schema or DTD (such as elements and attributes) to the XML file. You
-can also use it to add processing instructions and comments to all XML files.</p>
-<p>For
-more information on the icons used in the Design view, refer to the related
-reference.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-edit an XML file in the Design view, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file that you want to work with in the XML editor
-(right-click the file in the Navigator view and click <span class="uicontrol">Open With
-&gt; XML Editor</span>). If necessary, click the <span class="uicontrol">Design</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>To expand all the items in your XML file, click the <span class="uicontrol">Expand
-All</span> toolbar button  <img src="../images/expand_all.gif" alt="This&#10;graphic is the Expand All toolbar button" />.</span></li>
-
-<li class="stepexpand"><span>To collapse them, click the <span class="uicontrol">Collapse All</span> toolbar
-button  <img src="../images/collapse_all.gif" alt="This graphic is the&#10;Collapse All toolbar button" />.</span></li>
-
-<li class="stepexpand"><span>Right-click the item that you want to work with.</span> Some
-or all of the following options (as applicable) will be available from the
-pop-up menu that appears:<ul>
-<li> <span class="uicontrol">Add DTD Information</span> - Click this if you want to
-associate the XML file with a DTD.</li>
-
-<li> <span class="uicontrol">Edit DOCTYPE</span> - Click this if you want to edit
-the DOCTYPE declaration. Refer to the related task for more details.</li>
-
-<li> <span class="uicontrol">Edit Namespaces</span> - Click this if you want to edit
-the existing namespace information or create a new association with a namespace.
-Refer to the related task for more details.</li>
-
-<li> <span class="uicontrol">Edit Processing Instruction</span> - Click this if you
-want to edit the processing instruction. Refer to the related task for more
-details.</li>
-
-<li> <span class="uicontrol">Remove</span> - Click this if you want to remove the
-item that you have selected from the XML file. This option will not be available
-if the item you want to remove must exist (for example, in your DTD, you have
-declared that "One or more" of the item must always exist in your XML file,
-and the item you have selected is the only one that exists in your XML file).</li>
-
-<li> <span class="uicontrol">Add Attribute</span> - Click this if you want to add
-an attribute to the element that you selected. Any attributes you are allowed
-to add to the element will be listed. After you have added the attribute to
-the XML file, you can click in the right-hand column to change the value of
-the attribute. If the attribute has set values, they will appear in a list.</li>
-
-<li> <span class="uicontrol">Add Child</span> - Click this to add another element,
-a comment, or a processing instruction as a child of the parent element.</li>
-
-<li> <span class="uicontrol">Add Before</span>  - Click this to add a child element,
-comment, or processing instruction that can go before the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add Before</span> &gt; <span class="uicontrol"> CD</span>
-</span> , as a CD element can go before another CD element.</li>
-
-<li> <span class="uicontrol">Add After</span> - Click this to add a child element,
-comment, or processing instruction that can go after the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click  <span class="menucascade"><span class="uicontrol">Add After</span> &gt; <span class="uicontrol"> CD</span>
-</span>, as a CD element can go after another CD element.</li>
-
-<li> <span class="uicontrol">Replace With</span> - Click this if you want to replace
-one item with another. This option is not available if you turn grammar constraints
-off or if there are no valid alternatives for you to replace the item with.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Click the appropriate option.</span></li>
-
-</ol>
-
-<div class="section"><p>Any changes you make in the Design view are also reflected in the
-Source view and the Outline view.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
deleted file mode 100644
index a453b10..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="txedtsrc" xml:lang="en-us">

-<title>Editing in the Source view</title>

-<titlealts>

-<searchtitle>Editing in the Source view</searchtitle>

-</titlealts>

-<shortdesc>You can use the Source view to view and work with a file's source

-code directly.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>Source view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> The Source view has many text editing features, such as:</p><dl>

-<dlentry>

-<dt>Syntax highlighting</dt>

-<dd>Each tag type is highlighted differently, enabling you to easily find

-a certain kind of tag for editing. In addition, syntax highlighting is valuable

-in locating syntax errors. For example, if you begin a comment in the middle

-of the document with <codeph>&lt;!--</codeph> everything until the next <codeph>--></codeph> is

-considered a comment, and will be highlighted accordingly. The large highlighted

-area will indicate that you need to add <codeph>--></codeph> to close the

-comment.<p>You can customize the syntax highlighting. Refer to the related

-tasks for more information.</p></dd>

-</dlentry></dl><dl><dlentry>

-<dt>Unlimited undo and redo</dt>

-<dd>These options allow you to incrementally undo and redo every change made

-to a file for the entire editing session. For text, changes are incremented

-one character or set of selected characters at a time.</dd>

-</dlentry><dlentry>

-<dt>Content assist</dt>

-<dd>Content assist helps you finish tags and insert macros. Refer

-to the related task for more details.</dd>

-</dlentry><dlentry>

-<dt>Template</dt>

-<dd>You can access templates (using content assist) to help you quickly add

-regularly-used tagging combinations. Refer to the related task for more details.</dd>

-</dlentry><dlentry>

-<dt>Node selection</dt>

-<dd>Based on the location of your cursor (or selection in the Outline view),

-the node selection indicator highlights the line numbers that include a node

-(for example, an element or attribute), in the vertical ruler in the left

-area of the Source view.</dd>

-</dlentry><dlentry>

-<dt>Pop-up menu options</dt>

-<dd>From the editor's pop-up menu, you have many of the same editing options

-available as you do from the workbench  <b>Edit</b> menu. You can select menu

-options such as: <uicontrol>Cleanup Document,</uicontrol> to open the <uicontrol>Cleanup</uicontrol> 

-dialog, which contains settings to update a document so that it is well-formed

-and formatted and <uicontrol>Format,</uicontrol> which formats either the

-entire document or selected elements.</dd>

-</dlentry><dlentry>

-<dt>"Smart" double clicking</dt>

-<dd>You can use double-click to select attribute values, attribute-value pairs,

-and entire tag sets to quickly update, copy, or remove content.</dd>

-</dlentry></dl><p>To edit an XML file in the Source view, follow these steps:</p></context>

-<steps>

-<step><cmd>Open the XML file you want to work with in the XML editor  (right-click

-the file in the Navigator view and click <uicontrol>Open With > XML Editor</uicontrol>). </cmd>

-<info>You might need to click the <uicontrol>Source</uicontrol> tab. Typically,

-all that you will need to do to open the file is to double-click it in the

-Navigator view. If this does not work, right-click it and click <uicontrol>Open

-With > XML Editor</uicontrol>.</info></step>

-<step><cmd>Edit the code as necessary, using any of the available features.</cmd>

-<info>As you move the cursor within your XML file (or select items from the

-Outline view), the node selection indicator will highlight the line numbers

-that encompass the node (for example, an element or attribute). You can use

-smart double-clicking behavior to select attribute values, attribute-value

-pairs, and entire tag sets to quickly update, copy, or remove content.</info>

-</step>

-<step><cmd>At intervals, you might wish to format individual nodes, or the

-entire XML file to restore element and attribute indentation to see nesting

-hierarchies more clearly in the file.</cmd></step>

-<step><cmd>If desired, validate and save the XML file.</cmd></step>

-</steps>

-<result><p>Any changes you make in the Source view are also reflected in the

-Design view and the Outline view.</p></result>

-</taskbody>

-</task>

-<?Pub *0000004423?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
deleted file mode 100644
index c96c43d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing in the Source view" />
-<meta name="abstract" content="You can use the Source view to view and work with a file's source code directly." />
-<meta name="description" content="You can use the Source view to view and work with a file's source code directly." />
-<meta content="XML editor, editing, in the Source view" name="DC.subject" />
-<meta content="XML editor, editing, in the Source view" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twmacro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ttaghilt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedtsrc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing in the Source view</title>
-</head>
-<body id="txedtsrc"><a name="txedtsrc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing in the Source view</h1>
-
-
-
-
-<div><p>You can use the Source view to view and work with a file's source
-code directly.</p>
-
-<div class="section"><p> The Source view has many text editing features, such as:</p>
-<dl>
-
-<dt class="dlterm">Syntax highlighting</dt>
-
-<dd>Each tag type is highlighted differently, enabling you to easily find
-a certain kind of tag for editing. In addition, syntax highlighting is valuable
-in locating syntax errors. For example, if you begin a comment in the middle
-of the document with <samp class="codeph">&lt;!--</samp> everything until the next <samp class="codeph">--&gt;</samp> is
-considered a comment, and will be highlighted accordingly. The large highlighted
-area will indicate that you need to add <samp class="codeph">--&gt;</samp> to close the
-comment.<p>You can customize the syntax highlighting. Refer to the related
-tasks for more information.</p>
-</dd>
-
-</dl>
-<dl>
-<dt class="dlterm">Unlimited undo and redo</dt>
-
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-
-
-<dt class="dlterm">Content assist</dt>
-
-<dd>Content assist helps you finish tags and insert macros. Refer
-to the related task for more details.</dd>
-
-
-<dt class="dlterm">Template</dt>
-
-<dd>You can access templates (using content assist) to help you quickly add
-regularly-used tagging combinations. Refer to the related task for more details.</dd>
-
-
-<dt class="dlterm">Node selection</dt>
-
-<dd>Based on the location of your cursor (or selection in the Outline view),
-the node selection indicator highlights the line numbers that include a node
-(for example, an element or attribute), in the vertical ruler in the left
-area of the Source view.</dd>
-
-
-<dt class="dlterm">Pop-up menu options</dt>
-
-<dd>From the editor's pop-up menu, you have many of the same editing options
-available as you do from the workbench  <strong>Edit</strong> menu. You can select menu
-options such as: <span class="uicontrol">Cleanup Document,</span> to open the <span class="uicontrol">Cleanup</span> 
-dialog, which contains settings to update a document so that it is well-formed
-and formatted and <span class="uicontrol">Format,</span> which formats either the
-entire document or selected elements.</dd>
-
-
-<dt class="dlterm">"Smart" double clicking</dt>
-
-<dd>You can use double-click to select attribute values, attribute-value pairs,
-and entire tag sets to quickly update, copy, or remove content.</dd>
-
-</dl>
-<p>To edit an XML file in the Source view, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file you want to work with in the XML editor  (right-click
-the file in the Navigator view and click <span class="uicontrol">Open With &gt; XML Editor</span>). </span>
- You might need to click the <span class="uicontrol">Source</span> tab. Typically,
-all that you will need to do to open the file is to double-click it in the
-Navigator view. If this does not work, right-click it and click <span class="uicontrol">Open
-With &gt; XML Editor</span>.</li>
-
-<li class="stepexpand"><span>Edit the code as necessary, using any of the available features.</span>
- As you move the cursor within your XML file (or select items from the
-Outline view), the node selection indicator will highlight the line numbers
-that encompass the node (for example, an element or attribute). You can use
-smart double-clicking behavior to select attribute values, attribute-value
-pairs, and entire tag sets to quickly update, copy, or remove content.
-</li>
-
-<li class="stepexpand"><span>At intervals, you might wish to format individual nodes, or the
-entire XML file to restore element and attribute indentation to see nesting
-hierarchies more clearly in the file.</span></li>
-
-<li class="stepexpand"><span>If desired, validate and save the XML file.</span></li>
-
-</ol>
-
-<div class="section"><p>Any changes you make in the Source view are also reflected in the
-Design view and the Outline view.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
-<div><a href="../topics/ttaghilt.html" title="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in.">Setting source highlighting styles</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
deleted file mode 100644
index df24fd5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="txedttag" xml:lang="en-us">

-<title>Editing XML files</title>

-<titlealts>

-<searchtitle>Editing XML files</searchtitle>

-</titlealts>

-<shortdesc>This file contains information about editing XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>XML files</indexterm></indexterm>

-<indexterm>XML files<indexterm>editing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To open an XML file in the XML editor, right-click it in the Navigator

-view and click <menucascade><uicontrol>Open With</uicontrol><uicontrol>XML

-Editor</uicontrol></menucascade>. </p><p>We recommend working in the Resource

-perspective when you are developing XML files. The views that appear by default

-in this perspective (such as the Outline view) help facilitate XML development.</p><p>The

-XML editor enables you to directly edit XML files. There are several different

-views you can use to edit your files:</p><ul>

-<li><b>Source view</b> - you can manually insert, edit, and delete elements

-and attributes in the Source view of the XML editor. To facilitate this effort,

-you can use content assist while you are in the Source view.</li>

-<li><b>Design view</b> - you can insert, delete, and edit elements, attributes,

-comments, and processing instructions in this view.</li>

-<li><b>Outline view </b>- you can insert and delete elements attributes, comments,

-and processing instructions in this view.</li>

-</ul><p>Often, you may find that you have more than one way to perform a specific

-task. For example, you have an XML file "MySchoolSubjects.xml" associated

-with an XML schema file "SchoolSubjects.xsd", which list all the subjects

-taught in a school. You want to insert a new element "Math" into your file.

-You can do so in the following ways:</p><ul>

-<li>In the Outline or Design view, right-click the appropriate parent element

-and select <uicontrol>Math</uicontrol> from the <uicontrol>Add Child</uicontrol> pop-up

-menu.</li>

-<li>In the Source view, use content assist to help you find the appropriate

-location and code for the <uicontrol>Math</uicontrol> element.</li>

-<li>In the Source view, type the code for the <uicontrol>Math</uicontrol> element

-in the file.</li>

-</ul></context>

-<postreq>The following links provide more information about the XML editor

-and editing XML files:</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
deleted file mode 100644
index af6b692..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML files" />
-<meta name="abstract" content="This file contains information about editing XML files." />
-<meta name="description" content="This file contains information about editing XML files." />
-<meta content="XML files, editing, XML editor" name="DC.subject" />
-<meta content="XML files, editing, XML editor" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedttag" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML files</title>
-</head>
-<body id="txedttag"><a name="txedttag"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML files</h1>
-
-
-
-
-<div><p>This file contains information about editing XML files.</p>
-
-<div class="section"><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and click <span class="menucascade"><span class="uicontrol">Open With</span> &gt; <span class="uicontrol">XML
-Editor</span></span>. </p>
-<p>We recommend working in the Resource
-perspective when you are developing XML files. The views that appear by default
-in this perspective (such as the Outline view) help facilitate XML development.</p>
-<p>The
-XML editor enables you to directly edit XML files. There are several different
-views you can use to edit your files:</p>
-<ul>
-<li><strong>Source view</strong> - you can manually insert, edit, and delete elements
-and attributes in the Source view of the XML editor. To facilitate this effort,
-you can use content assist while you are in the Source view.</li>
-
-<li><strong>Design view</strong> - you can insert, delete, and edit elements, attributes,
-comments, and processing instructions in this view.</li>
-
-<li><strong>Outline view </strong>- you can insert and delete elements attributes, comments,
-and processing instructions in this view.</li>
-
-</ul>
-<p>Often, you may find that you have more than one way to perform a specific
-task. For example, you have an XML file "MySchoolSubjects.xml" associated
-with an XML schema file "SchoolSubjects.xsd", which list all the subjects
-taught in a school. You want to insert a new element "Math" into your file.
-You can do so in the following ways:</p>
-<ul>
-<li>In the Outline or Design view, right-click the appropriate parent element
-and select <span class="uicontrol">Math</span> from the <span class="uicontrol">Add Child</span> pop-up
-menu.</li>
-
-<li>In the Source view, use content assist to help you find the appropriate
-location and code for the <span class="uicontrol">Math</span> element.</li>
-
-<li>In the Source view, type the code for the <span class="uicontrol">Math</span> element
-in the file.</li>
-
-</ul>
-</div>
-
-<div class="section">The following links provide more information about the XML editor
-and editing XML files:</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
deleted file mode 100644
index 828484f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<?Pub Inc?>

-<task id="txmlcat" xml:lang="en-us">

-<title>Adding entries to the XML Catalog</title>

-<titlealts>

-<searchtitle>Adding entries to the XML Catalog</searchtitle>

-</titlealts>

-<shortdesc>An XML Catalog entry contains two parts - a Key (which represents

-a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains

-information about a DTD or XML schema's location). You can place the Key in

-an XML file. When the XML processor encounters it, it will use the XML Catalog

-entry to find the location of the DTD or XML schema associated with the Key</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML catalog<indexterm>adding entries</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>XML Catalog entries can be used in various situations. For example,

-you are working on an XML file on your main desktop computer and point its <codeph>schemaLocation</codeph> towards

-a schema called <codeph>c:\MySchema.xsd</codeph>. You then save it to your

-laptop computer so you can work on it later. When you open the file on your

-laptop, however, you encounter a problem - the XML editor cannot find the <codeph>MySchema.xsd</codeph> schema

-because it is actually installed on your D drive. You will have to edit the <codeph>schemaLocation</codeph> to

-point to <codeph>d:\MySchema.xsd</codeph>. When you have finished editing

-the XML file and are ready to publish it on the Web, you will need to edit

-the URI again so that it points to a resource that is accessible on the Web.

-By now, the problem is obvious. A URI used within an XML file is not as portable

-as you would like it to be. To avoid making frequent changes to your XML document,

-you can use the XML Catalog.</p><p>An XML Catalog entry is used by an XML

-processor when resolving entity references. You can provide rules to the catalog

-to specify how entities should be resolved. If you consider the preceding

-example, you could specify a rule that redirects an Internet resource reference

-(for example,  <codeph>"http://www.ibm.com/published-schemas/MySchema.xsd"</codeph>)

-so that it points to a resource on the developer's local machine (for example,

- <codeph>"file:///C:/MySchema.xsd"</codeph>). Now, instead of frequently editing

-XML documents to update the URIs (especially when there are many documents

-in your project), you only need to update a single rule in your XML Catalog.</p><p>The

-following instructions were written for the Resource perspective, but they

-will also work in many other perspectives.</p><p>To add an entry to the XML

-Catalog, follow these steps:</p></context>

-<steps>

-<step><cmd>Open the XML file that you want to associate with a DTD or XML

-schema.</cmd></step>

-<step><cmd>Click  <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>XML Catalog</uicontrol></menucascade>.</cmd>

-</step>

-<step><cmd>The  <uicontrol>XML Catalog Entries</uicontrol> field contains

-a list of any user-defined and plug-in defined catalog entries.</cmd>

-<substeps>

-<substep><cmd>Select any entry to see details about it in the <uicontrol>Details</uicontrol> field. </cmd>

-</substep>

-<substep><cmd>Click <uicontrol>Add</uicontrol> to create a new catalog entry.</cmd>

-</substep>

-</substeps>

-</step>

-<step><cmd>In the <uicontrol>URI</uicontrol> field, type the location of the

-DTD or XML schema or browse for it.</cmd></step>

-<step><cmd>If you specified a DTD in the <uicontrol>URI</uicontrol> field,

-you can select either <uicontrol>Public ID</uicontrol> or <uicontrol>System

-ID</uicontrol> from the <uicontrol>Key Type</uicontrol> field.</cmd><info>If

-you select <uicontrol>Public ID,</uicontrol> the value you enter in the <uicontrol>Key</uicontrol> field

-should be the same as the Public ID in the XML file's DOCTYPE declaration.

-If you select <uicontrol>System ID</uicontrol>, the value you enter should

-correspond to the System ID in an XML file's DOCTYPE declaration.</info></step>

-<step><cmd>If you specified an XML schema in the <uicontrol>URI</uicontrol> field,

-you can select either <uicontrol>Namespace Name</uicontrol> or  <uicontrol>Schema

-Location</uicontrol> from the <uicontrol>Key Type</uicontrol> field.</cmd>

-<info>If the schema defines a target namespace, it will automatically appear

-in the <uicontrol>Key</uicontrol> field. Otherwise, you can enter the schema

-location in the <uicontrol>Key</uicontrol> field.</info></step>

-<step><cmd>Select the <uicontrol>Specify alternative Web address</uicontrol> check

-box if you want to be able to specify an alternate Web address for the resource.</cmd>

-<info>This Web address is used when an XML instance is generated from this

-catalog entry.  <b>Note</b>: This option is only available if you select <uicontrol>Public

-ID</uicontrol> (for a DTD) or  <uicontrol>Namespace Name</uicontrol> (for

-a schema) in the  <uicontrol>Key type</uicontrol> field.</info></step>

-<step><cmd>If you want to refer to another catalog without importing it into

-the workbench, click <uicontrol>Next Catalog</uicontrol>. Type or browse for

-the XML catalog you want to refer to. </cmd></step>

-<step><cmd>When you are done creating catalog entries, click <uicontrol>OK</uicontrol> to

-close the Add XML Catalog Entry dialog. </cmd></step>

-<step><cmd>Click <uicontrol>Advanced</uicontrol> if you want to import or

-export any XML Catalog settings.</cmd></step>

-<step><cmd>Click  <uicontrol>Export</uicontrol> if you want to persist the

-XML Catalog information. Only your user specified entries will be exported.</cmd>

-<substeps>

-<substep><cmd>You will be prompted to select a project and provide a file

-name to store your catalog entries in an .xmlcatalog file, which can be opened

-from the Navigator view. Snce your catalog entries are stored in an .xmlcatalog

-file, you can check them in and out and share them like any other project

-resource. </cmd></substep>

-<substep><cmd>Click <uicontrol>OK</uicontrol>.</cmd></substep>

-</substeps>

-</step>

-<step><cmd>Click  <uicontrol>Import</uicontrol> if you want to import an .xmlcatalog

-file. You will be prompted to select the file you want to import.</cmd>

-<substeps>

-<substep><cmd>When you import a .xmlcatalog file, any entries in it will be

-loaded into the XML Catalog (and any existing entries will be overwritten). </cmd>

-</substep>

-<substep><cmd>Click <uicontrol>OK</uicontrol>.</cmd></substep>

-</substeps>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to close the Advanced XML Catalog

-Preferences dialog.</cmd></step>

-<step><cmd>Make sure the XML file is in focus and click the <uicontrol>Reload

-dependencies</uicontrol> toolbar button. </cmd></step>

-</steps>

-<result>The XML file is now associated with the latest version of the XML

-schema or DTD.</result>

-</taskbody>

-</task>

-<?Pub *0000007087?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
deleted file mode 100644
index 2d172b4..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding entries to the XML Catalog" />
-<meta name="abstract" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta name="description" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta content="XML catalog, adding entries, importing entries, exporting entries" name="DC.subject" />
-<meta content="XML catalog, adding entries, importing entries, exporting entries" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txmlcat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding entries to the XML Catalog</title>
-</head>
-<body id="txmlcat"><a name="txmlcat"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding entries to the XML Catalog</h1>
-
-
-
-
-<div><p>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains
-information about a DTD or XML schema's location). You can place the Key in
-an XML file. When the XML processor encounters it, it will use the XML Catalog
-entry to find the location of the DTD or XML schema associated with the Key</p>
-
-<div class="section"><p>XML Catalog entries can be used in various situations. For example,
-you are working on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
-a schema called <samp class="codeph">c:\MySchema.xsd</samp>. You then save it to your
-laptop computer so you can work on it later. When you open the file on your
-laptop, however, you encounter a problem - the XML editor cannot find the <samp class="codeph">MySchema.xsd</samp> schema
-because it is actually installed on your D drive. You will have to edit the <samp class="codeph">schemaLocation</samp> to
-point to <samp class="codeph">d:\MySchema.xsd</samp>. When you have finished editing
-the XML file and are ready to publish it on the Web, you will need to edit
-the URI again so that it points to a resource that is accessible on the Web.
-By now, the problem is obvious. A URI used within an XML file is not as portable
-as you would like it to be. To avoid making frequent changes to your XML document,
-you can use the XML Catalog.</p>
-<p>An XML Catalog entry is used by an XML
-processor when resolving entity references. You can provide rules to the catalog
-to specify how entities should be resolved. If you consider the preceding
-example, you could specify a rule that redirects an Internet resource reference
-(for example,  <samp class="codeph">"http://www.ibm.com/published-schemas/MySchema.xsd"</samp>)
-so that it points to a resource on the developer's local machine (for example,
- <samp class="codeph">"file:///C:/MySchema.xsd"</samp>). Now, instead of frequently editing
-XML documents to update the URIs (especially when there are many documents
-in your project), you only need to update a single rule in your XML Catalog.</p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives.</p>
-<p>To add an entry to the XML
-Catalog, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file that you want to associate with a DTD or XML
-schema.</span></li>
-
-<li class="stepexpand"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Catalog</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>The  <span class="uicontrol">XML Catalog Entries</span> field contains
-a list of any user-defined and plug-in defined catalog entries.</span>
-<ol type="a">
-<li><span>Select any entry to see details about it in the <span class="uicontrol">Details</span> field. </span>
-</li>
-
-<li><span>Click <span class="uicontrol">Add</span> to create a new catalog entry.</span>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">URI</span> field, type the location of the
-DTD or XML schema or browse for it.</span></li>
-
-<li class="stepexpand"><span>If you specified a DTD in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span> from the <span class="uicontrol">Key Type</span> field.</span> If
-you select <span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
-should be the same as the Public ID in the XML file's DOCTYPE declaration.
-If you select <span class="uicontrol">System ID</span>, the value you enter should
-correspond to the System ID in an XML file's DOCTYPE declaration.</li>
-
-<li class="stepexpand"><span>If you specified an XML schema in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Namespace Name</span> or  <span class="uicontrol">Schema
-Location</span> from the <span class="uicontrol">Key Type</span> field.</span>
- If the schema defines a target namespace, it will automatically appear
-in the <span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
-location in the <span class="uicontrol">Key</span> field.</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Specify alternative Web address</span> check
-box if you want to be able to specify an alternate Web address for the resource.</span>
- This Web address is used when an XML instance is generated from this
-catalog entry.  <strong>Note</strong>: This option is only available if you select <span class="uicontrol">Public
-ID</span> (for a DTD) or  <span class="uicontrol">Namespace Name</span> (for
-a schema) in the  <span class="uicontrol">Key type</span> field.</li>
-
-<li class="stepexpand"><span>If you want to refer to another catalog without importing it into
-the workbench, click <span class="uicontrol">Next Catalog</span>. Type or browse for
-the XML catalog you want to refer to. </span></li>
-
-<li class="stepexpand"><span>When you are done creating catalog entries, click <span class="uicontrol">OK</span> to
-close the Add XML Catalog Entry dialog. </span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Advanced</span> if you want to import or
-export any XML Catalog settings.</span></li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">Export</span> if you want to persist the
-XML Catalog information. Only your user specified entries will be exported.</span>
-<ol type="a">
-<li><span>You will be prompted to select a project and provide a file
-name to store your catalog entries in an .xmlcatalog file, which can be opened
-from the Navigator view. Snce your catalog entries are stored in an .xmlcatalog
-file, you can check them in and out and share them like any other project
-resource. </span></li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">Import</span> if you want to import an .xmlcatalog
-file. You will be prompted to select the file you want to import.</span>
-<ol type="a">
-<li><span>When you import a .xmlcatalog file, any entries in it will be
-loaded into the XML Catalog (and any existing entries will be overwritten). </span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to close the Advanced XML Catalog
-Preferences dialog.</span></li>
-
-<li class="stepexpand"><span>Make sure the XML file is in focus and click the <span class="uicontrol">Reload
-dependencies</span> toolbar button. </span></li>
-
-</ol>
-
-<div class="section">The XML file is now associated with the latest version of the XML
-schema or DTD.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
deleted file mode 100644
index 1fa7ac5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txprefs" xml:lang="en-us">

-<title>Defining XML editor preferences</title>

-<titlealts>

-<searchtitle>Defining XML editor preferences</searchtitle>

-</titlealts>

-<shortdesc>You can set various preferences for the Source view of the XML

-editor such as the formatter indentation style, line wrapping rules, and content

-assist rules.  To apply the formatting styles, right-click in in the Source

-view for your XML document, and click <menucascade><uicontrol>Format</uicontrol>

-<uicontrol>Document</uicontrol></menucascade>.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>preferences</indexterm></indexterm>

-<indexterm>preferences<indexterm>XML editor</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To define XML preferences, perform the following steps:</p></context>

-<steps>

-<step><cmd>Click  <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML

-Source</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Enter a maximum width for formatted lines in the <uicontrol>Line

-width</uicontrol> field</cmd><info>The default value is 72.</info></step>

-<step><cmd>Select <uicontrol>Split multiple attributes each on a new line</uicontrol> to

-start every attribute on a new line.</cmd></step>

-<step><cmd>If you want blank lines to be removed when the document is formatted,

-select the <uicontrol>Clear all blank lines</uicontrol> check box. </cmd>

-<info>By default, blank lines are preserved in a formatted document.</info>

-</step>

-<step><cmd>Select <uicontrol>Indent using tabs</uicontrol> if you want to

-use tab characters (\t) as the standard formatting indentation, or, if you

-prefer to use spaces, select <uicontrol>Indent using spaces</uicontrol>.</cmd>

-</step>

-<step><cmd>You can also specify the <uicontrol>Indentation size</uicontrol> which

-is the number of tabs or space characters used for formatting indentation.</cmd>

-</step>

-<step><cmd>You can specify certain characters ('&lt;' is default) that will

-cause the content assist list to pop up automatically. Ensure the <uicontrol>Automatically

-make suggestions</uicontrol> check box is selected and specify the characters

-in the <uicontrol>Prompt when these characters are inserted</uicontrol> field. </cmd>

-</step>

-<step><cmd>If you select <b>Strict</b> from the <b>Suggestion strategy</b> list,

-suggestions that are grammatically valid will be shown first (with bold icons)

-in the content assist list. Other suggestions that are applicable to the element

-scope, but not grammatically valid, will be shown below them with a de-emphasized

-icon. The default value for this field is <b>Strict</b>.</cmd></step>

-<step><cmd>The <uicontrol>Use inferred grammar in absence of DTD/Schema</uicontrol> check

-box is selected by default. </cmd><info>If this box is selected, when you

-have an XML file that is not associated with a DTD or XML schema, you will

-still be able to get content assist - the tool will infer what should come

-next in your file based on the existing content.</info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
deleted file mode 100644
index c14d8f9..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining XML editor preferences" />
-<meta name="abstract" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in in the Source view for your XML document, and click Format &gt; Document." />
-<meta name="description" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in in the Source view for your XML document, and click Format &gt; Document." />
-<meta content="XML editor, setting, line wrapping rules, content assist rules, indentation style" name="DC.subject" />
-<meta content="XML editor, setting, line wrapping rules, content assist rules, indentation style" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txprefs" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining XML editor preferences</title>
-</head>
-<body id="txprefs"><a name="txprefs"><!-- --></a>
-
-
-<h1 class="topictitle1">Defining XML editor preferences</h1>
-
-
-
-
-<div><p>You can set various preferences for the Source view of the XML
-editor such as the formatter indentation style, line wrapping rules, and content
-assist rules.  To apply the formatting styles, right-click in in the Source
-view for your XML document, and click <span class="menucascade"><span class="uicontrol">Format</span>
- &gt; <span class="uicontrol">Document</span></span>.</p>
-
-<div class="section"><p>To define XML preferences, perform the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML
-Source</span></span>.</span></li>
-
-<li class="stepexpand"><span>Enter a maximum width for formatted lines in the <span class="uicontrol">Line
-width</span> field</span> The default value is 72.</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Split multiple attributes each on a new line</span> to
-start every attribute on a new line.</span></li>
-
-<li class="stepexpand"><span>If you want blank lines to be removed when the document is formatted,
-select the <span class="uicontrol">Clear all blank lines</span> check box. </span>
- By default, blank lines are preserved in a formatted document.
-</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Indent using tabs</span> if you want to
-use tab characters (\t) as the standard formatting indentation, or, if you
-prefer to use spaces, select <span class="uicontrol">Indent using spaces</span>.</span>
-</li>
-
-<li class="stepexpand"><span>You can also specify the <span class="uicontrol">Indentation size</span> which
-is the number of tabs or space characters used for formatting indentation.</span>
-</li>
-
-<li class="stepexpand"><span>You can specify certain characters ('&lt;' is default) that will
-cause the content assist list to pop up automatically. Ensure the <span class="uicontrol">Automatically
-make suggestions</span> check box is selected and specify the characters
-in the <span class="uicontrol">Prompt when these characters are inserted</span> field. </span>
-</li>
-
-<li class="stepexpand"><span>If you select <strong>Strict</strong> from the <strong>Suggestion strategy</strong> list,
-suggestions that are grammatically valid will be shown first (with bold icons)
-in the content assist list. Other suggestions that are applicable to the element
-scope, but not grammatically valid, will be shown below them with a de-emphasized
-icon. The default value for this field is <strong>Strict</strong>.</span></li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Use inferred grammar in absence of DTD/Schema</span> check
-box is selected by default. </span> If this box is selected, when you
-have an XML file that is not associated with a DTD or XML schema, you will
-still be able to get content assist - the tool will infer what should come
-next in your file based on the existing content.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
deleted file mode 100644
index 15a6bda..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="txsityp" xml:lang="en-us">

-<title>Using xsi:type</title>

-<titlealts>

-<searchtitle>Using xsi:type</searchtitle>

-</titlealts>

-<shortdesc>If you have elements in your XML file whose type is a complex type,

-xsi:type support in the XML editor lets you choose between the complex type

-and any other complex types derived from it.</shortdesc>

-<taskbody>

-<context><p>The XML Schema specification allows you to derive types by extension.

-For example, you have an XML schema and you create a complex type for it called

- <userinput>Address</userinput>. You then add some basic elements to <userinput>Address</userinput>,

-such as <userinput>streetName</userinput> and <userinput>city</userinput>.</p><p>After

-this, you derive (by extension) two new complex types from  <userinput>Address</userinput> - <userinput>USAddress</userinput> and <userinput>UKAddress</userinput

-> You add a new element to <userinput>USAddress</userinput> called  <userinput>state</userinput>,

-and also a new element to <userinput>UKAddress</userinput> called <userinput>postcode</userinput>.</p><p>After

-you have done this, you create two more elements - <userinput>billTo</userinput> and <userinput>shipTo</userinput> -

-as  <systemoutput>Address</systemoutput> types.</p><p>When you create an XML

-instance document for an element such as  <systemoutput>billTo</systemoutput> or

- <userinput>Address</userinput>, an xsi:type attribute will automatically

-be added to it. For example:</p><codeblock>&lt;billTo xsi:type="ipo:Address"></codeblock><p>The

-xsi:type attribute is used to identify derived complex types (as well as complex

-types that have been derived from).</p><p>In the Design view of the XML editor,

-a list will be available, letting you select the appropriate type definition

-(<uicontrol>Address</uicontrol>, <uicontrol>USAddress</uicontrol>, or  <uicontrol>UKAddress</uicontrol>).

-The guided editing for the content model will reflect the type definition

-that you choose. For example, if you select  <uicontrol>USAddress</uicontrol> ,

-your <codeph>billTo</codeph> element can contain a <codeph>state</codeph> element,

-but it cannot contain a <codeph>postcode</codeph> element.</p><p>The XML example

-"Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p><p>For

-more information about xsi:type, refer to the <b>Using Derived Types in Instance

-Documents</b> section in <xref format="html" href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs"

-scope="external">XML Schema Part 0: Primer.</xref></p><p>For more information

-about validation semantics when xsi:type is used, refer to the <b>Schema-Related

-Markup in Documents Being Validated</b> section in  <xref format="html" href="http://www.w3.org/TR/xmlschema-1/#xsi_type"

-scope="external">XML Schema Part 1: Structures</xref> </p></context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
deleted file mode 100644
index 87ed2c6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Using xsi:type" />
-<meta name="abstract" content="If you have elements in your XML file whose type is a complex type, xsi:type support in the XML editor lets you choose between the complex type and any other complex types derived from it." />
-<meta name="description" content="If you have elements in your XML file whose type is a complex type, xsi:type support in the XML editor lets you choose between the complex type and any other complex types derived from it." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txsityp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Using xsi:type</title>
-</head>
-<body id="txsityp"><a name="txsityp"><!-- --></a>
-
-
-<h1 class="topictitle1">Using xsi:type</h1>
-
-
-
-<div><p>If you have elements in your XML file whose type is a complex type,
-xsi:type support in the XML editor lets you choose between the complex type
-and any other complex types derived from it.</p>
-
-<div class="section"><p>The XML Schema specification allows you to derive types by extension.
-For example, you have an XML schema and you create a complex type for it called
- <kbd class="userinput">Address</kbd>. You then add some basic elements to <kbd class="userinput">Address</kbd>,
-such as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>.</p>
-<p>After
-this, you derive (by extension) two new complex types from  <kbd class="userinput">Address</kbd> - <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd> You add a new element to <kbd class="userinput">USAddress</kbd> called  <kbd class="userinput">state</kbd>,
-and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</p>
-<p>After
-you have done this, you create two more elements - <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd> -
-as  <tt class="sysout">Address</tt> types.</p>
-<p>When you create an XML
-instance document for an element such as  <tt class="sysout">billTo</tt> or
- <kbd class="userinput">Address</kbd>, an xsi:type attribute will automatically
-be added to it. For example:</p>
-<pre>&lt;billTo xsi:type="ipo:Address"&gt;</pre>
-<p>The
-xsi:type attribute is used to identify derived complex types (as well as complex
-types that have been derived from).</p>
-<p>In the Design view of the XML editor,
-a list will be available, letting you select the appropriate type definition
-(<span class="uicontrol">Address</span>, <span class="uicontrol">USAddress</span>, or  <span class="uicontrol">UKAddress</span>).
-The guided editing for the content model will reflect the type definition
-that you choose. For example, if you select  <span class="uicontrol">USAddress</span> ,
-your <samp class="codeph">billTo</samp> element can contain a <samp class="codeph">state</samp> element,
-but it cannot contain a <samp class="codeph">postcode</samp> element.</p>
-<p>The XML example
-"Editing and validating XML files" demonstrates <strong>xsi:type</strong> support.</p>
-<p>For
-more information about xsi:type, refer to the <strong>Using Derived Types in Instance
-Documents</strong> section in <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
-<p>For more information
-about validation semantics when xsi:type is used, refer to the <strong>Schema-Related
-Markup in Documents Being Validated</strong> section in  <a href="http://www.w3.org/TR/xmlschema-1/#xsi_type" target="_blank">XML Schema Part 1: Structures</a> </p>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore b/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore
deleted file mode 100644
index 4166228..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.wst.xsdeditor.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.project b/docs/org.eclipse.wst.xsdeditor.doc.user/.project
deleted file mode 100644
index 82170b5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsdeditor.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-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.unsafeTypeOperation=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml
deleted file mode 100644
index b75422b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
-			<property name="args.input" location="XSDLeditorrel.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 2aeb2f5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.wst.xsdeditor.doc.user; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap
deleted file mode 100644
index a13ee00..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

- <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map>

-<topicgroup collection-type="family">

-<topicref href="topics/tcxmlsch.dita" navtitle="Creating XML schemas"></topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" id="xsdconcepts" linking="targetonly"

-navtitle="XML schema editor"></topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/timpschm.dita" navtitle="Importing XML schemas"></topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-<topicref href="topics/taddimpt.dita" linking="targetonly" navtitle="Adding import elements">

-</topicref>

-<topicref href="topics/taddincl.dita" linking="targetonly" navtitle="Adding include elements">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tnavsrc.dita" navtitle="Navigating XML schemas"></topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlsced.dita" linking="normal" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddcmxt.dita" navtitle="Adding complex types"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddglem.dita" navtitle="Adding global elements"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelm.dita" navtitle="Adding elements"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelmr.dita" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddglem.dita" navtitle="Adding global elements"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddgrup.dita" navtitle="Adding groups"></topicref>

-<topicref href="topics/taddgrpr.dita" linking="targetonly" navtitle="Adding group references">

-</topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddgrpr.dita" linking="normal" navtitle="Adding group references">

-</topicref>

-<topicref href="topics/taddgrup.dita" linking="targetonly" navtitle="Adding groups">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddimpt.dita" navtitle="Adding import elements"></topicref>

-<topicref href="topics/taddincl.dita" navtitle="Adding include elements">

-</topicref>

-<topicref href="topics/taddrdfn.dita" navtitle="Adding redefine elements">

-</topicref>

-<topicref href="topics/rnmspc.dita" linking="targetonly" navtitle="XML namespaces">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tvdtschm.dita" navtitle="Validating XML schemas"></topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/rnmspc.dita" navtitle="XML namespaces"></topicref>

-<topicref href="topics/tedtpref.dita" linking="targetonly" navtitle="Editing XML schema file preferences">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddsmpt.dita" navtitle="Adding simple types"></topicref>

-<topicref href="topics/taddreg.dita" navtitle="Adding pattern facets to simple types">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddcmod.dita" navtitle="Adding content models"></topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddelm.dita" linking="targetonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddelmr.dita" linking="targetonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddgrpr.dita" linking="targetonly" navtitle="Adding group references">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tdelscmp.dita" navtitle="Deleting XML schema components">

-</topicref>

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelm.dita" linking="sourceonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddelmr.dita" linking="targetonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddglba.dita" linking="targetonly" navtitle="Adding global attributes">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelmr.dita" linking="sourceonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddelm.dita" linking="targetonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddglba.dita" linking="targetonly" navtitle="Adding global attributes">

-</topicref>

-</topicgroup>

-</map>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml
deleted file mode 100644
index cbac6ff..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc topic="topics/tcxmlsch.html">
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Importing XML schemas" href="topics/timpschm.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<topic label="Navigating XML schemas" href="topics/tnavsrc.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Adding complex types" href="topics/taddcmxt.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<topic label="Adding redefine elements" href="topics/taddrdfn.html"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-<topic label="Editing XML schema file preferences" href="topics/tedtpref.html"/>
-<topic label="Adding simple types" href="topics/taddsmpt.html"/>
-<topic label="Adding pattern facets to simple types" href="topics/taddreg.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Deleting XML schema components" href="topics/tdelscmp.html"/>
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap
deleted file mode 100644
index 834bcf7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map collection-type="sequence" id="wstxsdtoc" title="XML schemas">

-<topicref href="topics/cworkXSD.dita" linking="sourceonly" navtitle="Working with XML schemas (XSDs)">

-<topicref href="topics/tcxmlsch.dita" navtitle="Creating XML schemas"></topicref>

-<topicref href="topics/rlimitations_slushXSD.dita" navtitle="XSD Slush file"

-toc="no"></topicref>

-<topicref href="topics/timpschm.dita" navtitle="Importing an XML schema">

-</topicref>

-<topicref href="topics/tnavsrc.dita" navtitle="Navigating XML schemas"></topicref>

-<topicref href="topics/trefactrXSD.dita" navtitle="Refactoring in XML Schemas">

-</topicref>

-<topicref href="topics/tedtpref.dita" navtitle="Editing XML schema  editor preferences">

-</topicref>

-<topicref href="topics/tedtschm.dita" linking="none" navtitle="Editing XML schema properties">

-<topicref href="topics/cxmlsced.dita" id="xsdconcepts" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/taddagrp.dita" navtitle="Adding an attribute group">

-</topicref>

-<topicref href="topics/taddcmxt.dita" navtitle="Adding a complex type"></topicref>

-<topicref href="topics/taddcmod.dita" navtitle="Adding a content model">

-<topicref href="topics/taddanye.dita" navtitle="Adding an any element"></topicref>

-<topicref href="topics/taddelm.dita" navtitle="Adding an element"></topicref>

-<topicref href="topics/taddelmr.dita" navtitle="Adding an element reference">

-</topicref>

-<topicref href="topics/taddgrpr.dita" navtitle="Adding a group reference">

-</topicref>

-</topicref>

-<topicref href="topics/taddglba.dita" navtitle="Adding a global attribute">

-</topicref>

-<topicref href="topics/taddglem.dita" navtitle="Adding a global element">

-</topicref>

-<topicref href="topics/taddgrup.dita" navtitle="Adding a group"></topicref>

-<topicref href="topics/taddimpt.dita" navtitle="Adding an import element">

-</topicref>

-<topicref href="topics/taddincl.dita" navtitle="Adding an include element">

-</topicref>

-<topicref href="topics/taddrdfn.dita" navtitle="Adding a redefine element">

-</topicref>

-<topicref href="topics/taddsmpt.dita" navtitle="Adding a simple type">

-<topicref href="topics/taddreg.dita" navtitle="Adding a pattern facet to a simple type">

-</topicref>

-</topicref>

-</topicref>

-<topicref href="topics/rxsdicons.dita" id="xsdicons" navtitle="Icons used in the XML schema editor">

-</topicref>

-<topicref href="topics/tdelscmp.dita" navtitle="Deleting XML schema components">

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-</topicref>

-<topicref href="topics/tvdtschm.dita" navtitle="Validating an XML schema">

-</topicref>

-<topicref href="topics/rnmspc.dita" navtitle="XML namespaces"></topicref>

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
deleted file mode 100644
index cc10b1d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="XML schemas" topic="topics/cworkXSD.html">
-<topic label="Working with XML schemas" href="topics/cworkXSD.html">
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Importing XML schemas" href="topics/timpschm.html"/>
-<topic label="Navigating XML schemas" href="topics/tnavsrc.html"/>
-<topic label="Refactoring in XML Schema Files" href="topics/trefactrXSD.html"/>
-<topic label="Editing XML schema file preferences" href="topics/tedtpref.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html">
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Adding attribute groups" href="topics/taddagrp.html"/>
-<topic label="Adding complex types" href="topics/taddcmxt.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html">
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-</topic>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<topic label="Adding redefine elements" href="topics/taddrdfn.html"/>
-<topic label="Adding simple types" href="topics/taddsmpt.html">
-<topic label="Adding pattern facets to simple types" href="topics/taddreg.html"/>
-</topic>
-</topic>
-<topic label="Icons used in the XML schema editor" href="topics/rxsdicons.html"/>
-<topic label="Deleting XML schema components" href="topics/tdelscmp.html">
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-</topic>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html b/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
deleted file mode 100644
index 695623e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = XSDeditormap_toc.xml,\
-               about.html,\
-               org.eclipse.wst.xsdeditor.doc.userindex.xml,\
-               images/,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif
deleted file mode 100644
index 63211bf..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif
deleted file mode 100644
index 63211bf..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
deleted file mode 100644
index da37fba..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
deleted file mode 100644
index a39f93c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
deleted file mode 100644
index 5280cc2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
deleted file mode 100644
index 5a8df73..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
deleted file mode 100644
index b2c1db9..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
deleted file mode 100644
index 8365af2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 8af583f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
deleted file mode 100644
index 878b94f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
deleted file mode 100644
index 749acfc..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
deleted file mode 100644
index 462c2d4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
deleted file mode 100644
index 068987b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
deleted file mode 100644
index 9e44ce5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
deleted file mode 100644
index b26c527..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
deleted file mode 100644
index 56964c1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 16b8612..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
deleted file mode 100644
index 11d7958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
deleted file mode 100644
index a113cf4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
deleted file mode 100644
index 2e74430..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
deleted file mode 100644
index 88fa958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
deleted file mode 100644
index e423242..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
deleted file mode 100644
index de9744f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

-org.eclipse.wst.xsdeditor.doc.user=org.eclipse.wst.xsdeditor.doc.user\n1.0.300.qualifier

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index 93c25b2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
deleted file mode 100644
index 3951dc1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,30 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html=0

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments b/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
deleted file mode 100644
index 19b5d0c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml
deleted file mode 100644
index 0e38d0e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XSDeditormap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.xsdeditor.doc.userindex.xml"/>
-</extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist
deleted file mode 100644
index 626f463..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="XSDeditormap_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="XSDeditormap_toc.ditamap"/>

-    <map file="XSDLeditorrel.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
deleted file mode 100644
index 2f07600..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_52" href="#IDX1_52">R</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>dependent artifacts
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">refactorting XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>preferences
-<ul class="indexlist">
-<li><a href="topics/tedtpref.html#tedtpref">XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
-<ul class="indexlist">
-<li>refactoring
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
-</li>
-</ul>
-</li>
-<li>renaming
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XML namespaces
-<ul class="indexlist">
-<li><a href="topics/rnmspc.html#rnmspc">overview</a>
-</li>
-</ul>
-</li>
-<li>XML schema editor
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
-</li>
-<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
-</li>
-<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
-</li>
-<li><a href="topics/rrefintg.html#rrefintg">clean up in</a>
-</li>
-<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
-</li>
-<li><a href="topics/taddcmod.html#taddcmod">content models</a>
-</li>
-<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
-</li>
-<li><a href="topics/taddelmr.html#taddelmr">element references</a>
-</li>
-<li><a href="topics/taddelm.html#taddelm">elements</a>
-</li>
-<li><a href="topics/taddglba.html#taddglba">global attributes</a>
-</li>
-<li><a href="topics/taddglem.html#taddglem">global elements</a>
-</li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
-</li>
-<li><a href="topics/taddgrup.html#taddgrup">groups</a>
-</li>
-<li><a href="topics/rxsdicons.html#ricons">icons</a>
-</li>
-<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
-</li>
-<li><a href="topics/taddincl.html#taddincl">include elements</a>
-</li>
-<li><a href="topics/cxmlsced.html#cxmlsced">overview</a>
-</li>
-<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
-</li>
-<li><a href="topics/rrefintg.html#rrefintg">referential integrity</a>
-</li>
-<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
-</li>
-<li><a href="topics/tedtschm.html#tedtschm">XML schema properties</a>
-</li>
-</ul>
-</li>
-<li>XML schema files
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
-</li>
-<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
-</li>
-<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
-</li>
-<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
-</li>
-<li><a href="topics/taddcmod.html#taddcmod">content models</a>
-</li>
-<li><a href="topics/tcxmlsch.html#tcxmlsch">creating</a>
-</li>
-<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
-</li>
-<li><a href="topics/tedtpref.html#tedtpref">editing preferences</a>
-</li>
-<li><a href="topics/tedtschm.html#tedtschm">editing properties</a>
-</li>
-<li><a href="topics/taddelmr.html#taddelmr">element references</a>
-</li>
-<li><a href="topics/taddelm.html#taddelm">elements</a>
-</li>
-<li><a href="topics/taddglba.html#taddglba">global attributes</a>
-</li>
-<li><a href="topics/taddglem.html#taddglem">global elements</a>
-</li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
-</li>
-<li><a href="topics/taddgrup.html#taddgrup">groups</a>
-</li>
-<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
-</li>
-<li><a href="topics/timpschm.html#timpschm">importing</a>
-</li>
-<li><a href="topics/taddincl.html#taddincl">include elements</a>
-</li>
-<li><a href="topics/tnavsrc.html#tnavsrc">navigating</a>
-</li>
-<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
-</li>
-<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
-</li>
-<li><a href="topics/tvdtschm.html#tvdtschm">validating</a>
-</li>
-</ul>
-</li>
-<li>XML schemas
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">editing</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
deleted file mode 100644
index f143942..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="XML schema files">
-    <entry keyword="creating">
-      <topic href="topics/tcxmlsch.html#tcxmlsch" title="Creating XML schemas"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/timpschm.html#timpschm" title="Importing XML schemas"/>
-    </entry>
-    <entry keyword="navigating">
-      <topic href="topics/tnavsrc.html#tnavsrc" title="Navigating XML schemas"/>
-    </entry>
-    <entry keyword="editing preferences">
-      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-    </entry>
-    <entry keyword="editing properties">
-      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-    </entry>
-    <entry keyword="attribute groups">
-      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-    </entry>
-    <entry keyword="complex types">
-      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-    </entry>
-    <entry keyword="content models">
-      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-    </entry>
-    <entry keyword="adding an any element">
-      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-    </entry>
-    <entry keyword="elements">
-      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-    </entry>
-    <entry keyword="element references">
-      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-    </entry>
-    <entry keyword="group features">
-      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-    </entry>
-    <entry keyword="global attributes">
-      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-    </entry>
-    <entry keyword="global elements">
-      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-    </entry>
-    <entry keyword="groups">
-      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-    </entry>
-    <entry keyword="import elements">
-      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-    </entry>
-    <entry keyword="include elements">
-      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-    </entry>
-    <entry keyword="adding redefine elements">
-      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-    </entry>
-    <entry keyword="simple types">
-      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-    </entry>
-    <entry keyword="pattern facets">
-      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-    </entry>
-    <entry keyword="deleting components">
-      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-    </entry>
-    <entry keyword="validating">
-      <topic href="topics/tvdtschm.html#tvdtschm" title="Validating XML schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="dependent artifacts">
-    <entry keyword="refactorting XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="refactoring">
-    <entry keyword="XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="renaming">
-    <entry keyword="XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="XML schemas">
-    <entry keyword="editing">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="preferences">
-    <entry keyword="XML schema files">
-      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="XML schema editor">
-    <entry keyword="XML schema properties">
-      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cxmlsced.html#cxmlsced" title="XML schema editor"/>
-    </entry>
-    <entry keyword="attribute groups">
-      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-    </entry>
-    <entry keyword="complex types">
-      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-    </entry>
-    <entry keyword="content models">
-      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-    </entry>
-    <entry keyword="adding an any element">
-      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-    </entry>
-    <entry keyword="elements">
-      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-    </entry>
-    <entry keyword="element references">
-      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-    </entry>
-    <entry keyword="group features">
-      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-    </entry>
-    <entry keyword="global attributes">
-      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-    </entry>
-    <entry keyword="global elements">
-      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-    </entry>
-    <entry keyword="groups">
-      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-    </entry>
-    <entry keyword="import elements">
-      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-    </entry>
-    <entry keyword="include elements">
-      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-    </entry>
-    <entry keyword="adding redefine elements">
-      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-    </entry>
-    <entry keyword="simple types">
-      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-    </entry>
-    <entry keyword="pattern facets">
-      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-    </entry>
-    <entry keyword="icons">
-      <topic href="topics/rxsdicons.html#ricons" title="Icons used in the XML schema editor"/>
-    </entry>
-    <entry keyword="deleting components">
-      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-    </entry>
-    <entry keyword="referential integrity">
-      <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
-    </entry>
-    <entry keyword="clean up in">
-      <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
-    </entry>
-  </entry>
-  <entry keyword="XML namespaces">
-    <entry keyword="overview">
-      <topic href="topics/rnmspc.html#rnmspc" title="XML namespaces"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
deleted file mode 100644
index 4b1a11a1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-Plugin.name = XML schema editor
-
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
deleted file mode 100644
index 0e38d0e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XSDeditormap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.xsdeditor.doc.userindex.xml"/>
-</extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
deleted file mode 100644
index fe80409..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithxmlschemas" xml:lang="en-us">

-<title>Working with XML schemas</title>

-<shortdesc>XML schemas are an XML language for describing and constraining

-the content of XML files.</shortdesc>

-<conbody>

-<p>This sections contains information on the following:</p>

-</conbody>

-<related-links>

-<link href="tcxmlsch.dita"><linktext>Creating XML schemas</linktext></link>

-<link href="timpschm.dita"><linktext>Importing XML schemas</linktext></link>

-<link href="tnavsrc.dita"><linktext>Navigating XML schemas</linktext></link>

-<link href="trefactrXSD.dita"><linktext>Refactoring in XML schemas</linktext>

-</link>

-<link href="tedtpref.dita"><linktext>Editing XML schema file preferences</linktext>

-</link>

-<link href="rxsdicons.dita"><linktext>Icons used in the XML schema editor</linktext>

-</link>

-<link href="tdelscmp.dita"><linktext>Deleting XML schema components</linktext>

-</link>

-<link href="tvdtschm.dita"><linktext>Validating XML schemas</linktext></link>

-<link href="rnmspc.dita"><linktext>XML namespaces</linktext></link>

-</related-links>

-</concept>

-<?Pub *0000001267?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
deleted file mode 100644
index 45f35b6..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML schemas" />
-<meta name="abstract" content="XML schemas are an XML language for describing and constraining the content of XML files." />
-<meta name="description" content="XML schemas are an XML language for describing and constraining the content of XML files." />
-<meta scheme="URI" name="DC.Relation" content="tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="timpschm.html" />
-<meta scheme="URI" name="DC.Relation" content="tnavsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="trefactrXSD.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtpref.html" />
-<meta scheme="URI" name="DC.Relation" content="rxsdicons.html" />
-<meta scheme="URI" name="DC.Relation" content="tdelscmp.html" />
-<meta scheme="URI" name="DC.Relation" content="tvdtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithxmlschemas" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML schemas</title>
-</head>
-<body id="workingwithxmlschemas"><a name="workingwithxmlschemas"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML schemas</h1>
-
-
-<div><p>XML schemas are an XML language for describing and constraining
-the content of XML files.</p>
-
-<p>This sections contains information on the following:</p>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-<div><a href="timpschm.html" title="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema.">Importing XML schemas</a></div>
-<div><a href="tnavsrc.html" title="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to.">Navigating XML schemas</a></div>
-<div><a href="trefactrXSD.html" title="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts.">Refactoring in XML schemas</a></div>
-<div><a href="tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
-<div><a href="tdelscmp.html" title="If you have created any XML schema components you no longer need, you can delete them.">Deleting XML schema components</a></div>
-<div><a href="tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="rxsdicons.html" title="The following XML schema editor icons appear in the Outline, Design, and Properties view.">Icons used in the XML schema editor</a></div>
-<div><a href="rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
deleted file mode 100644
index 9b3ad30..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cxmlsced" xml:lang="en-us">

-<title>XML schema editor</title>

-<titlealts>

-<searchtitle>XML schema editor</searchtitle>

-</titlealts>

-<shortdesc>This product provides an XML schema editor for creating, viewing,

-and validating XML schemas. XML schemas are a formal specification

-of element names that indicates which elements are allowed in an XML file,

-and in which combinations. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>A schema is functionally equivalent to a DTD, but is written in XML; a

-schema also provides for extended functionality such as data typing, inheritance,

-and presentation rules.</p>

-<p>For more information on XML schema, refer to:</p>

-<ul>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-0/" scope="external">http://www.w3.org/TR/xmlschema-0/</xref> </li>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-1/" scope="external">http://www.w3.org/TR/xmlschema-1/</xref> </li>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-2/" scope="external">http://www.w3.org/TR/xmlschema-2/</xref> </li>

-</ul>

-<p>Using the XML schema editor, you can:</p>

-<ul>

-<li>Create and delete XML schema components such as complex types, simple

-types, elements, attributes, attribute groups, and groups.</li>

-<li>Edit XML schemas.</li>

-<li>Import existing XML schemas for structured viewing.</li>

-</ul>

-<p>The XML Schema specification from the W3C Web site is used for validation.</p>

-<section><title>XML schema editor views - Design, Outline, Properties, and

-Source</title>There are four main views you can work with in the XML schema

-editor:<ul>

-<li>Design - the Design view provides a graphical way to edit your schema</li>

-<li>Outline - the Outline view shows you the main components in your XML schema.

-You can use this view to add and remove certain components.</li>

-<li>Properties - the Properties view enables you to edit the properties of

-your XML schema components</li>

-<li>Source - the Source view enables you to edit your source code directly</li>

-</ul></section>

-<section><title>Status of the XML schema</title><p></p><p>Three status indicators

-for the schema are available. They are in the bottom right corner:</p><ul>

-<li> <uicontrol>Writable</uicontrol> or <uicontrol>Read Only</uicontrol>. </li>

-<li> (Source view only) <uicontrol>Smart Insert</uicontrol> or <uicontrol>Overwrite</uicontrol>.

-To toggle between these modes, press the <uicontrol>Insert</uicontrol> button

-on your keyboard.</li>

-<li> <uicontrol>Line</uicontrol> and <uicontrol>column</uicontrol> number. </li>

-</ul></section>

-</conbody>

-</concept>

-<?Pub *0000002883?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
deleted file mode 100644
index 869ad39..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML schema editor" />
-<meta name="abstract" content="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta name="description" content="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta content="XML schema editor, overview" name="DC.subject" />
-<meta content="XML schema editor, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlsced" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML schema editor</title>
-</head>
-<body id="cxmlsced"><a name="cxmlsced"><!-- --></a>
-
-
-<h1 class="topictitle1">XML schema editor</h1>
-
-
-
-
-<div><p>This product provides an XML schema editor for creating, viewing,
-and validating XML schemas. XML schemas are a formal specification
-of element names that indicates which elements are allowed in an XML file,
-and in which combinations. </p>
-
-<p>A schema is functionally equivalent to a DTD, but is written in XML; a
-schema also provides for extended functionality such as data typing, inheritance,
-and presentation rules.</p>
-
-<p>For more information on XML schema, refer to:</p>
-
-<ul>
-<li> <a href="http://www.w3.org/TR/xmlschema-0/" target="_blank">http://www.w3.org/TR/xmlschema-0/</a> </li>
-
-<li> <a href="http://www.w3.org/TR/xmlschema-1/" target="_blank">http://www.w3.org/TR/xmlschema-1/</a> </li>
-
-<li> <a href="http://www.w3.org/TR/xmlschema-2/" target="_blank">http://www.w3.org/TR/xmlschema-2/</a> </li>
-
-</ul>
-
-<p>Using the XML schema editor, you can:</p>
-
-<ul>
-<li>Create and delete XML schema components such as complex types, simple
-types, elements, attributes, attribute groups, and groups.</li>
-
-<li>Edit XML schemas.</li>
-
-<li>Import existing XML schemas for structured viewing.</li>
-
-</ul>
-
-<p>The XML Schema specification from the W3C Web site is used for validation.</p>
-
-<div class="section"><h4 class="sectiontitle">XML schema editor views - Design, Outline, Properties, and
-Source</h4>There are four main views you can work with in the XML schema
-editor:<ul>
-<li>Design - the Design view provides a graphical way to edit your schema</li>
-
-<li>Outline - the Outline view shows you the main components in your XML schema.
-You can use this view to add and remove certain components.</li>
-
-<li>Properties - the Properties view enables you to edit the properties of
-your XML schema components</li>
-
-<li>Source - the Source view enables you to edit your source code directly</li>
-
-</ul>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Status of the XML schema</h4><p />
-<p>Three status indicators
-for the schema are available. They are in the bottom right corner:</p>
-<ul>
-<li> <span class="uicontrol">Writable</span> or <span class="uicontrol">Read Only</span>. </li>
-
-<li> (Source view only) <span class="uicontrol">Smart Insert</span> or <span class="uicontrol">Overwrite</span>.
-To toggle between these modes, press the <span class="uicontrol">Insert</span> button
-on your keyboard.</li>
-
-<li> <span class="uicontrol">Line</span> and <span class="uicontrol">column</span> number. </li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita
deleted file mode 100644
index e50260d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rlimitations_slushXSD" xml:lang="en-us">

-<title>Limitations of XML schema editor</title>

-<titlealts>

-<searchtitle>Limitations of XML schema editor</searchtitle>

-</titlealts>

-<shortdesc>This section describes known product aspect limitations and workarounds.</shortdesc>

-<refbody>

-<!--Use this template to single source the readme information.  The content for the readme information is maintained in this topic and is inserted into the related topic using the conref attribute. This file will not be surfaced in your navigation.-->

-<section><title>Hebrew Logical encoding</title><p id="encoding"><!--There is no defect associated with this entry. It is from the 5.1 readme.-->When

-Hebrew Logical (ISO-8859-8-I) encoding is selected as a preference for encoding

-of HTML files (<menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML Files</uicontrol><uicontrol>HTML files</uicontrol>

-</menucascade> in the "When creating files" section), the HTML documentation

-files generated from an XML schema file will still have a UTF-8 encoding.

-This is a known problem.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
deleted file mode 100644
index 1a5cc54..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of XML schema editor" />
-<meta name="abstract" content="This section describes known product aspect limitations and workarounds." />
-<meta name="description" content="This section describes known product aspect limitations and workarounds." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rlimitations_slushXSD" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of XML schema editor</title>
-</head>
-<body id="rlimitations_slushXSD"><a name="rlimitations_slushXSD"><!-- --></a>
-
-
-<h1 class="topictitle1">Limitations of XML schema editor</h1>
-
-
-
-<div><p>This section describes known product aspect limitations and workarounds.</p>
-
-
-<div class="section"><h4 class="sectiontitle">Hebrew Logical encoding</h4><p id="rlimitations_slushXSD__encoding"><a name="rlimitations_slushXSD__encoding"><!-- --></a>When
-Hebrew Logical (ISO-8859-8-I) encoding is selected as a preference for encoding
-of HTML files (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML Files</span> &gt; <span class="uicontrol">HTML files</span>
-</span> in the "When creating files" section), the HTML documentation
-files generated from an XML schema file will still have a UTF-8 encoding.
-This is a known problem.</p>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
deleted file mode 100644
index 0237e98..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rnmspc" xml:lang="en-us">

-<title>XML namespaces</title>

-<titlealts>

-<searchtitle>XML namespaces</searchtitle>

-</titlealts>

-<shortdesc>An XML namespace is a collection of names, identified by a URI

-reference, which are used in XML documents as element types and attribute

-names.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML namespaces<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section>XML namespaces are defined by a W3C recommendation, dating 14 January

-1999, called <xref format="html" href="http://www.w3.org/TR/REC-xml-names/"

-scope="external">Namespaces in XML</xref>. XML tag names should be globally

-unique, as well as short for performance reasons. In order to resolve this

-conflict, the W3C namespace recommendation defines an attribute <b>xmlns</b> which

-can amend any XML element. If it is present in an element, it identifies the

-namespace for this element.</section>

-<section><p>The xmlns attribute has the following syntax:</p><p><codeph>xmlns:<varname>prefix</varname>=namespace</codeph> </p><p>where <codeph>namespace</codeph

-> is a unique URI (such as www.ibm.com) and where <codeph><varname>prefix</varname></codeph> represents

-the namespace and provides a pointer to it.</p><p>In the following customer

-element definition, an accounting namespace is defined in order to be able

-to distinguish the element tags from those appearing in customer records created

-by other business applications:</p><p><codeblock>&lt;acct:customer xmlns:acct="http://www.my.com/acct-REV10">

-	&lt;acct:name>Corporation&lt;/acct:name>

-	&lt;acct:order acct:ref="5566"/>

-	&lt;acct:status>invoice&lt;/acct:status>

-&lt;/acct:customer>  </codeblock> </p><p>The <i>namespace definition</i> in

-the first line assigns the namespace <i>http://www.my.com/acct-REV10</i> to

-the prefix. This prefix is used on the element names such as name in order

-to attach them to the namespace. A second application, for example, a fulfillment

-system, can assign a different namespace to its customer elements:</p><p><codeblock>&lt;ful:customer xmlns:ful="http://www.your.com/ful">

-	&lt;ful:name>Corporation&lt;/ful:name>

-	&lt;ful:order ful:ref="A98756"/>

-	&lt;ful:status>shipped&lt;/ful:status>

- &lt;/ful:customer></codeblock> </p><p>An application processing both data

-structures is now able to treat the accounting and the fulfillment data differently.

-There is a default namespace. It is set if no local name is assigned in the

-namespace definition:</p><p><codeblock>&lt;acct:customer xmlns="http://www.my.com/acct-REV10" xmlns:acct="http://www.my.com/acct-REV10 ">

-&lt;name>Corporation&lt;/name>

-&lt;order acct:ref="5566"/>

-&lt;status>invoice&lt;/status>

-&lt;/customer></codeblock></p><p>In this example, all tags in the customer

-record are qualified to reside in the namespace <i>http://www.my.com/acct-REV10.</i> No

-explicit prefix is needed because the default namespace is used. Note that

-the default namespace applies to any attributes definitions.</p></section>

-<section><title>XML schemas and namespaces</title><p>In the following XML

-schema, the default namespace for the schema is defined as the standard XML

-schema namespace <i>http://www.w3.org/2001/XMLSchem</i>a; there is also a

-schema specific namespace <i>http://www.ibm.com</i>.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com">

- &lt;simpleType name="ZipCodeType">

- &lt;restriction base="integer">

-  &lt;minInclusive value="10000"/>

- &lt;maxInclusive value="99999"/>

-&lt;/restriction>

- &lt;/simpleType> 

- &lt;!--element definitions skipped -->  

-&lt;/schema>  </codeblock></p><p>Assuming that the preceding XML schema is

-saved as <filepath>C:\temp\TestSchema.xsd</filepath>, a sample XML file that

-validates against this schema is:</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;x:addressList xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd">

- xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd">

-&lt;x:address>

- &lt;x:street>x:Vangerowstrasse&lt;/x:street>

-  &lt;x:zipCode>69115&lt;/x:zipCode>

- &lt;x:city>x:Heidelberg&lt;/x:city>

- &lt;/x:address>

-    &lt;x:address> 

-&lt;x:street>x:Bernal Road&lt;/x:street> 

-&lt;x:zipCode>90375&lt;/x:zipCode>

-     &lt;x:city>x:San Jose&lt;/x:city>

- &lt;/x:address>

-&lt;/x:addressList> </codeblock></p></section>

-<section><title>Target namespace</title><p> The target namespace serves to

-identify the namespace within which the association between the element and

-its name exists. In the case of declarations, this association determines

-the namespace of the elements in XML files conforming to the schema. An XML

-file importing a schema must reference its target namespace in the schemaLocation

-attribute. Any mismatches between the target and the actual namespace of an

-element are reported as schema validation errors. In our example, the target

-namespace is http://www.ibm.com; it is defined in the  XML schema file and

-referenced twice in the XML file. Any mismatch between these three occurrences

-of the namespace lead to validation errors.</p><p> The following examples

-show how target namespaces and namespace prefixes work in XML schemas and

-their corresponding XML instance documents.</p></section>

-<section><title>Sample 1 - A schema with both a default and target namespace

-and unqualified locals</title><p>The XML schema:  </p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com">

-&lt;complexType name="AddressType">

-&lt;sequence>

-&lt;element name="name" type="string">&lt;/element>

-&lt;/sequence>

-&lt;/complexType>

-&lt;element name="MyAddress" type="x:AddressType">&lt;/element>

-&lt;/schema> </codeblock> </p><p>A valid XML instance document created from

-this schema looks like this. Local elements and attributes are <i>unqualified</i>.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd ">

-&lt;name>Peter Smith&lt;/name>

-&lt;/x:MyAddress> </codeblock></p><p>When local elements (such as the <i>"name"</i> element)

-and attributes are unqualified in an XML file, then only the root element

-is qualified. So, in this example, the <i>"x"</i> namespace prefix is assigned

-to the root element <i>"MyAddress"</i>, associating it with the namespace <i>"http://www.ibm.com",</i> but

-the<i>"x"</i> prefix is not assigned to the local element <i>"name"</i>.</p></section>

-<section><title>Sample 2 - A schema with both a default and target namespace

-and qualified locals</title><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified">

-&lt;complexType name="AddressType">

-&lt;sequence>

-&lt;element name="name" type="string">&lt;/element>

-&lt;/sequence>

-&lt;/complexType>

-&lt;element name="MyAddress" type="x:AddressType">&lt;/element>

- &lt;/schema>  </codeblock></p><p>A valid XML instance document created from

-this schema looks like this. Local elements and attributes are <i>qualified</i> This

-is because the elementFormDefault attribute is set to qualified in the XML

-schema.</p><p><codeblock>&lt;?xml version="1.0"?>

-  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

- xsi:schemaLocation="http://www.ibm.com x.xsd "> 

-&lt;x:name>Peter Smith&lt;/x:name>

- &lt;/x:MyAddress></codeblock> </p><p>In this example, the <i>"x"</i> namespace

-prefix is assigned to both the root element <i>"MyAddress"</i> and the local

-element <i>"name"</i>, associating them with the namespace <i>"http://www.ibm.com",</i>.</p></section>

-<section><title>Sample 3 - Schema with target Namespace, and explicitly defines

-xmlns:xsd</title><p>This XML schema adds this attribute:  </p><codeph>xmlns:xsd="http://www.w3.org/2001/XMLSchema </codeph><p>What

-this means is that each of the constructs that are defined by the XML schema

-language will need to be qualified with the <varname>"xsd"</varname> prefix.

-For example, xsd:complexType and  xsd:string</p><p>. Note that you can chose

-any other prefixes such as <varname>"xs"</varname> or <varname>"foobar"</varname> in

-your declaration and usage.</p><p>You can specify this prefix in the XML schema

-preferences page. For more information, refer to the related tasks.</p><p>All

-user defined types belong to the namespace  http://www.ibm.com as defined

-by the targetNamespace attribute, and the prefix is <i>"x"</i> as defined

-by the xmlns:x attribute.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-		 &lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;/xsd:sequence>

- &lt;/xsd:complexType>

- &lt;xsd:element name="MyAddress" type="x:AddressType">&lt;/xsd:element>

-&lt;/xsd:schema></codeblock> </p><p>A valid XML instance document created

-from this schema looks like this. Local elements and attributes are <i>unqualified</i>.

-The semantics of qualification is the same as Sample 1.</p><p><codeblock>&lt;?xml version="1.0"?>

- &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd ">

-&lt;name>Peter Smith&lt;/name>

- &lt;/x:MyAddress></codeblock></p></section>

-<section><title>Sample 4 - Schema with undeclared target Namespace that explicitly

-defines xmlns:xsd</title><p>This XML schema has no target namespace for itself.

-In this case, it is highly recommended that all XML schema constructs be explicitly

-qualified with a prefix such as <i>"xsd"</i>. The definitions and declarations

-from this schema such as <i>AddressType</i> are referenced without namespace

-qualification since there is no namespace prefix.  </p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element> 

-&lt;/xsd:sequence> 

-&lt;/xsd:complexType>

-&lt;xsd:element name="MyAddress" type="AddressType">&lt;/xsd:element> 

-&lt;/xsd:schema> </codeblock></p><p>A valid XML instance document created

-from the schema looks like this. All elements are <i>unqualified</i>.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd">

-&lt;name>name&lt;/name>

-&lt;/MyAddress></codeblock>  </p></section>

-<section><title>Sample 5 - A schema where the target namespace is the default

-namespace</title><p>This is an XML schema where the target namespace is the

-default namespace. As well, the namespace has no namespace prefix.</p><p><codeblock>&lt;?xml version="1.0"?>

- &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns="http://www.ibm.com">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;/xsd:sequence>

-&lt;/xsd:complexType>

- &lt;xsd:element name="MyAddress" type="AddressType">&lt;/xsd:element>

- &lt;/xsd:schema> </codeblock> </p><p>A valid XML instance document created

-from the schema looks like this:</p><p><codeblock>&lt;?xml version="1.0" encoding="UTF-8"?>

-&lt;MyAddress xmlns="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com NewXMLSchema.xsd">

-&lt;name>name&lt;/name>

- &lt;/MyAddress>  </codeblock> </p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
deleted file mode 100644
index f4a0b4f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="XML namespaces" />
-<meta name="abstract" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
-<meta name="description" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
-<meta content="XML namespaces, overview" name="DC.subject" />
-<meta content="XML namespaces, overview" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rnmspc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML namespaces</title>
-</head>
-<body id="rnmspc"><a name="rnmspc"><!-- --></a>
-
-
-<h1 class="topictitle1">XML namespaces</h1>
-
-
-
-
-<div><p>An XML namespace is a collection of names, identified by a URI
-reference, which are used in XML documents as element types and attribute
-names.</p>
-
-<div class="section">XML namespaces are defined by a W3C recommendation, dating 14 January
-1999, called <a href="http://www.w3.org/TR/REC-xml-names/" target="_blank">Namespaces in XML</a>. XML tag names should be globally
-unique, as well as short for performance reasons. In order to resolve this
-conflict, the W3C namespace recommendation defines an attribute <strong>xmlns</strong> which
-can amend any XML element. If it is present in an element, it identifies the
-namespace for this element.</div>
-
-<div class="section"><p>The xmlns attribute has the following syntax:</p>
-<p><samp class="codeph">xmlns:<var class="varname">prefix</var>=namespace</samp> </p>
-<p>where <samp class="codeph">namespace</samp> is a unique URI (such as www.ibm.com) and where <samp class="codeph"><var class="varname">prefix</var></samp> represents
-the namespace and provides a pointer to it.</p>
-<p>In the following customer
-element definition, an accounting namespace is defined in order to be able
-to distinguish the element tags from those appearing in customer records created
-by other business applications:</p>
-<div class="p"><pre>&lt;acct:customer xmlns:acct="http://www.my.com/acct-REV10"&gt;
-	&lt;acct:name&gt;Corporation&lt;/acct:name&gt;
-	&lt;acct:order acct:ref="5566"/&gt;
-	&lt;acct:status&gt;invoice&lt;/acct:status&gt;
-&lt;/acct:customer&gt;  </pre>
- </div>
-<p>The <em>namespace definition</em> in
-the first line assigns the namespace <em>http://www.my.com/acct-REV10</em> to
-the prefix. This prefix is used on the element names such as name in order
-to attach them to the namespace. A second application, for example, a fulfillment
-system, can assign a different namespace to its customer elements:</p>
-<div class="p"><pre>&lt;ful:customer xmlns:ful="http://www.your.com/ful"&gt;
-	&lt;ful:name&gt;Corporation&lt;/ful:name&gt;
-	&lt;ful:order ful:ref="A98756"/&gt;
-	&lt;ful:status&gt;shipped&lt;/ful:status&gt;
- &lt;/ful:customer&gt;</pre>
- </div>
-<p>An application processing both data
-structures is now able to treat the accounting and the fulfillment data differently.
-There is a default namespace. It is set if no local name is assigned in the
-namespace definition:</p>
-<div class="p"><pre>&lt;acct:customer xmlns="http://www.my.com/acct-REV10" xmlns:acct="http://www.my.com/acct-REV10 "&gt;
-&lt;name&gt;Corporation&lt;/name&gt;
-&lt;order acct:ref="5566"/&gt;
-&lt;status&gt;invoice&lt;/status&gt;
-&lt;/customer&gt;</pre>
-</div>
-<p>In this example, all tags in the customer
-record are qualified to reside in the namespace <em>http://www.my.com/acct-REV10.</em> No
-explicit prefix is needed because the default namespace is used. Note that
-the default namespace applies to any attributes definitions.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">XML schemas and namespaces</h4><p>In the following XML
-schema, the default namespace for the schema is defined as the standard XML
-schema namespace <em>http://www.w3.org/2001/XMLSchem</em>a; there is also a
-schema specific namespace <em>http://www.ibm.com</em>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com"&gt;
- &lt;simpleType name="ZipCodeType"&gt;
- &lt;restriction base="integer"&gt;
-  &lt;minInclusive value="10000"/&gt;
- &lt;maxInclusive value="99999"/&gt;
-&lt;/restriction&gt;
- &lt;/simpleType&gt; 
- &lt;!--element definitions skipped --&gt;  
-&lt;/schema&gt;  </pre>
-</div>
-<p>Assuming that the preceding XML schema is
-saved as <span class="filepath">C:\temp\TestSchema.xsd</span>, a sample XML file that
-validates against this schema is:</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:addressList xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
- xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
-&lt;x:address&gt;
- &lt;x:street&gt;x:Vangerowstrasse&lt;/x:street&gt;
-  &lt;x:zipCode&gt;69115&lt;/x:zipCode&gt;
- &lt;x:city&gt;x:Heidelberg&lt;/x:city&gt;
- &lt;/x:address&gt;
-    &lt;x:address&gt; 
-&lt;x:street&gt;x:Bernal Road&lt;/x:street&gt; 
-&lt;x:zipCode&gt;90375&lt;/x:zipCode&gt;
-     &lt;x:city&gt;x:San Jose&lt;/x:city&gt;
- &lt;/x:address&gt;
-&lt;/x:addressList&gt; </pre>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Target namespace</h4><p> The target namespace serves to
-identify the namespace within which the association between the element and
-its name exists. In the case of declarations, this association determines
-the namespace of the elements in XML files conforming to the schema. An XML
-file importing a schema must reference its target namespace in the schemaLocation
-attribute. Any mismatches between the target and the actual namespace of an
-element are reported as schema validation errors. In our example, the target
-namespace is http://www.ibm.com; it is defined in the  XML schema file and
-referenced twice in the XML file. Any mismatch between these three occurrences
-of the namespace lead to validation errors.</p>
-<p> The following examples
-show how target namespaces and namespace prefixes work in XML schemas and
-their corresponding XML instance documents.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 1 - A schema with both a default and target namespace
-and unqualified locals</h4><p>The XML schema:  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
-&lt;/schema&gt; </pre>
- </div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <em>unqualified</em>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
-&lt;/x:MyAddress&gt; </pre>
-</div>
-<p>When local elements (such as the <em>"name"</em> element)
-and attributes are unqualified in an XML file, then only the root element
-is qualified. So, in this example, the <em>"x"</em> namespace prefix is assigned
-to the root element <em>"MyAddress"</em>, associating it with the namespace <em>"http://www.ibm.com",</em> but
-the<em>"x"</em> prefix is not assigned to the local element <em>"name"</em>.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 2 - A schema with both a default and target namespace
-and qualified locals</h4><div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
- &lt;/schema&gt;  </pre>
-</div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <em>qualified</em> This
-is because the elementFormDefault attribute is set to qualified in the XML
-schema.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.ibm.com x.xsd "&gt; 
-&lt;x:name&gt;Peter Smith&lt;/x:name&gt;
- &lt;/x:MyAddress&gt;</pre>
- </div>
-<p>In this example, the <em>"x"</em> namespace
-prefix is assigned to both the root element <em>"MyAddress"</em> and the local
-element <em>"name"</em>, associating them with the namespace <em>"http://www.ibm.com",</em>.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 3 - Schema with target Namespace, and explicitly defines
-xmlns:xsd</h4><p>This XML schema adds this attribute:  </p>
-<samp class="codeph">xmlns:xsd="http://www.w3.org/2001/XMLSchema </samp><p>What
-this means is that each of the constructs that are defined by the XML schema
-language will need to be qualified with the <var class="varname">"xsd"</var> prefix.
-For example, xsd:complexType and  xsd:string</p>
-<p>. Note that you can chose
-any other prefixes such as <var class="varname">"xs"</var> or <var class="varname">"foobar"</var> in
-your declaration and usage.</p>
-<p>You can specify this prefix in the XML schema
-preferences page. For more information, refer to the related tasks.</p>
-<p>All
-user defined types belong to the namespace  http://www.ibm.com as defined
-by the targetNamespace attribute, and the prefix is <em>"x"</em> as defined
-by the xmlns:x attribute.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-		 &lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
- &lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="x:AddressType"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:schema&gt;</pre>
- </div>
-<p>A valid XML instance document created
-from this schema looks like this. Local elements and attributes are <em>unqualified</em>.
-The semantics of qualification is the same as Sample 1.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
- &lt;/x:MyAddress&gt;</pre>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 4 - Schema with undeclared target Namespace that explicitly
-defines xmlns:xsd</h4><p>This XML schema has no target namespace for itself.
-In this case, it is highly recommended that all XML schema constructs be explicitly
-qualified with a prefix such as <em>"xsd"</em>. The definitions and declarations
-from this schema such as <em>AddressType</em> are referenced without namespace
-qualification since there is no namespace prefix.  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:sequence&gt; 
-&lt;/xsd:complexType&gt;
-&lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:schema&gt; </pre>
-</div>
-<p>A valid XML instance document created
-from the schema looks like this. All elements are <em>unqualified</em>.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
-&lt;/MyAddress&gt;</pre>
-  </div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 5 - A schema where the target namespace is the default
-namespace</h4><p>This is an XML schema where the target namespace is the
-default namespace. As well, the namespace has no namespace prefix.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
-&lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt;
- &lt;/xsd:schema&gt; </pre>
- </div>
-<p>A valid XML instance document created
-from the schema looks like this:</p>
-<div class="p"><pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;MyAddress xmlns="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com NewXMLSchema.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
- &lt;/MyAddress&gt;  </pre>
- </div>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
deleted file mode 100644
index 97d9893..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rrefintg" xml:lang="en-us">

-<title>Referential integrity in the XML schema editor</title>

-<titlealts>

-<searchtitle>Referential integrity</searchtitle>

-</titlealts>

-<shortdesc>The XML schema editor has a built-in mechanism to handle referential

-integrity issues. When you delete certain nodes, clean up for any nodes affected

-will automatically occur.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>referential integrity</indexterm></indexterm>

-<indexterm>XML schema editor<indexterm>clean up in</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section>When you define a complex type, you can add a content model to it

-and reference a global element. <p>For example:<codeblock>&lt;schema>

- &lt;element name="comment" type="string">

-	&lt;complexType name="Items">

-		&lt;sequence>

-				&lt;element ref="comment">

-		 &lt;/sequence>

-	 &lt;/complexType>

-&lt;/schema></codeblock></p><p>If the global element (comment) was deleted,

-all references to it would be in error. However, when you delete the global

-element, the XML schema editor will clean up using the following algorithm:</p><ul>

-<li>If there are one or more global elements in the schema, it will change

-all existing references to the first global element.</li>

-<li>If there is no global element, then it will delete the element reference

-from the content model.</li>

-</ul></section>

-<section><title>Deleting included and imported schema</title><p>If an included

-or imported schema is deleted, you must manually reset the following type

-references as appropriate: <ul>

-<li>Global element and element's type</li>

-<li>Attribute type</li>

-<li>Complex type derivation</li>

-<li>Simple type derivation </li>

-</ul>They will not automatically be reset if an included or imported schema

-is deleted.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
deleted file mode 100644
index e319a3b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Referential integrity in the XML schema editor" />
-<meta name="abstract" content="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur." />
-<meta name="description" content="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur." />
-<meta content="XML schema editor, referential integrity, clean up in" name="DC.subject" />
-<meta content="XML schema editor, referential integrity, clean up in" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdelscmp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rrefintg" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Referential integrity</title>
-</head>
-<body id="rrefintg"><a name="rrefintg"><!-- --></a>
-
-
-<h1 class="topictitle1">Referential integrity in the XML schema editor</h1>
-
-
-
-
-<div><p>The XML schema editor has a built-in mechanism to handle referential
-integrity issues. When you delete certain nodes, clean up for any nodes affected
-will automatically occur.</p>
-
-<div class="section">When you define a complex type, you can add a content model to it
-and reference a global element. <div class="p">For example:<pre>&lt;schema&gt;
- &lt;element name="comment" type="string"&gt;
-	&lt;complexType name="Items"&gt;
-		&lt;sequence&gt;
-				&lt;element ref="comment"&gt;
-		 &lt;/sequence&gt;
-	 &lt;/complexType&gt;
-&lt;/schema&gt;</pre>
-</div>
-<p>If the global element (comment) was deleted,
-all references to it would be in error. However, when you delete the global
-element, the XML schema editor will clean up using the following algorithm:</p>
-<ul>
-<li>If there are one or more global elements in the schema, it will change
-all existing references to the first global element.</li>
-
-<li>If there is no global element, then it will delete the element reference
-from the content model.</li>
-
-</ul>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Deleting included and imported schema</h4><div class="p">If an included
-or imported schema is deleted, you must manually reset the following type
-references as appropriate: <ul>
-<li>Global element and element's type</li>
-
-<li>Attribute type</li>
-
-<li>Complex type derivation</li>
-
-<li>Simple type derivation </li>
-
-</ul>
-They will not automatically be reset if an included or imported schema
-is deleted.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tdelscmp.html" title="If you have created any XML schema components you no longer need, you can delete them.">Deleting XML schema components</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
deleted file mode 100644
index 93dea39..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the XML schema editor</title>

-<titlealts>

-<searchtitle>XML schema editor icons</searchtitle>

-</titlealts>

-<shortdesc>The following XML schema editor icons appear in the Outline, Design,

-and Properties view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>icons</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section></section>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<tbody>

-<row>

-<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry>

-<entry colname="COLSPEC1" valign="bottom"><b>Description</b></entry>

-</row>

-<row>

-<entry><image href="../images/XSDAnyAttribute.gif"><alt>This graphic is the

-any attribute icon </alt></image></entry>

-<entry><codeph>any</codeph> attribute</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAny.gif"><alt>This graphic is the any element

-icon </alt></image></entry>

-<entry><codeph>any</codeph> element</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttribute.gif"><alt>This graphic is the attribute

-icon </alt></image></entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeGroup.gif"><alt>This graphic is

-the attribute group icon </alt></image></entry>

-<entry>attribute group</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeGroupRef.gif"><alt>This graphic

-is the attribute group reference icon </alt></image></entry>

-<entry>attribute group reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeRef.gif"><alt>This graphic is the

-attribute reference icon </alt></image></entry>

-<entry>attribute reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAll.gif"><alt>This graphic is the content

-model - all icon </alt></image></entry>

-<entry>content model - all</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/XSDChoice.gif"><alt>This

-graphic is the content model - choice icon </alt></image></entry>

-<entry colname="COLSPEC1">content model - choice</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/XSDSequence.gif"><alt>This

-graphic is the content model - sequence icon </alt></image></entry>

-<entry colname="COLSPEC1">content model - sequence</entry>

-</row>

-<row>

-<entry><image href="../images/XSDComplexType.gif"><alt>This graphic is the

-any element icon </alt></image></entry>

-<entry>complex type</entry>

-</row>

-<row>

-<entry><image href="../images/XSDElement.gif"><alt>This graphic is the element

-icon </alt></image></entry>

-<entry>element</entry>

-</row>

-<row>

-<entry><image href="../images/XSDElementRef.gif"><alt>This graphic is the

-element reference icon </alt></image></entry>

-<entry>element reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimpleEnum.gif"><alt>This graphic is the

-enumeration icon </alt></image></entry>

-<entry>enumeration</entry>

-</row>

-<row>

-<entry><image href="../images/XSDGlobalAttribute.gif"><alt>This graphic is

-the global attribute icon </alt></image></entry>

-<entry>global attribute</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDGlobalElement.gif"><alt>This graphic is

-the global element icon </alt></image></entry>

-<entry>global element</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDGroup.gif"><alt>This graphic is the group

-icon </alt></image></entry>

-<entry>group</entry>

-</row>

-<row>

-<entry><image href="../images/XSDGroupRef.gif"><alt>This graphic is the group

-reference icon </alt></image></entry>

-<entry>group reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDImport.gif"><alt>This graphic is the import

-icon </alt></image></entry>

-<entry>import</entry>

-</row>

-<row>

-<entry><image href="../images/XSDInclude.gif"><alt>This graphic is the include

-icon </alt></image></entry>

-<entry>include</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimplePattern.gif"><alt>This graphic is the

-pattern icon </alt></image></entry>

-<entry>pattern</entry>

-</row>

-<row>

-<entry><image href="../images/XSDRedefine.gif"><alt>This graphic is the redefine

-icon </alt></image></entry>

-<entry>redefine</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimpleType.gif"><alt>This graphic is the

-simple type icon </alt></image></entry>

-<entry>simple type</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

-<?Pub *0000004581?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
deleted file mode 100644
index 92f68a6..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the XML schema editor" />
-<meta name="abstract" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
-<meta name="description" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
-<meta content="XML schema editor, icons, Icons" name="DC.subject" />
-<meta content="XML schema editor, icons, Icons" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML schema editor icons</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the XML schema editor</h1>
-
-
-
-
-<div><p>The following XML schema editor icons appear in the Outline, Design,
-and Properties view.</p>
-
-<div class="section" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<tbody>
-<tr>
-<td valign="bottom"><strong>Icon</strong></td>
-
-<td valign="bottom"><strong>Description</strong></td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAnyAttribute.gif" alt="This graphic is the&#10;any attribute icon " /></td>
-
-<td valign="top"><samp class="codeph">any</samp> attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAny.gif" alt="This graphic is the any element&#10;icon " /></td>
-
-<td valign="top"><samp class="codeph">any</samp> element</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttribute.gif" alt="This graphic is the attribute&#10;icon " /></td>
-
-<td valign="top">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeGroup.gif" alt="This graphic is&#10;the attribute group icon " /></td>
-
-<td valign="top">attribute group</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeGroupRef.gif" alt="This graphic&#10;is the attribute group reference icon " /></td>
-
-<td valign="top">attribute group reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeRef.gif" alt="This graphic is the&#10;attribute reference icon " /></td>
-
-<td valign="top">attribute reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAll.gif" alt="This graphic is the content&#10;model - all icon " /></td>
-
-<td valign="top">content model - all</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDChoice.gif" alt="This&#10;graphic is the content model - choice icon " /></td>
-
-<td valign="top">content model - choice</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSequence.gif" alt="This&#10;graphic is the content model - sequence icon " /></td>
-
-<td valign="top">content model - sequence</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDComplexType.gif" alt="This graphic is the&#10;any element icon " /></td>
-
-<td valign="top">complex type</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDElement.gif" alt="This graphic is the element&#10;icon " /></td>
-
-<td valign="top">element</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDElementRef.gif" alt="This graphic is the&#10;element reference icon " /></td>
-
-<td valign="top">element reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimpleEnum.gif" alt="This graphic is the&#10;enumeration icon " /></td>
-
-<td valign="top">enumeration</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDGlobalAttribute.gif" alt="This graphic is&#10;the global attribute icon " /></td>
-
-<td valign="top">global attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/XSDGlobalElement.gif" alt="This graphic is&#10;the global element icon " /></td>
-
-<td valign="top">global element</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/XSDGroup.gif" alt="This graphic is the group&#10;icon " /></td>
-
-<td valign="top">group</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDGroupRef.gif" alt="This graphic is the group&#10;reference icon " /></td>
-
-<td valign="top">group reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDImport.gif" alt="This graphic is the import&#10;icon " /></td>
-
-<td valign="top">import</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDInclude.gif" alt="This graphic is the include&#10;icon " /></td>
-
-<td valign="top">include</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimplePattern.gif" alt="This graphic is the&#10;pattern icon " /></td>
-
-<td valign="top">pattern</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDRedefine.gif" alt="This graphic is the redefine&#10;icon " /></td>
-
-<td valign="top">redefine</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimpleType.gif" alt="This graphic is the&#10;simple type icon " /></td>
-
-<td valign="top">simple type</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
deleted file mode 100644
index 336ae4e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddagrp" xml:lang="en-us">

-<title>Adding attribute groups</title>

-<titlealts>

-<searchtitle>Adding attribute groups</searchtitle>

-</titlealts>

-<shortdesc>An attribute group definition is an association between a name

-and a set of attribute declarations. Named groups of attribute declarations

-can greatly facilitate the maintenance and reuse of common attribute declarations

-in an XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>attribute groups</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>attribute groups</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add an attribute

-group to an XML schema, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click the <uicontrol>Attribute Groups</uicontrol> folder

-and click  <uicontrol>Add Attribute Group</uicontrol>.</cmd><info>It appears

-in the <uicontrol>Attribute Groups</uicontrol> folder.</info></step>

-<step><cmd>Select your new group, and in the Design view, right-click the

-attribute group and select <menucascade><uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol>

-</menucascade>. In the <uicontrol>New Name</uicontrol> field, type a name

-for the attribute group.</cmd></step>

-<step><cmd>To add an attribute, right-click your attribute group in the Outline

-view, click <uicontrol>Add Attribute</uicontrol>.</cmd><info>The attribute

-appears below the attribute group in the Outline view.</info>

-<substeps>

-<substep><cmd>Select the attribute, and in the Design view, click the current

-(default) name of the attribute, then type the new <uicontrol>Name</uicontrol>.</cmd>

-</substep>

-<substep><cmd>In the Design view, click the current (default) attribute type

-and select a type from the menu. Alternately, you can select browse to invoke

-the Set Type menu for more options.</cmd><info>The Set Type dialog lists all

-built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of

-the list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></info></substep>

-</substeps>

-</step>

-<step><cmd>An attribute reference provides a reference to a global attribute.

-To add an attribute reference, in the Design view, right-click the complex

-type containing the element, and click <uicontrol>Add Attribute Ref</uicontrol>.</cmd>

-<info>A declaration that references a global attribute enables the referenced

-attribute to appear in the instance document in the context of the referencing

-declaration. Select the reference, then select the attribute group you want

-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</info>

-</step>

-<step><cmd>An attribute group reference provides a reference to an attribute

-group. To add an attribute group reference, in the Design view, right-click

-the complex type containing the element, and click <uicontrol>Add Attribute

-Group Ref</uicontrol>.</cmd><info>A declaration that references a global attribute

-enables the referenced attribute to appear in the instance document in the

-context of the referencing declaration. Select the reference, then select

-the attribute group you want it to reference in the Properties view, from

-the<uicontrol>Ref</uicontrol> menu.</info></step>

-<step><cmd>An <codeph>any</codeph> element enables element content according

-to namespaces, and the corresponding <codeph>any</codeph> attribute element

-enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,

-right-click your attribute group and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>

-<info>The <codeph>any</codeph> appears below the attribute group in the Outline

-view. You can specify the following values for an <codeph>any</codeph> attribute:</info>

-<choices>

-<choice>For a <uicontrol>namespace</uicontrol> value, you can

-select:<ul>

-<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>

-<li><b>##local </b>. This allows any well-formed XML that is not declared

-to be in a namespace.</li>

-<li><b>##other</b>. This allows any well-formed XML that is not from the target

-namespace of the type being defined.</li>

-<li><b>##targetNamespace </b>. This is shorthand for the target namespace

-of the type being defined.</li>

-</ul></choice>

-<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>

-<li><b>skip</b>. The XML processor will not validate the attribute content

-at all.</li>

-<li><b>lax</b>. The XML processor will validate the attribute content as much

-as it can.</li>

-<li><b>strict</b>. The XML processor will validate all the attribute content.</li>

-</ul></choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000005769?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
deleted file mode 100644
index 500b3b0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding attribute groups" />
-<meta name="abstract" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
-<meta name="description" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
-<meta content="XML schema editor, adding, attribute groups, attributes groups, XML schema files, attribute groups, XML schema files, attributes groups" name="DC.subject" />
-<meta content="XML schema editor, adding, attribute groups, attributes groups, XML schema files, attribute groups, XML schema files, attributes groups" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddagrp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding attribute groups</title>
-</head>
-<body id="taddagrp"><a name="taddagrp"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding attribute groups</h1>
-
-
-
-
-<div><p>An attribute group definition is an association between a name
-and a set of attribute declarations. Named groups of attribute declarations
-can greatly facilitate the maintenance and reuse of common attribute declarations
-in an XML schema.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an attribute
-group to an XML schema, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click the <span class="uicontrol">Attribute Groups</span> folder
-and click  <span class="uicontrol">Add Attribute Group</span>.</span> It appears
-in the <span class="uicontrol">Attribute Groups</span> folder.</li>
-
-<li class="stepexpand"><span>Select your new group, and in the Design view, right-click the
-attribute group and select <span class="menucascade"><span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span>
-</span>. In the <span class="uicontrol">New Name</span> field, type a name
-for the attribute group.</span></li>
-
-<li class="stepexpand"><span>To add an attribute, right-click your attribute group in the Outline
-view, click <span class="uicontrol">Add Attribute</span>.</span> The attribute
-appears below the attribute group in the Outline view.
-<ol type="a">
-<li class="substepexpand"><span>Select the attribute, and in the Design view, click the current
-(default) name of the attribute, then type the new <span class="uicontrol">Name</span>.</span>
-</li>
-
-<li class="substepexpand"><span>In the Design view, click the current (default) attribute type
-and select a type from the menu. Alternately, you can select browse to invoke
-the Set Type menu for more options.</span> The Set Type dialog lists all
-built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
-the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, in the Design view, right-click the complex
-type containing the element, and click <span class="uicontrol">Add Attribute Ref</span>.</span>
- A declaration that references a global attribute enables the referenced
-attribute to appear in the instance document in the context of the referencing
-declaration. Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<span class="uicontrol">Ref</span> menu.
-</li>
-
-<li class="stepexpand"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, in the Design view, right-click
-the complex type containing the element, and click <span class="uicontrol">Add Attribute
-Group Ref</span>.</span> A declaration that references a global attribute
-enables the referenced attribute to appear in the instance document in the
-context of the referencing declaration. Select the reference, then select
-the attribute group you want it to reference in the Properties view, from
-the<span class="uicontrol">Ref</span> menu.</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
-to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
-enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click your attribute group and click <span class="uicontrol">Add Any Attribute</span>.</span>
- The <samp class="codeph">any</samp> appears below the attribute group in the Outline
-view. You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
-namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
-as it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
-
-</ul>
-</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
deleted file mode 100644
index 5b2c285..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddanye" xml:lang="en-us">

-<title>Adding an any element</title>

-<titlealts>

-<searchtitle>Adding an any element</searchtitle>

-</titlealts>

-<shortdesc>You can use the <codeph>any</codeph> element in a similar way as

-a DTD's ANY content model, however, it must be done in conjunction with namespaces.

-This enables you to include any well-formed XML content, such as an HTML Web

-page that conforms to XHTML 1.0 syntax.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>adding an any element</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>adding an any element</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example:</p><p><codeblock>&lt;element name = "MyWebPage">

-&lt;complexType>

-&lt;any namespace ="http://www.w3.org/1999/xhtml>

- &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/>

-&lt;/complexType>

-&lt;/element></codeblock></p><p>The preceding schema fragment allows a <codeph>&lt;MyWebPage></codeph> element

-to contain any well-formed XHTML data that appears in the specified namespace.</p><p>The

-following instructions were written for the Resource perspective, but they

-will also work in many other perspectives.</p><p>To add an <codeph>any</codeph> element:</p></context>

-<steps>

-<step><cmd>In the Outline view, right-click the content model that you want

-to work with and click <uicontrol>Add Any</uicontrol>. </cmd></step>

-<step><cmd>Select the new <codeph>any</codeph> element.</cmd></step>

-<step><cmd>In the Properties view of the schema editor, for a <uicontrol>namespace</uicontrol> value,

-you can select:</cmd>

-<choices>

-<choice><b>##any</b>. This allows any well-formed XML from any namespace.</choice>

-<choice><b>##local </b>. This allows any well-formed XML that is not declared

-to be in a namespace.</choice>

-<choice><b>##other </b>. This allows any well-formed XML that is not from

-the target namespace of the type being defined.</choice>

-<choice><b>##targetNamespace</b>. This is shorthand for the target namespace

-of the type being defined.</choice>

-</choices>

-</step>

-<step><cmd>For a <uicontrol>processContents</uicontrol> value, you can select:</cmd>

-<choices>

-<choice><b>skip</b>. The XML processor will not validate the content at all.</choice>

-<choice><b>lax</b>. The XML processor will validate the content as much as

-it can.</choice>

-<choice><b>strict</b>. The XML processor will validate all the content.</choice>

-</choices>

-</step>

-<step><cmd>The <uicontrol>minOccurs</uicontrol> value is the number of times

-the <codeph>any</codeph> element must appear in an instance document. You

-can select <uicontrol>0</uicontrol> if you want the element to be optional;

-otherwise, select <uicontrol>1</uicontrol>. </cmd></step>

-<step><cmd>The <uicontrol>maxOccurs</uicontrol> value is the maximum number

-of times an <codeph>any</codeph> element can appear in an instance document.

-You can select <uicontrol>0</uicontrol>, <uicontrol>1</uicontrol>, or, to

-indicate there is no maximum number of occurrences, <uicontrol>unbounded</uicontrol>.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<postreq><p>(c) Copyright 2001, World Wide Web (Massachusetts Institute of

-Technology, Institut National de Recherche en Informatique et en Automatique,

-Keio University).</p></postreq>

-</taskbody>

-</task>

-<?Pub *0000004291?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
deleted file mode 100644
index 8540ecb..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding an any element" />
-<meta name="abstract" content="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax." />
-<meta name="description" content="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax." />
-<meta content="XML schema editor, adding, an any element, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, an any element, XML schema files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddanye" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding an any element</title>
-</head>
-<body id="taddanye"><a name="taddanye"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding an any element</h1>
-
-
-
-
-<div><p>You can use the <samp class="codeph">any</samp> element in a similar way as
-a DTD's ANY content model, however, it must be done in conjunction with namespaces.
-This enables you to include any well-formed XML content, such as an HTML Web
-page that conforms to XHTML 1.0 syntax.</p>
-
-<div class="section"><p>For example:</p>
-<div class="p"><pre>&lt;element name = "MyWebPage"&gt;
-&lt;complexType&gt;
-&lt;any namespace ="http://www.w3.org/1999/xhtml&gt;
- &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/&gt;
-&lt;/complexType&gt;
-&lt;/element&gt;</pre>
-</div>
-<p>The preceding schema fragment allows a <samp class="codeph">&lt;MyWebPage&gt;</samp> element
-to contain any well-formed XHTML data that appears in the specified namespace.</p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives.</p>
-<p>To add an <samp class="codeph">any</samp> element:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Outline view, right-click the content model that you want
-to work with and click <span class="uicontrol">Add Any</span>. </span></li>
-
-<li class="stepexpand"><span>Select the new <samp class="codeph">any</samp> element.</span></li>
-
-<li class="stepexpand"><span>In the Properties view of the schema editor, for a <span class="uicontrol">namespace</span> value,
-you can select:</span>
-<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other </strong>. This allows any well-formed XML that is not from
-the target namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace</strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>For a <span class="uicontrol">processContents</span> value, you can select:</span>
-<ul>
-<li><strong>skip</strong>. The XML processor will not validate the content at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the content as much as
-it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the content.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">minOccurs</span> value is the number of times
-the <samp class="codeph">any</samp> element must appear in an instance document. You
-can select <span class="uicontrol">0</span> if you want the element to be optional;
-otherwise, select <span class="uicontrol">1</span>. </span></li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">maxOccurs</span> value is the maximum number
-of times an <samp class="codeph">any</samp> element can appear in an instance document.
-You can select <span class="uicontrol">0</span>, <span class="uicontrol">1</span>, or, to
-indicate there is no maximum number of occurrences, <span class="uicontrol">unbounded</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>(c) Copyright 2001, World Wide Web (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University).</p>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
deleted file mode 100644
index f5d45f7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddcmod" xml:lang="en-us">

-<title>Adding content models</title>

-<titlealts>

-<searchtitle>Adding content models</searchtitle>

-</titlealts>

-<shortdesc>A content model is the representation of any data that can be contained

-inside an element, global element, complex type, or group. It is a formal

-description of the structure and permissible content of an element, global

-element, complex type, or group, which may be used to validate a document

-instance.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>content models</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>content models</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>There are three different kinds of content models:<ul>

-<li><b>Sequence</b>, which means that all the content model's children can

-appear in an instance of the XML schema. They must, however, appear in the

-order they are listed in the content model.</li>

-<li><b>Choice</b>, which means that only one of the content model's children

-can appear in an instance of the XML schema.</li>

-<li><b>All</b>, which means that all of the content model's children can appear

-once or not at all, and they can appear in any order. If you select this option,

-all of the contents model's children must be individual elements and no element

-in the content model can appear more than once.</li>

-</ul></p><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a content

-model to an element, global element, complex type, or group, follow these

-steps:</p></context>

-<steps>

-<step><cmd>In the Design view, select your complex type, or group:</cmd>

-<choices>

-<choice>If you selected a complex type, you can right-click it and click <uicontrol>Add

-Sequence</uicontrol>, or <uicontrol>Add Choice</uicontrol> to add the type

-of content model you want to your complex type. If you wish to use the <uicontrol>all</uicontrol> content

-model, you can change the model by clicking the model in the Design view,

-and in properties, select <uicontrol>all</uicontrol> as the <uicontrol>Kind</uicontrol>.

-Your content model is automatically added as a child of your complex type

-- expand in the Outline view to see it. <b>Note:</b> These options will not

-appear if you have set a base type for your complex type. You can either set

-a base type for your complex type, or you add a content model to it, but you

-cannot do both.</choice>

-<choice>Your group is automatically created with a sequence content model

-child. Expand it in the Outline view to see it and select it. In the Properties

-view, you can select to change it to a <uicontrol>choice</uicontrol> or <uicontrol>all</uicontrol> content

-model by selecting these options from the <uicontrol>Kind</uicontrol> menu.</choice>

-</choices>

-</step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MinOccurs</uicontrol> field.</cmd>

-<info>This is the minimum number of times the content model must appear. If

-you want the content model to be optional, select <uicontrol>0</uicontrol>.

-Otherwise, select <uicontrol>1</uicontrol>. </info></step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MaxOccurs</uicontrol> field.</cmd>

-<info>This is the maximum number of times a content model can appear. You

-can select <uicontrol>unbounded</uicontrol> to indicate there is no maximum

-number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this content model.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<postreq><p>You can add the following items to a content object model. </p><ul>

-<li>Another content model.</li>

-<li>A group reference which enables the referenced group to appear in the

-instance document in the context of the referencing declaration. This menu

-option only appears if there are global groups defined elsewhere in the document

-or if groups are defined in included schemas.</li>

-<li>An element, fundamental building blocks in XML.</li>

-<li>An element reference, which provides a reference to a global element.

-This menu option only appears if there are global elements defined elsewhere

-in the document.</li>

-<li>An <codeph>any</codeph> element. You can use an <codeph>any</codeph> element

-to extend your content model by any elements belonging to a specified namespace.</li>

-</ul></postreq>

-</taskbody>

-</task>

-<?Pub *0000005317?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
deleted file mode 100644
index 1e0afe1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding content models" />
-<meta name="abstract" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
-<meta name="description" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
-<meta content="XML schema editor, adding, content models, XML schema files, content models, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, content models, XML schema files, content models, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrpr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddcmod" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding content models</title>
-</head>
-<body id="taddcmod"><a name="taddcmod"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding content models</h1>
-
-
-
-
-<div><p>A content model is the representation of any data that can be contained
-inside an element, global element, complex type, or group. It is a formal
-description of the structure and permissible content of an element, global
-element, complex type, or group, which may be used to validate a document
-instance.</p>
-
-<div class="section"><div class="p">There are three different kinds of content models:<ul>
-<li><strong>Sequence</strong>, which means that all the content model's children can
-appear in an instance of the XML schema. They must, however, appear in the
-order they are listed in the content model.</li>
-
-<li><strong>Choice</strong>, which means that only one of the content model's children
-can appear in an instance of the XML schema.</li>
-
-<li><strong>All</strong>, which means that all of the content model's children can appear
-once or not at all, and they can appear in any order. If you select this option,
-all of the contents model's children must be individual elements and no element
-in the content model can appear more than once.</li>
-
-</ul>
-</div>
-<p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a content
-model to an element, global element, complex type, or group, follow these
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, select your complex type, or group:</span>
-<ul>
-<li>If you selected a complex type, you can right-click it and click <span class="uicontrol">Add
-Sequence</span>, or <span class="uicontrol">Add Choice</span> to add the type
-of content model you want to your complex type. If you wish to use the <span class="uicontrol">all</span> content
-model, you can change the model by clicking the model in the Design view,
-and in properties, select <span class="uicontrol">all</span> as the <span class="uicontrol">Kind</span>.
-Your content model is automatically added as a child of your complex type
-- expand in the Outline view to see it. <strong>Note:</strong> These options will not
-appear if you have set a base type for your complex type. You can either set
-a base type for your complex type, or you add a content model to it, but you
-cannot do both.</li>
-
-<li>Your group is automatically created with a sequence content model
-child. Expand it in the Outline view to see it and select it. In the Properties
-view, you can select to change it to a <span class="uicontrol">choice</span> or <span class="uicontrol">all</span> content
-model by selecting these options from the <span class="uicontrol">Kind</span> menu.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span>
- This is the minimum number of times the content model must appear. If
-you want the content model to be optional, select <span class="uicontrol">0</span>.
-Otherwise, select <span class="uicontrol">1</span>. </li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times a content model can appear. You
-can select <span class="uicontrol">unbounded</span> to indicate there is no maximum
-number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this content model.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>You can add the following items to a content object model. </p>
-<ul>
-<li>Another content model.</li>
-
-<li>A group reference which enables the referenced group to appear in the
-instance document in the context of the referencing declaration. This menu
-option only appears if there are global groups defined elsewhere in the document
-or if groups are defined in included schemas.</li>
-
-<li>An element, fundamental building blocks in XML.</li>
-
-<li>An element reference, which provides a reference to a global element.
-This menu option only appears if there are global elements defined elsewhere
-in the document.</li>
-
-<li>An <samp class="codeph">any</samp> element. You can use an <samp class="codeph">any</samp> element
-to extend your content model by any elements belonging to a specified namespace.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddelm.html" title="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements.">Adding elements</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-<div><a href="../topics/taddgrpr.html" title="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration.">Adding group references</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
deleted file mode 100644
index ef5c946..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddcmxt" xml:lang="en-us">

-<title>Adding complex types</title>

-<titlealts>

-<searchtitle>Adding complex types</searchtitle>

-</titlealts>

-<shortdesc>A complex type allows elements in its content and can carry attributes.

-Complex types can be used to help determine the appropriate content for any

-instance documents generated from or associated with your XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>complex types</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>complex types</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can add as many complex types as you want to an XML schema.</p><p>The

-following instructions were written for the Resource perspective, but they

-will also work in many other perspectives.</p><p>To add a complex type to

-an XML schema, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>Right-click the Types category in the Design view, and click <uicontrol>Add

-Complex Type</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, type a new name for the complex type in

-the <uicontrol>Name</uicontrol> field.</cmd></step>

-<step><cmd>Click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">

-<alt>Browse icon</alt></image> to select a base type for your complex type.</cmd>

-<info>You can either set a base type for your complex type, or you can add

-a content model to it (which represents any data that can be contained inside

-an element), but you cannot do both. For more information about content models,

-refer to the related tasks.</info></step>

-<step><cmd>Select <uicontrol>restriction</uicontrol> or <uicontrol>extension</uicontrol> from

-the <uicontrol>Inherited by</uicontrol> list.</cmd><info>This specifies whether

-your type is derived from its base type by restriction or extension.</info>

-</step>

-<step><cmd>The Design view will display the attributes within the complex

-type.</cmd><info>You can also use this view to add attributes to your complex

-type. An attribute associates an attribute name with a specific type and value.</info>

-<choices>

-<choice>To add an attribute, in the Design view, right click your complex

-type and select <uicontrol>Add Attribute</uicontrol>.<ul>

-<li><uicontrol>name</uicontrol>. In the Design view, click the name of the

-attribute to make a change.</li>

-<li><uicontrol>type</uicontrol>. In the Design view, click the type of the

-attribute to make a change. The drop-down menu provides commonly used types.

-For more options, simply select <uicontrol>Browse</uicontrol> from the menu.</li>

-</ul></choice>

-</choices>

-</step>

-<step><cmd>An attribute reference provides a reference to a global attribute.

-To add an attribute reference, in the Design view, right-click the complex

-type containing the element, and click <uicontrol>Add Attribute Ref</uicontrol>.</cmd>

-<info>A declaration that references a global attribute enables the referenced

-attribute to appear in the instance document in the context of the referencing

-declaration. Select the reference, then select the attribute group you want

-it to reference in the Properties view, from the<uicontrol> Ref</uicontrol> menu.</info>

-</step>

-<step><cmd>An attribute group reference provides a reference to an attribute

-group. To add an attribute group reference, in the Design view, right-click

-the complex type containing the element, and click <uicontrol>Add Attribute

-Group Ref</uicontrol>.</cmd><info>A declaration that references an attribute

-group enables the referenced attribute group to appear in the instance document

-in the context of the referencing declaration. Select the reference, then

-select the attribute group you want it to reference in the Properties view,

-from the<uicontrol> Ref</uicontrol> menu.</info></step>

-<step><cmd>An <codeph>any</codeph> element enables element content according

-to namespaces, and the corresponding <codeph>any</codeph> attribute element

-enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,

-right-click in the complex type header, and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>

-<info>You can specify the following values for an <codeph>any</codeph> attribute:</info>

-<choices>

-<choice>For a <uicontrol>namespace</uicontrol> value, you can

-select:<ul>

-<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>

-<li><b>##local </b>. This allows any well-formed XML that is not declared

-to be in a namespace.</li>

-<li><b>##other</b>. This allows any well-formed XML that is not from the target

-namespace of the type being defined.</li>

-<li><b>##targetNamespace </b>. This is shorthand for the target namespace

-of the type being defined.</li>

-</ul></choice>

-<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>

-<li><b>skip</b>. The XML processor will not validate the attribute content

-at all.</li>

-<li><b>lax</b>. The XML processor will validate the attribute content as much

-as it can.</li>

-<li><b>strict</b>. The XML processor will validate all the attribute content.</li>

-</ul></choice>

-</choices>

-<info></info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this complex type.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000006207?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
deleted file mode 100644
index 6204c40..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding complex types" />
-<meta name="abstract" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
-<meta name="description" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
-<meta content="XML schema editor, adding, complex types, XML schema files, complex types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, complex types, XML schema files, complex types, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddcmxt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding complex types</title>
-</head>
-<body id="taddcmxt"><a name="taddcmxt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding complex types</h1>
-
-
-
-
-<div><p>A complex type allows elements in its content and can carry attributes.
-Complex types can be used to help determine the appropriate content for any
-instance documents generated from or associated with your XML schema.</p>
-
-<div class="section"><p>You can add as many complex types as you want to an XML schema.</p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives.</p>
-<p>To add a complex type to
-an XML schema, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>Right-click the Types category in the Design view, and click <span class="uicontrol">Add
-Complex Type</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, type a new name for the complex type in
-the <span class="uicontrol">Name</span> field.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="Browse icon" /> to select a base type for your complex type.</span>
- You can either set a base type for your complex type, or you can add
-a content model to it (which represents any data that can be contained inside
-an element), but you cannot do both. For more information about content models,
-refer to the related tasks.</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">restriction</span> or <span class="uicontrol">extension</span> from
-the <span class="uicontrol">Inherited by</span> list.</span> This specifies whether
-your type is derived from its base type by restriction or extension.
-</li>
-
-<li class="stepexpand"><span>The Design view will display the attributes within the complex
-type.</span> You can also use this view to add attributes to your complex
-type. An attribute associates an attribute name with a specific type and value.
-<ul>
-<li>To add an attribute, in the Design view, right click your complex
-type and select <span class="uicontrol">Add Attribute</span>.<ul>
-<li><span class="uicontrol">name</span>. In the Design view, click the name of the
-attribute to make a change.</li>
-
-<li><span class="uicontrol">type</span>. In the Design view, click the type of the
-attribute to make a change. The drop-down menu provides commonly used types.
-For more options, simply select <span class="uicontrol">Browse</span> from the menu.</li>
-
-</ul>
-</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, in the Design view, right-click the complex
-type containing the element, and click <span class="uicontrol">Add Attribute Ref</span>.</span>
- A declaration that references a global attribute enables the referenced
-attribute to appear in the instance document in the context of the referencing
-declaration. Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<span class="uicontrol"> Ref</span> menu.
-</li>
-
-<li class="stepexpand"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, in the Design view, right-click
-the complex type containing the element, and click <span class="uicontrol">Add Attribute
-Group Ref</span>.</span> A declaration that references an attribute
-group enables the referenced attribute group to appear in the instance document
-in the context of the referencing declaration. Select the reference, then
-select the attribute group you want it to reference in the Properties view,
-from the<span class="uicontrol"> Ref</span> menu.</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
-to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
-enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the complex type header, and click <span class="uicontrol">Add Any Attribute</span>.</span>
- You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
-namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
-as it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
-
-</ul>
-</li>
-
-</ul>
-
- </li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this complex type.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
deleted file mode 100644
index 57eeb53..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddelm" xml:lang="en-us">

-<title>Adding elements</title>

-<titlealts>

-<searchtitle>Adding elements</searchtitle>

-</titlealts>

-<shortdesc>Elements are fundamental building blocks in XML. Element declarations

-provide value constraints, provide a description that can be used for validation,

-establish constraining relationships between related elements and attributes,

-and control the substitution of elements.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add an element:</p></context>

-<steps>

-<step><cmd>To add an element, in the Design view, right-click the content

-model you want to work with and click <uicontrol>Add Element</uicontrol>.</cmd>

-<info>The element appears attached to the content model in the Design view.</info>

-<substeps>

-<substep><cmd>In the Design view, select the element, and click the current

-(default) name of the element, which puts you in direct editing mode, then

-type the new <uicontrol>Name</uicontrol> and press enter.</cmd></substep>

-<substep><cmd>In the Design view, click the current (default) element type

-and select a type from the menu. Alternately, you can select browse to invoke

-the Set Type dialog for more options.</cmd><info>The Set Type dialog lists

-all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of

-the list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace.</li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file.</li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></info></substep>

-</substeps>

-</step>

-<step><cmd>(Optional) In the Properties view, select the appropriate value

-in the <uicontrol>MinOccurs</uicontrol> field.</cmd><info>This is the number

-of times the element can appear in an instance document. If you want the element

-to be optional, select <uicontrol>0</uicontrol>. Otherwise, select <uicontrol>1</uicontrol>. </info>

-</step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MaxOccurs</uicontrol> field.</cmd>

-<info>This is the maximum number of times the element can appear in an instance

-document. Select <uicontrol>unbounded</uicontrol> to indicate there is no

-maximum number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<postreq>You can add a content model to an element, which is the representation

-of any data that can be contained inside the element. For more information

-about working with content models, refer to the related tasks.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
deleted file mode 100644
index a9b3cb7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding elements" />
-<meta name="abstract" content="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements." />
-<meta name="description" content="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements." />
-<meta content="XML schema editor, adding, elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglba.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddelm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding elements</title>
-</head>
-<body id="taddelm"><a name="taddelm"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding elements</h1>
-
-
-
-
-<div><p>Elements are fundamental building blocks in XML. Element declarations
-provide value constraints, provide a description that can be used for validation,
-establish constraining relationships between related elements and attributes,
-and control the substitution of elements.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an element:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>To add an element, in the Design view, right-click the content
-model you want to work with and click <span class="uicontrol">Add Element</span>.</span>
- The element appears attached to the content model in the Design view.
-<ol type="a">
-<li class="substepexpand"><span>In the Design view, select the element, and click the current
-(default) name of the element, which puts you in direct editing mode, then
-type the new <span class="uicontrol">Name</span> and press enter.</span></li>
-
-<li class="substepexpand"><span>In the Design view, click the current (default) element type
-and select a type from the menu. Alternately, you can select browse to invoke
-the Set Type dialog for more options.</span> The Set Type dialog lists
-all built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
-the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace.</li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file.</li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) In the Properties view, select the appropriate value
-in the <span class="uicontrol">MinOccurs</span> field.</span> This is the number
-of times the element can appear in an instance document. If you want the element
-to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
-</li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times the element can appear in an instance
-document. Select <span class="uicontrol">unbounded</span> to indicate there is no
-maximum number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section">You can add a content model to an element, which is the representation
-of any data that can be contained inside the element. For more information
-about working with content models, refer to the related tasks.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddglba.html" title="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference.">Adding global attributes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
deleted file mode 100644
index 0a41c6a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddelmr" xml:lang="en-us">

-<title>Adding element references</title>

-<titlealts>

-<searchtitle>Adding element references</searchtitle>

-</titlealts>

-<shortdesc>An element reference provides a reference to a global element.

-A declaration that references a global element enables the referenced global

-element to appear in the instance document in the context of the referencing

-declaration.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>element references</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>element references</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add an element

-reference:</p></context>

-<steps>

-<step><cmd>In the Design view, right-click the content model you want to work

-with and click <uicontrol>Add Element Ref</uicontrol>.</cmd><stepresult>If

-no global element is defined in the document, a new global element is created

-for you, and the element reference will point to it.</stepresult></step>

-<step><cmd>Select the element reference. To specify values for an element

-reference:</cmd>

-<choices>

-<choice>Click the name of the element reference in the Design view. Enter

-the name of the element reference.</choice>

-<choice>Click the element reference type in the Design view.

-Select a type from the menu, or select <uicontrol>Browse</uicontrol> for more

-options.</choice>

-</choices>

-</step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MinOccurs</uicontrol> field.</cmd>

-<info>This is the number of times the global element referenced can appear

-in an instance document. If you want the element to be optional, select <uicontrol>0</uicontrol>.

-Otherwise, select <uicontrol>1</uicontrol>. </info></step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MaxOccurs</uicontrol> field.</cmd>

-<info>This is the maximum number of times the global element referenced can

-appear. You can select <uicontrol>unbounded</uicontrol> to indicate there

-is no maximum number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this element reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000003232?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
deleted file mode 100644
index 40177eb..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding element references" />
-<meta name="abstract" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
-<meta name="description" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, adding, element references, XML schema files, element references, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, element references, XML schema files, element references, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglem.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglba.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddelmr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding element references</title>
-</head>
-<body id="taddelmr"><a name="taddelmr"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding element references</h1>
-
-
-
-
-<div><p>An element reference provides a reference to a global element.
-A declaration that references a global element enables the referenced global
-element to appear in the instance document in the context of the referencing
-declaration.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an element
-reference:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click the content model you want to work
-with and click <span class="uicontrol">Add Element Ref</span>.</span> If
-no global element is defined in the document, a new global element is created
-for you, and the element reference will point to it.</li>
-
-<li class="stepexpand"><span>Select the element reference. To specify values for an element
-reference:</span>
-<ul>
-<li>Click the name of the element reference in the Design view. Enter
-the name of the element reference.</li>
-
-<li>Click the element reference type in the Design view.
-Select a type from the menu, or select <span class="uicontrol">Browse</span> for more
-options.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span>
- This is the number of times the global element referenced can appear
-in an instance document. If you want the element to be optional, select <span class="uicontrol">0</span>.
-Otherwise, select <span class="uicontrol">1</span>. </li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times the global element referenced can
-appear. You can select <span class="uicontrol">unbounded</span> to indicate there
-is no maximum number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddglem.html" title="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model.">Adding global elements</a></div>
-<div><a href="../topics/taddelm.html" title="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements.">Adding elements</a></div>
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddglba.html" title="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference.">Adding global attributes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
deleted file mode 100644
index 719033f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddglba" xml:lang="en-us">

-<title>Adding global attributes</title>

-<titlealts>

-<searchtitle>Adding global attributes</searchtitle>

-</titlealts>

-<shortdesc>A global attribute is an attribute that can be recognized anywhere

-in a document. Once declared, a global attribute can be referenced in one

-or more declarations using an attribute reference.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>global attributes</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>global attributes</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a global

-attribute:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Design view, right-click in the <b>Attributes</b> section

-and click <uicontrol>Add Attribute</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, enter a name for the attribute in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>In the Properties view, you can select the attribute <uicontrol>Type</uicontrol> from

-the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>

-<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from

-the list for more options. </p><p>The Set Type dialog will appear, and lists

-all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of

-the list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this global attribute.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000003230?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
deleted file mode 100644
index 29b0abf..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding global attributes" />
-<meta name="abstract" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
-<meta name="description" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
-<meta content="XML schema editor, adding, global attributes, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, global attributes, XML schema files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddglba" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding global attributes</title>
-</head>
-<body id="taddglba"><a name="taddglba"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding global attributes</h1>
-
-
-
-
-<div><p>A global attribute is an attribute that can be recognized anywhere
-in a document. Once declared, a global attribute can be referenced in one
-or more declarations using an attribute reference.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a global
-attribute:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Attributes</strong> section
-and click <span class="uicontrol">Add Attribute</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, enter a name for the attribute in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, you can select the attribute <span class="uicontrol">Type</span> from
-the predefined list in the menu next to the <span class="uicontrol">Type</span> field.</span>
- <p>Alternatively, you can select <span class="uicontrol">Browse</span> from
-the list for more options. </p>
-<div class="p">The Set Type dialog will appear, and lists
-all built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
-the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</div>
-<p>Select the type you want in the type list, then click <span class="uicontrol">OK</span>. </p>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global attribute.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
deleted file mode 100644
index 1dfe97d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddglem" xml:lang="en-us">

-<title>Adding global elements</title>

-<titlealts>

-<searchtitle>Adding global elements</searchtitle>

-</titlealts>

-<shortdesc>A global element is an element with a global scope. It is one that

-has been declared as part of the main schema rather than as part of a content

-model.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>global elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>global elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a global

-element:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, select your schema.</cmd><info>The entire

-schema and its contents are displayed in the Design view.</info></step>

-<step><cmd>In the Design view, right-click in the <b>Elements</b> section

-and click <uicontrol>Add Element</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab,

-and type a new name for the global element in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>In the Properties view, you can select the attribute type from

-the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>

-<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from

-the list for more options. </p><p>The <uicontrol>Set Type</uicontrol> dialog

-box appears, and lists all built-in and user-defined types currently available.

-You can change the <uicontrol>Scope</uicontrol> of the list by selecting one

-of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>

-</step>

-<step><cmd>(Optional) Click the <uicontrol>Other</uicontrol> tab.</cmd><info>In

-this page, you can specify the following various values for the global element: </info>

-<choices>

-<choice><uicontrol>abstract</uicontrol>. Click <b>true </b>if you want the

-global element to be abstract. When a global element is declared to be abstract,

-it cannot be used in an instance document. Instead, a member of that global

-element's substitution group must appear in the instance document.</choice>

-<choice><uicontrol>block</uicontrol>. This field determines whether the global

-element may be replaced by an element derived from it.</choice>

-<choice><uicontrol>final</uicontrol>. This field determines whether this global

-element may be derived from.</choice>

-<choice><uicontrol>fixed/default</uicontrol>. Click <uicontrol>Browse</uicontrol> and

-select <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> and

-specify an appropriate value. If you select <b>Fixed</b>, the global element

-has a fixed value, which cannot be changed. If you select <b>Default</b>,

-the element has a default value.</choice>

-<choice><uicontrol>form</uicontrol>. Use this field to indicate if the appearance

-of this global element in an instance of the XML schema (an XML file associated

-with the XML schema) must be qualified by a namespace.</choice>

-<choice><uicontrol>nillable</uicontrol>. Select <b>true</b> if you do not

-want the global element to be able to have any child elements, only attributes. </choice>

-<choice><uicontrol>substitutionGroup</uicontrol>. A substitution group allows

-elements to be substituted for other elements.</choice>

-</choices>

-</step>

-<step><cmd>Click the <uicontrol>Attributes</uicontrol> tab.</cmd><info>You

-can use this page to add attributes, attribute references, attributes group

-references, and <codeph>any</codeph> attributes to your global element.</info>

-</step>

-<step><cmd>An attribute associates an attribute name with a specific type

-and value. To add an attribute, right-click in the Attributes page, and click <uicontrol>Add

-Attribute</uicontrol>.</cmd><info>You can specify the following values for

-an attribute:</info>

-<choices>

-<choice><uicontrol>fixed/default</uicontrol>. Click <uicontrol>Browse</uicontrol> and

-select <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> and

-specify an appropriate value. If you select <b>Fixed</b>, the attribute has

-a fixed value, which cannot be changed. If you select <b>Default</b>, the

-attribute has a default value.</choice>

-<choice><uicontrol>form</uicontrol>. Use this field to indicate if the appearance

-of this attribute in an instance of the XML schema must be qualified by a

-namespace.</choice>

-<choice><uicontrol>name</uicontrol>. Enter the name of the attribute.</choice>

-<choice><uicontrol>type</uicontrol>. Click <uicontrol>Browse</uicontrol> and

-select the type of the attribute. </choice>

-<choice><uicontrol>use</uicontrol>. This field indicates how an attribute

-can be used in an instance document. If you select optional, the attribute

-can appear once, but it does not have to. If you select required, the attribute

-must appear once. If you select prohibited, the attribute must not appear. <b>Note</b>:

-If you selected <uicontrol>Default</uicontrol>, you must select <b>optional</b> in

-this field, otherwise the default value will not be valid.</choice>

-</choices>

-</step>

-<step><cmd>An attribute reference provides a reference to a global attribute.

-To add an attribute reference, right-click in the Attributes page, and click <uicontrol>Add

-Attribute Ref</uicontrol>.</cmd><info>A declaration that references a global

-attribute enables the referenced attribute to appear in the instance document

-in the context of the referencing declaration. The menu option to add an attribute

-reference only appears if there are global attributes defined elsewhere in

-the document. Select the reference, then select the global attribute you want

-it to reference from the <uicontrol>ref</uicontrol> list.</info></step>

-<step><cmd>An attribute group reference provides a reference to an attribute

-group. To add an attribute group reference, right-click in the Attributes

-page, and click <uicontrol>Add Attribute Group Ref</uicontrol>.</cmd><info>A

-declaration that references an attribute group enables the referenced attribute

-group to appear in the instance document in the context of the referencing

-declaration. The menu option to add an attribute group reference only appears

-if there are attribute groups defined elsewhere in the document. Select the

-reference, then select the attribute group you want it to reference from the <uicontrol>ref</uicontrol> list.</info>

-</step>

-<step><cmd>An <codeph>any</codeph> element enables element content according

-to namespaces, and the corresponding <codeph>any</codeph> attribute element

-enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,

-right-click in the Attributes page and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>

-<info>You can specify the following values for an <codeph>any</codeph> attribute:</info>

-<choices>

-<choice>For a <uicontrol>namespace</uicontrol> value, you can

-select:<ul>

-<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>

-<li><b>##local </b>. This allows any well-formed XML that is not declared

-to be in a namespace.</li>

-<li><b>##other</b>. This allows any well-formed XML that is not from the target

-namespace of the type being defined.</li>

-<li><b>##targetNamespace </b>. This is shorthand for the target namespace

-of the type being defined.</li>

-</ul></choice>

-<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>

-<li><b>skip</b>. The XML processor will not validate the attribute content

-at all.</li>

-<li><b>lax</b>. The XML processor will validate the attribute content as much

-as it can.</li>

-<li><b>strict</b>. The XML processor will validate all the attribute content.</li>

-</ul></choice>

-</choices>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this global element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<postreq>You can add a content model to a global element, which is the representation

-of any data that can be contained inside the global element. For more information

-about working with content models, refer to the related tasks.</postreq>

-</taskbody>

-</task>

-<?Pub *0000009579?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
deleted file mode 100644
index f38c0d5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding global elements" />
-<meta name="abstract" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
-<meta name="description" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
-<meta content="XML schema editor, adding, global elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, global elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddglem" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding global elements</title>
-</head>
-<body id="taddglem"><a name="taddglem"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding global elements</h1>
-
-
-
-
-<div><p>A global element is an element with a global scope. It is one that
-has been declared as part of the main schema rather than as part of a content
-model.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a global
-element:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Elements</strong> section
-and click <span class="uicontrol">Add Element</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab,
-and type a new name for the global element in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, you can select the attribute type from
-the predefined list in the menu next to the <span class="uicontrol">Type</span> field.</span>
- <p>Alternatively, you can select <span class="uicontrol">Browse</span> from
-the list for more options. </p>
-<div class="p">The <span class="uicontrol">Set Type</span> dialog
-box appears, and lists all built-in and user-defined types currently available.
-You can change the <span class="uicontrol">Scope</span> of the list by selecting one
-of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</div>
-<p>Select the type you want in the type list, then click <span class="uicontrol">OK</span>. </p>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) Click the <span class="uicontrol">Other</span> tab.</span> In
-this page, you can specify the following various values for the global element: 
-<ul>
-<li><span class="uicontrol">abstract</span>. Click <strong>true </strong>if you want the
-global element to be abstract. When a global element is declared to be abstract,
-it cannot be used in an instance document. Instead, a member of that global
-element's substitution group must appear in the instance document.</li>
-
-<li><span class="uicontrol">block</span>. This field determines whether the global
-element may be replaced by an element derived from it.</li>
-
-<li><span class="uicontrol">final</span>. This field determines whether this global
-element may be derived from.</li>
-
-<li><span class="uicontrol">fixed/default</span>. Click <span class="uicontrol">Browse</span> and
-select <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> and
-specify an appropriate value. If you select <strong>Fixed</strong>, the global element
-has a fixed value, which cannot be changed. If you select <strong>Default</strong>,
-the element has a default value.</li>
-
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this global element in an instance of the XML schema (an XML file associated
-with the XML schema) must be qualified by a namespace.</li>
-
-<li><span class="uicontrol">nillable</span>. Select <strong>true</strong> if you do not
-want the global element to be able to have any child elements, only attributes. </li>
-
-<li><span class="uicontrol">substitutionGroup</span>. A substitution group allows
-elements to be substituted for other elements.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Attributes</span> tab.</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your global element.
-</li>
-
-<li class="stepexpand"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute:
-<ul>
-<li><span class="uicontrol">fixed/default</span>. Click <span class="uicontrol">Browse</span> and
-select <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> and
-specify an appropriate value. If you select <strong>Fixed</strong>, the attribute has
-a fixed value, which cannot be changed. If you select <strong>Default</strong>, the
-attribute has a default value.</li>
-
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-
-<li><span class="uicontrol">name</span>. Enter the name of the attribute.</li>
-
-<li><span class="uicontrol">type</span>. Click <span class="uicontrol">Browse</span> and
-select the type of the attribute. </li>
-
-<li><span class="uicontrol">use</span>. This field indicates how an attribute
-can be used in an instance document. If you select optional, the attribute
-can appear once, but it does not have to. If you select required, the attribute
-must appear once. If you select prohibited, the attribute must not appear. <strong>Note</strong>:
-If you selected <span class="uicontrol">Default</span>, you must select <strong>optional</strong> in
-this field, otherwise the default value will not be valid.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-attribute enables the referenced attribute to appear in the instance document
-in the context of the referencing declaration. The menu option to add an attribute
-reference only appears if there are global attributes defined elsewhere in
-the document. Select the reference, then select the global attribute you want
-it to reference from the <span class="uicontrol">ref</span> list.</li>
-
-<li class="stepexpand"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, right-click in the Attributes
-page, and click <span class="uicontrol">Add Attribute Group Ref</span>.</span> A
-declaration that references an attribute group enables the referenced attribute
-group to appear in the instance document in the context of the referencing
-declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document. Select the
-reference, then select the attribute group you want it to reference from the <span class="uicontrol">ref</span> list.
-</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
-to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
-enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page and click <span class="uicontrol">Add Any Attribute</span>.</span>
- You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
-namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
-as it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
-
-</ul>
-</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section">You can add a content model to a global element, which is the representation
-of any data that can be contained inside the global element. For more information
-about working with content models, refer to the related tasks.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
deleted file mode 100644
index 3aa051e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddgrpr" xml:lang="en-us">

-<title>Adding group references</title>

-<titlealts>

-<searchtitle>Adding group references</searchtitle>

-</titlealts>

-<shortdesc>A group reference is a declaration that references a group. It

-enables the referenced group to appear in the instance document in the context

-of the referencing declaration.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>group features</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>group features</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>The menu option to add a group reference only appears if there are

-groups defined elsewhere in the document.<p>The following instructions were

-written for the Resource perspective, but they will also work in many other

-perspectives.</p><p>To add a group reference, follow these steps:</p></context>

-<steps>

-<step><cmd>In the Design view, right-click the content model you want to work

-with and select <uicontrol>Add Group Ref</uicontrol>.</cmd></step>

-<step><cmd>Select the new group reference.</cmd></step>

-<step><cmd>In the Properties view, select the group you want to refer to in

-the <uicontrol>ref</uicontrol> list.</cmd></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this group reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002277?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
deleted file mode 100644
index 130e49a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding group references" />
-<meta name="abstract" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
-<meta name="description" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, adding, group references, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, group references, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrup.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddgrpr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding group references</title>
-</head>
-<body id="taddgrpr"><a name="taddgrpr"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding group references</h1>
-
-
-
-
-<div><p>A group reference is a declaration that references a group. It
-enables the referenced group to appear in the instance document in the context
-of the referencing declaration.</p>
-
-<div class="section">The menu option to add a group reference only appears if there are
-groups defined elsewhere in the document.<p>The following instructions were
-written for the Resource perspective, but they will also work in many other
-perspectives.</p>
-<p>To add a group reference, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click the content model you want to work
-with and select <span class="uicontrol">Add Group Ref</span>.</span></li>
-
-<li class="stepexpand"><span>Select the new group reference.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, select the group you want to refer to in
-the <span class="uicontrol">ref</span> list.</span></li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddgrup.html" title="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references.">Adding groups</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
deleted file mode 100644
index 5dce7f2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddgrup" xml:lang="en-us">

-<title>Adding groups</title>

-<titlealts>

-<searchtitle>Adding groups</searchtitle>

-</titlealts>

-<shortdesc>When you create a group, it automatically contains a content model.

-The content model is a representation of any data that can be grouped together

-by the group, such as elements, element references, and group references.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>groups</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>groups</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p></p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add a group, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click <b>Groups</b>, and click <uicontrol>Add

-Group</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, type a new name for the group in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this group element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to

-specify the schema and add XML content to your annotations.</info></step>

-<step><cmd>In the Outline view, expand the <uicontrol>Groups</uicontrol> folder

-and your new group.</cmd></step>

-<step><cmd>Your group automatically contains a content model. </cmd><info>A

-group's content model is the representation of any data that can be contained

-inside the group. For more information about working with content models,

-refer to the related tasks.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002502?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
deleted file mode 100644
index b8141ed..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding groups" />
-<meta name="abstract" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
-<meta name="description" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
-<meta content="XML schema editor, adding, groups, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, groups, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrpr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddgrup" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding groups</title>
-</head>
-<body id="taddgrup"><a name="taddgrup"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding groups</h1>
-
-
-
-
-<div><p>When you create a group, it automatically contains a content model.
-The content model is a representation of any data that can be grouped together
-by the group, such as elements, element references, and group references.</p>
-
-<div class="section"><p />
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add a group, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click <strong>Groups</strong>, and click <span class="uicontrol">Add
-Group</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, type a new name for the group in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to
-specify the schema and add XML content to your annotations.</li>
-
-<li class="stepexpand"><span>In the Outline view, expand the <span class="uicontrol">Groups</span> folder
-and your new group.</span></li>
-
-<li class="stepexpand"><span>Your group automatically contains a content model. </span> A
-group's content model is the representation of any data that can be contained
-inside the group. For more information about working with content models,
-refer to the related tasks.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddgrpr.html" title="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration.">Adding group references</a></div>
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
deleted file mode 100644
index 0188c47..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddimpt" xml:lang="en-us">

-<title>Adding import elements</title>

-<titlealts>

-<searchtitle>Adding import elements</searchtitle>

-</titlealts>

-<shortdesc>As schemas become larger, it is often desirable to divide their

-content among several schema documents for purposes such as ease of maintenance,

-reuse, and readability. You can use an <codeph>import</codeph> element to

-bring in definitions and declarations from an imported schema into the current

-schema. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>import elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>import elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The imported schema can come from a different namespace than the

-current schema does.</p><p>You can add multiple import elements to an XML

-schema, however, prefixes and namespaces have to unique amongst the imported

-schemas.</p><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add an import

-element, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, select your schema.</cmd><info>The entire

-schema and its contents should be displayed in the Design view.</info></step>

-<step><cmd>In the Design view, right click in the <b>Directives</b> section

-and click <uicontrol>Add Import</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image

-href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to

-the right of the <uicontrol>Schema location</uicontrol> field.</cmd></step>

-<step><cmd>If you want to import an XML schema located in the workbench:</cmd>

-<substeps>

-<substep><cmd>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </cmd>

-</substep>

-<substep><cmd>Select the schema you want to import and click <uicontrol>Finish</uicontrol>.</cmd>

-</substep>

-</substeps>

-</step>

-<step><cmd>If you want to import an XML schema located on the Web:</cmd>

-<substeps>

-<substep><cmd>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</cmd>

-</substep>

-<substep><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>

-<info><note>A local copy of the schema will not be stored in the workbench.

-Every time you validate your schema, the schema's contents will be checked

-from the URL you specify.</note></info></substep>

-</substeps>

-</step>

-<step><cmd>The XML schema editor will retrieve the namespace for the imported

-XML schema file and display it as read-only in the <uicontrol>Namespace</uicontrol> field.</cmd>

-</step>

-<step><cmd>If necessary, type a unique prefix for this namespace in the <uicontrol>Prefix</uicontrol> field.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this import element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<result><p>Once you have added an import element to your XML schema, when

-you define new elements, attributes, complex types, or simple types where

-you can specify type information, any declarations from the included schema

-will be available in the <uicontrol>Type</uicontrol> list for the element,

-attribute, complex or simple type.</p></result>

-<postreq></postreq>

-</taskbody>

-</task>

-<?Pub *0000004340?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
deleted file mode 100644
index d6946ec..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding import elements" />
-<meta name="abstract" content="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use an import element to bring in definitions and declarations from an imported schema into the current schema." />
-<meta name="description" content="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use an import element to bring in definitions and declarations from an imported schema into the current schema." />
-<meta content="XML schema editor, adding, import elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, import elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddimpt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding import elements</title>
-</head>
-<body id="taddimpt"><a name="taddimpt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding import elements</h1>
-
-
-
-
-<div><p>As schemas become larger, it is often desirable to divide their
-content among several schema documents for purposes such as ease of maintenance,
-reuse, and readability. You can use an <samp class="codeph">import</samp> element to
-bring in definitions and declarations from an imported schema into the current
-schema. </p>
-
-<div class="section"><p>The imported schema can come from a different namespace than the
-current schema does.</p>
-<p>You can add multiple import elements to an XML
-schema, however, prefixes and namespaces have to unique amongst the imported
-schemas.</p>
-<p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an import
-element, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Design view.</li>
-
-<li class="stepexpand"><span>In the Design view, right click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Import</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span></li>
-
-<li class="stepexpand"><span>If you want to import an XML schema located in the workbench:</span>
-<ol type="a">
-<li><span>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </span>
-</li>
-
-<li><span>Select the schema you want to import and click <span class="uicontrol">Finish</span>.</span>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>If you want to import an XML schema located on the Web:</span>
-<ol type="a">
-<li class="substepexpand"><span>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="substepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
- <div class="note"><span class="notetitle">Note:</span> A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>The XML schema editor will retrieve the namespace for the imported
-XML schema file and display it as read-only in the <span class="uicontrol">Namespace</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>If necessary, type a unique prefix for this namespace in the <span class="uicontrol">Prefix</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this import element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>Once you have added an import element to your XML schema, when
-you define new elements, attributes, complex types, or simple types where
-you can specify type information, any declarations from the included schema
-will be available in the <span class="uicontrol">Type</span> list for the element,
-attribute, complex or simple type.</p>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-<div><a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents.">Adding redefine elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
deleted file mode 100644
index bdc5924..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddincl" xml:lang="en-us">

-<title>Adding include elements</title>

-<titlealts>

-<searchtitle>Adding include elements</searchtitle>

-</titlealts>

-<shortdesc>As schemas become larger, it is often desirable to divide their

-content among several schema documents for purposes such as ease of maintenance,

-reuse, and readability. You can use the <codeph>include</codeph> element to

-bring in definitions and declarations from the included schema

-into the current schema. The included schema must be in the same target namespace

-as the including schema. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>include elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>include elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the XML perspective,

-but they will also work in many other perspectives.</p><p>To add an include

-element, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, select your schema.</cmd><info>The entire

-schema and its contents are displayed in the Design view.</info></step>

-<step><cmd>In the Design view, right-click in the <b>Directives</b> section

-and click <uicontrol>Add Include</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image

-href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to

-the right of the <uicontrol>Schema location</uicontrol> field.</cmd><info>The

-XML schema file you select must have the same namespace as the current schema.</info>

-</step>

-<step><cmd>If you want to select an XML schema located in the workbench, select <uicontrol>Workbench

-projects</uicontrol> and click <uicontrol>Next</uicontrol>. </cmd></step>

-<step><cmd>Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>

-</step>

-<step><cmd>If you want to select an XML schema located on the Web, select <uicontrol>HTTP</uicontrol> and

-click <uicontrol>Next</uicontrol>.</cmd></step>

-<step><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>

-<info><note> A local copy of the schema will not be stored in the workbench.

-Every time you validate your schema, the schema's contents will be checked

-from the URL you specify.</note></info></step>

-<step><cmd>The XML schema editor will retrieve the location of the included

-XML schema file, and display it in the <uicontrol>Schema location</uicontrol> field.

-This field can be edited at any time to reflect the location of the XML schema

-file.</cmd></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this include element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<result><p>Once you have added the include element to your XML schema, when

-you define new elements, attributes, complex types, or simple types where

-you can specify type information, any declarations from the included schema

-will be available in the <uicontrol>Type</uicontrol> list for the element,

-attribute, complex or simple type.</p><p>For example, if Address.xsd has the

-following content:</p><codeblock>&lt;complexType name="Address">

-    &lt;sequence>

-        &lt;element name="name" type="string">

-        &lt;element name="street" type="string">

-    &lt;/sequence>

-&lt;/complexType>

-</codeblock>and you have an XML schema called PurchaseOrder.xsd that has added

-an include for Address.xsd, then when defining a new element in  PurchaseOrder,

-you can select Address as its type.  <p>(c) Copyright 2001, World Wide Web

-Consortium (Massachusetts Institute of Technology, Institut National de Recherche

-en Informatique et en Automatique, Keio University).</p></result>

-</taskbody>

-</task>

-<?Pub *0000004728?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
deleted file mode 100644
index 7abba83..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding include elements" />
-<meta name="abstract" content="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema." />
-<meta name="description" content="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema." />
-<meta content="XML schema editor, adding, include elements, XML schema files, include elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, include elements, XML schema files, include elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddincl" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding include elements</title>
-</head>
-<body id="taddincl"><a name="taddincl"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding include elements</h1>
-
-
-
-
-<div><p>As schemas become larger, it is often desirable to divide their
-content among several schema documents for purposes such as ease of maintenance,
-reuse, and readability. You can use the <samp class="codeph">include</samp> element to
-bring in definitions and declarations from the included schema
-into the current schema. The included schema must be in the same target namespace
-as the including schema. </p>
-
-<div class="section"><p>The following instructions were written for the XML perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an include
-element, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Include</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span> The
-XML schema file you select must have the same namespace as the current schema.
-</li>
-
-<li class="stepexpand"><span>If you want to select an XML schema located in the workbench, select <span class="uicontrol">Workbench
-projects</span> and click <span class="uicontrol">Next</span>. </span></li>
-
-<li class="stepexpand"><span>Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span>
-</li>
-
-<li class="stepexpand"><span>If you want to select an XML schema located on the Web, select <span class="uicontrol">HTTP</span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
- <div class="note"><span class="notetitle">Note:</span>  A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-
-<li class="stepexpand"><span>The XML schema editor will retrieve the location of the included
-XML schema file, and display it in the <span class="uicontrol">Schema location</span> field.
-This field can be edited at any time to reflect the location of the XML schema
-file.</span></li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this include element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>Once you have added the include element to your XML schema, when
-you define new elements, attributes, complex types, or simple types where
-you can specify type information, any declarations from the included schema
-will be available in the <span class="uicontrol">Type</span> list for the element,
-attribute, complex or simple type.</p>
-<p>For example, if Address.xsd has the
-following content:</p>
-<pre>&lt;complexType name="Address"&gt;
-    &lt;sequence&gt;
-        &lt;element name="name" type="string"&gt;
-        &lt;element name="street" type="string"&gt;
-    &lt;/sequence&gt;
-&lt;/complexType&gt;
-</pre>
-and you have an XML schema called PurchaseOrder.xsd that has added
-an include for Address.xsd, then when defining a new element in  PurchaseOrder,
-you can select Address as its type.  <p>(c) Copyright 2001, World Wide Web
-Consortium (Massachusetts Institute of Technology, Institut National de Recherche
-en Informatique et en Automatique, Keio University).</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents.">Adding redefine elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
deleted file mode 100644
index 2728d05..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddnot" xml:lang="en-us">

-<title>Adding notations</title>

-<titlealts>

-<searchtitle>Adding notations</searchtitle>

-</titlealts>

-<shortdesc>A notation is a means of associating a binary description with

-an entity or attribute. The most common uses of notations are to include familiar

-types of binary references, such as GIFs and JPGs, in an XML file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>notations</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>notations</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example, you are making a catalogue of your clothing and want

-to include an image of one of your shirts. You would have to create a notation

-like this:  <userinput>&lt;notation name="My_Shirt" system="GIF">&lt;/notation></userinput> which

-defines a notation for a GIF image.</p><p>The following instructions were

-written for the Resource perspective, but they will also work in many other

-perspectives.</p><p>To create a notation, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click your XML schema and click <uicontrol>Add

-Notation</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, type the name of the notation in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Other</uicontrol> tab.</cmd></step>

-<step><cmd>In the <uicontrol>public</uicontrol> field, type a public identifier.</cmd>

-<info> This is optional if you enter a value in the <uicontrol>system</uicontrol> field.</info>

-</step>

-<step><cmd>In the <uicontrol>system</uicontrol> field, type a URI reference.</cmd>

-<info> This is optional if you enter a value in the <uicontrol>public</uicontrol> field.</info>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this notation.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description. <uicontrol>App

-Info</uicontrol> page can be used to provide information for applications.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002959?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
deleted file mode 100644
index 75078b0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding notations</title>
-</head>
-<body id="taddnot"><a name="taddnot"><!-- --></a>
-
-<h1 class="topictitle1">Adding notations</h1>
-<div><p>A notation is a means of associating a binary description with
-an entity or attribute. The most common uses of notations are to include familiar
-types of binary references, such as GIFs and JPGs, in an XML file.</p>
-<div class="section"><p>For example, you are making a catalogue of your clothing and want
-to include an image of one of your shirts. You would have to create a notation
-like this:  <kbd class="userinput">&lt;notation name="My_Shirt" system="GIF"&gt;&lt;/notation&gt;</kbd> which
-defines a notation for a GIF image.</p>
-<p>The following instructions were written for the Resource perspective, but 
-they will also work in many other perspectives.</p>
-<p>To
-create a notation, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click your XML schema and click 
-<b> <span class="uicontrol">Add
-Notation</span></b>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the notation in the 
-<b> <span class="uicontrol">Name</span></b> field.</span></li>
-<li class="skipspace"><span>Click the <b> <span class="uicontrol">Other</span></b> tab.</span></li>
-<li class="skipspace"><span>In the <b> <span class="uicontrol">public</span></b> field, type a public identifier.</span>  This is optional if you enter a value in the 
-<b> <span class="uicontrol">system</span></b> field.</li>
-<li class="skipspace"><span>In the <b> <span class="uicontrol">system</span></b> field, type a URI reference.</span>  This is optional if you enter a value in the 
-<b> <span class="uicontrol">public</span></b> field.</li>
-<li class="skipspace"><span>Click the <b> <span class="uicontrol">Documentation</span></b> tab if you want
-to provide any information about this notation.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications.</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
deleted file mode 100644
index 78fc383..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddrdfn" xml:lang="en-us">

-<title>Adding redefine elements</title>

-<titlealts>

-<searchtitle>Adding redefine elements</searchtitle>

-</titlealts>

-<shortdesc>You can use the <codeph>redefine</codeph> mechanism to redefine

-simple and complex types, groups, and attribute groups obtained from external

-schema files. When you redefine a component, you are modifying its contents.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>adding redefine elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>adding redefine elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>Like the <codeph>include</codeph> mechanism, <codeph>redefine</codeph> requires

-the external components to be in the same target namespace as the redefining

-schema, although external components from schemas that have no namespace can

-also be redefined.</p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add a redefine element:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, select your schema.</cmd><info>The entire

-schema and its contents are displayed in the Design view.</info></step>

-<step><cmd>In the Design view, right-click in the <b>Directives</b> section

-and click <uicontrol>Add Redefine</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image

-href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to

-the right of the <uicontrol>Schema location</uicontrol> field.</cmd>

-<info>The XML schema file you select must have the same namespace as the current

-schema.</info></step>

-<step><cmd>If you want to select an XML schema located in the workbench, select <uicontrol>Workbench

-projects</uicontrol> and click <uicontrol>Next.</uicontrol></cmd></step>

-<step><cmd>Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>

-</step>

-<step><cmd>If you want to select an XML schema located on the Web, select <uicontrol>HTTP</uicontrol> and

-click <uicontrol>Next</uicontrol>.</cmd></step>

-<step><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>

-<info> <note>A local copy of the schema will not be stored in the workbench.

-Every time you validate your schema, the schema's contents will be checked

-from the URL you specify.</note></info></step>

-<step><cmd>The XML schema editor will retrieve the location of the included

-XML schema file, and display it in the <uicontrol>Schema location</uicontrol> field.

-This field can be edited at any time to reflect the location of the XML schema

-file.</cmd></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this redefine element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<result><p>Once you have added the redefine element to your XML schema, you

-can redefine any of the simple and complex types, groups, and attribute groups

-in the XML schema you selected in the redefine element. </p></result>

-</taskbody>

-</task>

-<?Pub *0000004055?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
deleted file mode 100644
index d7820c8..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding redefine elements" />
-<meta name="abstract" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
-<meta name="description" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
-<meta content="XML schema editor, adding, redefine elements, XML schema files, redefine elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, redefine elements, XML schema files, redefine elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddrdfn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding redefine elements</title>
-</head>
-<body id="taddrdfn"><a name="taddrdfn"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding redefine elements</h1>
-
-
-
-
-<div><p>You can use the <samp class="codeph">redefine</samp> mechanism to redefine
-simple and complex types, groups, and attribute groups obtained from external
-schema files. When you redefine a component, you are modifying its contents.</p>
-
-<div class="section"><p>Like the <samp class="codeph">include</samp> mechanism, <samp class="codeph">redefine</samp> requires
-the external components to be in the same target namespace as the redefining
-schema, although external components from schemas that have no namespace can
-also be redefined.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add a redefine element:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Redefine</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span>
- The XML schema file you select must have the same namespace as the current
-schema.</li>
-
-<li class="stepexpand"><span>If you want to select an XML schema located in the workbench, select <span class="uicontrol">Workbench
-projects</span> and click <span class="uicontrol">Next.</span></span></li>
-
-<li class="stepexpand"><span>Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span>
-</li>
-
-<li class="stepexpand"><span>If you want to select an XML schema located on the Web, select <span class="uicontrol">HTTP</span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
-  <div class="note"><span class="notetitle">Note:</span> A local copy of the schema will not be stored in the workbench.
-Every time you validate your schema, the schema's contents will be checked
-from the URL you specify.</div>
-</li>
-
-<li class="stepexpand"><span>The XML schema editor will retrieve the location of the included
-XML schema file, and display it in the <span class="uicontrol">Schema location</span> field.
-This field can be edited at any time to reflect the location of the XML schema
-file.</span></li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this redefine element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>Once you have added the redefine element to your XML schema, you
-can redefine any of the simple and complex types, groups, and attribute groups
-in the XML schema you selected in the redefine element. </p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
deleted file mode 100644
index 3122220..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddreg" xml:lang="en-us">

-<title>Adding pattern facets to simple types</title>

-<titlealts>

-<searchtitle>Adding pattern facets to simple types</searchtitle>

-</titlealts>

-<shortdesc>A pattern facet can be used to constrain the value of a type's

-lexical space (the set of string literals that represent the values of a type),

-which indirectly constrains the value space.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>pattern facets</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>pattern facets</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> The value of the pattern is called a regular expression. You

-can specify it using the <uicontrol>Regular Expression</uicontrol> wizard.</p><p>To

-add a pattern to a simple type:</p></context>

-<steps>

-<step><cmd>In the Design view, select the simple type you want to work with.</cmd>

-</step>

-<step><cmd>In the Properties view, click the <uicontrol>Constraints</uicontrol> tab,

-then <uicontrol>Patterns</uicontrol>.</cmd></step>

-<step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The Regular Expression

-wizard opens.</info></step>

-<step><cmd>Select the token you want to add to the expression.</cmd></step>

-<step><cmd>Indicate how often you want the token to appear in order for a

-match to succeed:</cmd>

-<choices>

-<choice>If you want the token to repeat, click <uicontrol>Repeat</uicontrol> and

-specify the number of times the token must appear.</choice>

-</choices>

-<choices>

-<choice> If you want to specify a minimum and maximum number of times the

-token can appear, click <uicontrol>Range</uicontrol> and enter a minimum and

-maximum value.</choice>

-</choices>

-</step>

-<step><cmd>To add the token to the regular expression, click <uicontrol>Add</uicontrol>. </cmd>

-</step>

-<step><cmd>To create the entire expression, repeat steps 4 - 6 as necessary.</cmd>

-</step>

-<step><cmd>When you are finished, click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>(Optional) To test against the regular expression and see if a

-match occurs, enter sample text.</cmd></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult> The regular

-expression will appear in the Patterns page. <note type="tip"> To edit an

-existing pattern, select it in the Patterns page and click <uicontrol>Edit</uicontrol>.

-To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. </note></stepresult>

-</step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002952?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
deleted file mode 100644
index 2a0c07a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding pattern facets to simple types" />
-<meta name="abstract" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
-<meta name="description" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
-<meta content="XML schema editor, adding, pattern facets, XML schema files, pattern facets, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, pattern facets, XML schema files, pattern facets, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddsmpt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddreg" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding pattern facets to simple types</title>
-</head>
-<body id="taddreg"><a name="taddreg"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding pattern facets to simple types</h1>
-
-
-
-
-<div><p>A pattern facet can be used to constrain the value of a type's
-lexical space (the set of string literals that represent the values of a type),
-which indirectly constrains the value space.</p>
-
-<div class="section"><p> The value of the pattern is called a regular expression. You
-can specify it using the <span class="uicontrol">Regular Expression</span> wizard.</p>
-<p>To
-add a pattern to a simple type:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, select the simple type you want to work with.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">Constraints</span> tab,
-then <span class="uicontrol">Patterns</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Add</span>.</span> The Regular Expression
-wizard opens.</li>
-
-<li class="stepexpand"><span>Select the token you want to add to the expression.</span></li>
-
-<li class="stepexpand"><span>Indicate how often you want the token to appear in order for a
-match to succeed:</span>
-<ul>
-<li>If you want the token to repeat, click <span class="uicontrol">Repeat</span> and
-specify the number of times the token must appear.</li>
-
-</ul>
-
-<ul>
-<li> If you want to specify a minimum and maximum number of times the
-token can appear, click <span class="uicontrol">Range</span> and enter a minimum and
-maximum value.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>To add the token to the regular expression, click <span class="uicontrol">Add</span>. </span>
-</li>
-
-<li class="stepexpand"><span>To create the entire expression, repeat steps 4 - 6 as necessary.</span>
-</li>
-
-<li class="stepexpand"><span>When you are finished, click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>(Optional) To test against the regular expression and see if a
-match occurs, enter sample text.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span>  The regular
-expression will appear in the Patterns page. <div class="tip"><span class="tiptitle">Tip:</span>  To edit an
-existing pattern, select it in the Patterns page and click <span class="uicontrol">Edit</span>.
-To delete an existing pattern, select it in the Patterns page and click <span class="uicontrol">Delete</span>. </div>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddsmpt.html" title="Simple types are used to create derived datatypes. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype.">Adding simple types</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
deleted file mode 100644
index 189a8ac..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddsmpt" xml:lang="en-us">

-<title>Adding simple types</title>

-<titlealts>

-<searchtitle>Adding simple types</searchtitle>

-</titlealts>

-<shortdesc>Simple types are used to create derived datatypes.

-They provide a set of constraints on the value space (a set of values) and

-the lexical space (a set of valid literals) of a datatype.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>simple types</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>simple types</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>A simple type cannot have element content and cannot carry attributes.

-Elements that contain numbers (and strings, and dates, and so on) but do not

-contain any sub-elements have a simple type.</p><p>The following instructions

-were written for the Resource perspective, but they will also work in many

-other perspectives.</p><p>To add a simple type:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click <b>Types</b>, and click <uicontrol>Add

-Simple Type</uicontrol>.</cmd></step>

-<step><cmd>In the Outline view, select the new simple type.</cmd></step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>

-</step>

-<step><cmd>Type a new name for the simple type in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>You can select the following options from the <uicontrol>Variety</uicontrol> list:</cmd>

-<choices>

-<choice><uicontrol>atomic</uicontrol>. Atomic types are all the simple types

-built into the XML schema language.</choice>

-<choice><uicontrol>list</uicontrol>. List types are comprised of sequences

-of atomic types. They have values that are comprised of finite-length sequences

-of atomic values. </choice>

-<choice><uicontrol>union</uicontrol>. A union type enables an element or attribute

-value to be one or more instances of one type drawn from the union of multiple

-atomic and list types.</choice>

-</choices>

-</step>

-<step><cmd>If you selected <uicontrol>atomic</uicontrol> from the <uicontrol>Variety</uicontrol> list,

-click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This

-graphic is the Browse button</alt></image> next to the <uicontrol>Base type</uicontrol> field

-to specify a base type for the simple type.</cmd><info>The Set Type dialog

-box lists all built-in and user-defined types currently available. You can

-change the <uicontrol>Scope</uicontrol> of the list by selecting one of the

-following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></info></step>

-<step><cmd>If you selected <uicontrol>list</uicontrol> from the <uicontrol>Variety</uicontrol> list,

-click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This

-graphic is the Browse button</alt></image> next to the <uicontrol>Item type</uicontrol> field

-to specify a item type for the simple type.</cmd><info>The Set Type dialog

-box lists all built-in and user-defined types currently available. You can

-change the <uicontrol>Scope</uicontrol> of the list by selecting one of the

-following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available within

-the selected working set.</li>

-</ul></info></step>

-<step><cmd>If you selected <uicontrol>union</uicontrol> from the <uicontrol>Variety</uicontrol> list,

-click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This

-graphic is the Browse button</alt></image> next to the <uicontrol>Member types</uicontrol> field

-to specify the member types for the simple type.</cmd><info>You can select

-to add both <uicontrol>Built-in simple types</uicontrol> and <uicontrol>User-defined

-simple types</uicontrol> to the member types value list. </info></step>

-<step><cmd>Click the <uicontrol>Constraints</uicontrol> tab.</cmd><info>From

-here you will be able to set specific constraint values including length constraints,

-enumerations, and patterns. </info>

-<substeps>

-<substep><cmd>Enumerations help you to define a set of valid values for simple

-types. They are the actual values the simple type can take as valid values

-in the instance document. You can either add one enumeration or several enumerations

-at a time:</cmd><info><ul>

-<li>To add one enumeration at a time, under <uicontrol>Specific constraint

-values</uicontrol>, select <uicontrol>Enumerations</uicontrol> and click <uicontrol>Add</uicontrol> and

-specify a value for the enumeration.</li>

-<li>To add several enumerations at one time, follow these steps:<ol>

-<li>Select <uicontrol>Enumerations</uicontrol>.</li>

-<li>Click <uicontrol>Add</uicontrol>.</li>

-<li>Enter the value of each enumeration. Each value must be separated by the <uicontrol>Delimiter

-character</uicontrol>. For example: <codeph>First, Second</codeph> will create

-two enumerations, one with the value "First" and one with the value "Second".</li>

-<li>Select the <uicontrol>Preserve leading and trailing whitespace</uicontrol> check

-box if you want any white space around your enumeration values to be preserved.

-If you select this check box, the values of <codeph>First, Second</codeph> will

-show up as "First" and " Second" (there is a space before Second) because

-you put a space before "Second" when entering the value.</li>

-<li>Click <uicontrol>OK</uicontrol>. Your enumerations will be created and

-appear in the Properties view.</li>

-</ol></li>

-</ul></info></substep>

-<substep><cmd>Patterns help you to place certain constraints regarding allowable

-values.</cmd><info>For example, you could restrict the field to only accept

-input which follows the pattern "five digits followed by two upper-case ASCII

-letters". To set a pattern constraint:<ol>

-<li>Select <uicontrol>Patterns</uicontrol>.</li>

-<li>Click <uicontrol>Add</uicontrol>.</li>

-<li>Create the regular expression pattern you wish to use as your constraint

-using the <uicontrol>Regular Expression</uicontrol> wizard.</li>

-<li>Click <uicontrol>Finish</uicontrol>.</li>

-</ol></info></substep>

-</substeps>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this simple type.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000007829?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
deleted file mode 100644
index f699167..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding simple types" />
-<meta name="abstract" content="Simple types are used to create derived datatypes. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype." />
-<meta name="description" content="Simple types are used to create derived datatypes. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype." />
-<meta content="XML schema editor, adding, simple types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, simple types, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddreg.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddsmpt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding simple types</title>
-</head>
-<body id="taddsmpt"><a name="taddsmpt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding simple types</h1>
-
-
-
-
-<div><p>Simple types are used to create derived datatypes.
-They provide a set of constraints on the value space (a set of values) and
-the lexical space (a set of valid literals) of a datatype.</p>
-
-<div class="section"><p>A simple type cannot have element content and cannot carry attributes.
-Elements that contain numbers (and strings, and dates, and so on) but do not
-contain any sub-elements have a simple type.</p>
-<p>The following instructions
-were written for the Resource perspective, but they will also work in many
-other perspectives.</p>
-<p>To add a simple type:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click <strong>Types</strong>, and click <span class="uicontrol">Add
-Simple Type</span>.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select the new simple type.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>Type a new name for the simple type in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>You can select the following options from the <span class="uicontrol">Variety</span> list:</span>
-<ul>
-<li><span class="uicontrol">atomic</span>. Atomic types are all the simple types
-built into the XML schema language.</li>
-
-<li><span class="uicontrol">list</span>. List types are comprised of sequences
-of atomic types. They have values that are comprised of finite-length sequences
-of atomic values. </li>
-
-<li><span class="uicontrol">union</span>. A union type enables an element or attribute
-value to be one or more instances of one type drawn from the union of multiple
-atomic and list types.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">atomic</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Base type</span> field
-to specify a base type for the simple type.</span> The Set Type dialog
-box lists all built-in and user-defined types currently available. You can
-change the <span class="uicontrol">Scope</span> of the list by selecting one of the
-following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">list</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Item type</span> field
-to specify a item type for the simple type.</span> The Set Type dialog
-box lists all built-in and user-defined types currently available. You can
-change the <span class="uicontrol">Scope</span> of the list by selecting one of the
-following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">union</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Member types</span> field
-to specify the member types for the simple type.</span> You can select
-to add both <span class="uicontrol">Built-in simple types</span> and <span class="uicontrol">User-defined
-simple types</span> to the member types value list. </li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Constraints</span> tab.</span> From
-here you will be able to set specific constraint values including length constraints,
-enumerations, and patterns. 
-<ol type="a">
-<li class="substepexpand"><span>Enumerations help you to define a set of valid values for simple
-types. They are the actual values the simple type can take as valid values
-in the instance document. You can either add one enumeration or several enumerations
-at a time:</span> <ul>
-<li>To add one enumeration at a time, under <span class="uicontrol">Specific constraint
-values</span>, select <span class="uicontrol">Enumerations</span> and click <span class="uicontrol">Add</span> and
-specify a value for the enumeration.</li>
-
-<li>To add several enumerations at one time, follow these steps:<ol type="i">
-<li>Select <span class="uicontrol">Enumerations</span>.</li>
-
-<li>Click <span class="uicontrol">Add</span>.</li>
-
-<li>Enter the value of each enumeration. Each value must be separated by the <span class="uicontrol">Delimiter
-character</span>. For example: <samp class="codeph">First, Second</samp> will create
-two enumerations, one with the value "First" and one with the value "Second".</li>
-
-<li>Select the <span class="uicontrol">Preserve leading and trailing whitespace</span> check
-box if you want any white space around your enumeration values to be preserved.
-If you select this check box, the values of <samp class="codeph">First, Second</samp> will
-show up as "First" and " Second" (there is a space before Second) because
-you put a space before "Second" when entering the value.</li>
-
-<li>Click <span class="uicontrol">OK</span>. Your enumerations will be created and
-appear in the Properties view.</li>
-
-</ol>
-</li>
-
-</ul>
-</li>
-
-<li class="substepexpand"><span>Patterns help you to place certain constraints regarding allowable
-values.</span> For example, you could restrict the field to only accept
-input which follows the pattern "five digits followed by two upper-case ASCII
-letters". To set a pattern constraint:<ol type="i">
-<li>Select <span class="uicontrol">Patterns</span>.</li>
-
-<li>Click <span class="uicontrol">Add</span>.</li>
-
-<li>Create the regular expression pattern you wish to use as your constraint
-using the <span class="uicontrol">Regular Expression</span> wizard.</li>
-
-<li>Click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this simple type.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddreg.html" title="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space.">Adding pattern facets to simple types</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
deleted file mode 100644
index bde45d1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tcxmlsch" xml:lang="en-us">

-<title>Creating XML schemas</title>

-<titlealts>

-<searchtitle>Creating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>You can create an XML schema and then edit it using the XML schema

-editor. Using the XML schema editor, you can specify element names that indicates

-which elements are allowed in an XML file, and in which combinations.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To create an XML schema, follow these steps:</context>

-<steps>

-<step><cmd>Create a project to contain the XML schema.</cmd></step>

-<step><cmd>In the workbench, select  <menucascade><uicontrol>File > New >

-Other > XML > XML Schema</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the project or folder that will contain the XML schema.

-In the </cmd><info><uicontrol>File name</uicontrol> field, type the name of

-the XML schema, for example <userinput>MyXMLSchema.xsd</userinput>. The name

-of your XML schema must end in <systemoutput>.xsd</systemoutput>.</info></step>

-<step><cmd>Click  <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result>The XML schema opens in the XML schema editor. </result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
deleted file mode 100644
index 9aec932..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML schemas" />
-<meta name="abstract" content="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta name="description" content="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta content="XML schema files, creating" name="DC.subject" />
-<meta content="XML schema files, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcxmlsch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML schemas</title>
-</head>
-<body id="tcxmlsch"><a name="tcxmlsch"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML schemas</h1>
-
-
-
-
-<div><p>You can create an XML schema and then edit it using the XML schema
-editor. Using the XML schema editor, you can specify element names that indicates
-which elements are allowed in an XML file, and in which combinations.</p>
-
-<div class="section">To create an XML schema, follow these steps:</div>
-
-<ol>
-<li class="stepexpand"><span>Create a project to contain the XML schema.</span></li>
-
-<li class="stepexpand"><span>In the workbench, select  <span class="menucascade"><span class="uicontrol">File &gt; New &gt;
-Other &gt; XML &gt; XML Schema</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the project or folder that will contain the XML schema.
-In the </span> <span class="uicontrol">File name</span> field, type the name of
-the XML schema, for example <kbd class="userinput">MyXMLSchema.xsd</kbd>. The name
-of your XML schema must end in <tt class="sysout">.xsd</tt>.</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section">The XML schema opens in the XML schema editor. </div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
deleted file mode 100644
index 8c1475c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tdelscmp" xml:lang="en-us">

-<title>Deleting XML schema components</title>

-<titlealts>

-<searchtitle>Deleting XML schema components</searchtitle>

-</titlealts>

-<shortdesc>If you have created any XML schema components you no longer need,

-you can delete them.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>deleting components</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>deleting components</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To delete an XML

-schema component, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, click the item to delete.</cmd></step>

-<step><cmd>Right-click the item, and, from its pop-up menu, click <uicontrol>Delete</uicontrol>.</cmd>

-</step>

-</steps>

-<result><p>The XML schema editor has a built-in mechanism to handle referential

-integrity issues. When you delete certain components, cleanup will automatically

-occur.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
deleted file mode 100644
index a4cc200..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Deleting XML schema components" />
-<meta name="abstract" content="If you have created any XML schema components you no longer need, you can delete them." />
-<meta name="description" content="If you have created any XML schema components you no longer need, you can delete them." />
-<meta content="XML schema editor, deleting, components, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, deleting, components, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rrefintg.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tdelscmp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Deleting XML schema components</title>
-</head>
-<body id="tdelscmp"><a name="tdelscmp"><!-- --></a>
-
-
-<h1 class="topictitle1">Deleting XML schema components</h1>
-
-
-
-
-<div><p>If you have created any XML schema components you no longer need,
-you can delete them.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To delete an XML
-schema component, follow these steps:</p>
-</div>
-
-<ol>
-<li><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li><span>In the Outline view, click the item to delete.</span></li>
-
-<li><span>Right-click the item, and, from its pop-up menu, click <span class="uicontrol">Delete</span>.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML schema editor has a built-in mechanism to handle referential
-integrity issues. When you delete certain components, cleanup will automatically
-occur.</p>
-</div>
-
-</div>
-
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rrefintg.html" title="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur.">Referential integrity in the XML schema editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
deleted file mode 100644
index 6276242..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tedtpref" xml:lang="en-us">

-<title>Editing XML schema file preferences</title>

-<titlealts>

-<searchtitle>Editing XML schema file preferences</searchtitle>

-</titlealts>

-<shortdesc>You can set various preferences for XML schema files such as the

-default target namespace and XML Schema language constructs prefix used.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>editing preferences</indexterm></indexterm>

-<indexterm>preferences<indexterm>XML schema files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To define XML schema file preferences, follow these steps:</p></context>

-<steps>

-<step><cmd>Select  <menucascade><uicontrol>Window > Preferences > Web and

-XML > XML Schema Files</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select the <uicontrol>Qualify XML schema language constructs</uicontrol> check

-box if you want a prefix applied to all XML Schema language constructs in

-your XML schema.</cmd></step>

-<step><cmd>In the <uicontrol>XML schema language constructs prefix</uicontrol> field,

-type the prefix you want applied to XML Schema language constructs in your

-XML schema.</cmd><info> The prefix <uicontrol>xsd</uicontrol> is used by convention

-to denote the XML Schema namespace, but any prefix can be used. The purpose

-of the association is to identify the elements and simple types as belonging

-to the vocabulary of the XML Schema language rather than the vocabulary of

-the schema author.  <note>This prefix will not appear in any schemas that

-currently exist - it will only appear in new schemas you create after you

-type the prefix and click <uicontrol>Apply</uicontrol>. Any schemas that already

-exist will have the prefix specified in the schema applied to the XML schema

-language constructs.</note></info></step>

-<step><cmd>You can change the <uicontrol>Default Target Namespace</uicontrol> value.</cmd>

-<info>The value specified in this field will be the default target namespace

-for any new XML schema files created.</info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
deleted file mode 100644
index fe76430..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML schema file preferences" />
-<meta name="abstract" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
-<meta name="description" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
-<meta content="XML schema files, defining, default target namespace, XML schema files, schema prefix" name="DC.subject" />
-<meta content="XML schema files, defining, default target namespace, XML schema files, schema prefix" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtpref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML schema file preferences</title>
-</head>
-<body id="tedtpref"><a name="tedtpref"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML schema file preferences</h1>
-
-
-
-
-<div><p>You can set various preferences for XML schema files such as the
-default target namespace and XML Schema language constructs prefix used.</p>
-
-<div class="section"><p>To define XML schema file preferences, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Select  <span class="menucascade"><span class="uicontrol">Window &gt; Preferences &gt; Web and
-XML &gt; XML Schema Files</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Qualify XML schema language constructs</span> check
-box if you want a prefix applied to all XML Schema language constructs in
-your XML schema.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">XML schema language constructs prefix</span> field,
-type the prefix you want applied to XML Schema language constructs in your
-XML schema.</span>  The prefix <span class="uicontrol">xsd</span> is used by convention
-to denote the XML Schema namespace, but any prefix can be used. The purpose
-of the association is to identify the elements and simple types as belonging
-to the vocabulary of the XML Schema language rather than the vocabulary of
-the schema author.  <div class="note"><span class="notetitle">Note:</span> This prefix will not appear in any schemas that
-currently exist - it will only appear in new schemas you create after you
-type the prefix and click <span class="uicontrol">Apply</span>. Any schemas that already
-exist will have the prefix specified in the schema applied to the XML schema
-language constructs.</div>
-</li>
-
-<li class="stepexpand"><span>You can change the <span class="uicontrol">Default Target Namespace</span> value.</span>
- The value specified in this field will be the default target namespace
-for any new XML schema files created.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
deleted file mode 100644
index 666ecb8..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="tedtschm" xml:lang="en-us">

-<title>Editing XML schema properties</title>

-<titlealts>

-<searchtitle>Editing XML schema properties</searchtitle>

-</titlealts>

-<shortdesc>After you create an XML schema, you can edit its various properties,

-such as its namespace and prefix.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>XML schema properties</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>editing properties</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit an XML schema's

-properties follow these steps:</p></context>

-<steps>

-<step><cmd>Create a new XML schema or double-click an existing schema in the

-Navigator view.</cmd><info> It will automatically open in the XML schema editor.</info>

-</step>

-<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>

-</step>

-<step><cmd>You can change the <uicontrol>Prefix</uicontrol> associated with

-the current namespace.</cmd><info>Element and attribute names that are associated

-with this namespace will be prefixed with this value.</info></step>

-<step><cmd>You can also edit the <uicontrol>Target namespace</uicontrol> for

-this schema.</cmd><info> A namespace is a URI that provides a unique name

-to associate with all the elements and type definitions in a schema.</info>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this XML schema.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002389?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
deleted file mode 100644
index 840ef3a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML schema properties" />
-<meta name="abstract" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
-<meta name="description" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
-<meta content="XML schema editor, editing XML schemas, simple types, XML schema files, editing" name="DC.subject" />
-<meta content="XML schema editor, editing XML schemas, simple types, XML schema files, editing" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML schema properties</title>
-</head>
-<body id="tedtschm"><a name="tedtschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML schema properties</h1>
-
-
-
-
-<div><p>After you create an XML schema, you can edit its various properties,
-such as its namespace and prefix.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit an XML schema's
-properties follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a new XML schema or double-click an existing schema in the
-Navigator view.</span>  It will automatically open in the XML schema editor.
-</li>
-
-<li class="stepexpand"><span>In the Outline view, click <span class="uicontrol">Directives</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>You can change the <span class="uicontrol">Prefix</span> associated with
-the current namespace.</span> Element and attribute names that are associated
-with this namespace will be prefixed with this value.</li>
-
-<li class="stepexpand"><span>You can also edit the <span class="uicontrol">Target namespace</span> for
-this schema.</span>  A namespace is a URI that provides a unique name
-to associate with all the elements and type definitions in a schema.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this XML schema.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
deleted file mode 100644
index bc1b82a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="timpschm" xml:lang="en-us">

-<title>Importing XML schemas</title>

-<titlealts>

-<searchtitle>Importing XML schemas</searchtitle>

-</titlealts>

-<shortdesc>If you want to work with XML schema files that you created outside

-of the product, you can import them into the workbench and open them in the

-XML schema editor. The XML schema editor provides you with a structured view

-of the XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To import an XML

-schema into the workbench:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>File > Import</uicontrol></menucascade>.</cmd>

-</step>

-<step><cmd>Select the import source.</cmd><info> Click <uicontrol>Next</uicontrol>.</info>

-</step>

-<step><cmd>Fill in the fields in the Import wizard as necessary.</cmd><info> When

-you are finished, click <uicontrol>Finish</uicontrol>.</info></step>

-</steps>

-<result><p>The imported schema now appears in the Navigator view. Double-click

-it to open it in the XML schema editor.</p></result>

-</taskbody>

-</task>

-<?Pub *0000001448?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
deleted file mode 100644
index 8726a2c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing XML schemas" />
-<meta name="abstract" content="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema." />
-<meta name="description" content="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema." />
-<meta content="XML schema files, importing" name="DC.subject" />
-<meta content="XML schema files, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="timpschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing XML schemas</title>
-</head>
-<body id="timpschm"><a name="timpschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing XML schemas</h1>
-
-
-
-
-<div><p>If you want to work with XML schema files that you created outside
-of the product, you can import them into the workbench and open them in the
-XML schema editor. The XML schema editor provides you with a structured view
-of the XML schema.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To import an XML
-schema into the workbench:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">File &gt; Import</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the import source.</span>  Click <span class="uicontrol">Next</span>.
-</li>
-
-<li class="stepexpand"><span>Fill in the fields in the Import wizard as necessary.</span>  When
-you are finished, click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-
-<div class="section"><p>The imported schema now appears in the Navigator view. Double-click
-it to open it in the XML schema editor.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-<div><a href="../topics/taddimpt.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddincl.html" title="As schemas become larger, it is often desirable to divide their content among several schema documents for purposes such as ease of maintenance, reuse, and readability. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
deleted file mode 100644
index c4f2a0f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="tnavsrc" xml:lang="en-us">

-<title>Navigating XML schemas</title>

-<titlealts>

-<searchtitle>Navigating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>When you are working in the Source view, you can use F3 to navigate

-through the file by placing your cursor in the appropriate item and clicking

-F3 to jump to the item it refers to. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>navigating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can jump to any of the following items:</p><ul>

-<li>Element or attribute declaration's type</li>

-<li>Element references</li>

-<li>Group references</li>

-<li>Attribute references</li>

-<li>Attribute group references</li>

-<li>Import, include, and redefine element (the external schema will open in

-the XML schema editor. This only works with schemas in the workspace).</li>

-</ul><p>You must place your cursor exactly in the location of the reference

-(for example between the double quotes for <systemoutput>type = " "</systemoutput> or

- <systemoutput>base = " "</systemoutput>).</p><p>For example, if you place

-your cursor anywhere in the following text and click F3:</p><p> <systemoutput>&lt;element

-name="shipTo" type="po:USAddress">&lt;/element></systemoutput> </p><p>the

-cursor will automatically jump to the location in the file where the type

-USAddress is defined.</p><p>Or, if you place your cursor anywhere in the following

-text and click F3:</p><p> <systemoutput>&lt;element ref="po:ContactElement">&lt;/element></systemoutput> </p><p>the

-cursor will automatically jump to the location in the file where the global

-element ContactElement is defined.</p><p>This works across files. For example,

-if the type you have selected is defined in another XML schema and you click

-F3, you will automatically be taken to that file.</p></context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
deleted file mode 100644
index 582def5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Navigating XML schemas" />
-<meta name="abstract" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to." />
-<meta name="description" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to." />
-<meta content="XML schema files, navigating" name="DC.subject" />
-<meta content="XML schema files, navigating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tnavsrc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Navigating XML schemas</title>
-</head>
-<body id="tnavsrc"><a name="tnavsrc"><!-- --></a>
-
-
-<h1 class="topictitle1">Navigating XML schemas</h1>
-
-
-
-
-<div><p>When you are working in the Source view, you can use F3 to navigate
-through the file by placing your cursor in the appropriate item and clicking
-F3 to jump to the item it refers to. </p>
-
-<div class="section"><p>You can jump to any of the following items:</p>
-<ul>
-<li>Element or attribute declaration's type</li>
-
-<li>Element references</li>
-
-<li>Group references</li>
-
-<li>Attribute references</li>
-
-<li>Attribute group references</li>
-
-<li>Import, include, and redefine element (the external schema will open in
-the XML schema editor. This only works with schemas in the workspace).</li>
-
-</ul>
-<p>You must place your cursor exactly in the location of the reference
-(for example between the double quotes for <tt class="sysout">type = " "</tt> or
- <tt class="sysout">base = " "</tt>).</p>
-<p>For example, if you place
-your cursor anywhere in the following text and click F3:</p>
-<p> <tt class="sysout">&lt;element
-name="shipTo" type="po:USAddress"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the type
-USAddress is defined.</p>
-<p>Or, if you place your cursor anywhere in the following
-text and click F3:</p>
-<p> <tt class="sysout">&lt;element ref="po:ContactElement"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the global
-element ContactElement is defined.</p>
-<p>This works across files. For example,
-if the type you have selected is defined in another XML schema and you click
-F3, you will automatically be taken to that file.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
deleted file mode 100644
index eea3411..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="refactoring" xml:lang="en-us">

-<title>Refactoring in XML Schema Files</title>

-<titlealts>

-<searchtitle>Refactoring in XML Schema Files</searchtitle>

-</titlealts>

-<shortdesc>Within an XML Schema file, refactoring allows authors to make a

-single artifact change, and have that change implemented throughout all other

-dependant artifacts.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>dependent artifacts<indexterm>refactorting XML schema files</indexterm></indexterm>

-<indexterm>refactoring<indexterm>XML schema files</indexterm></indexterm>

-<indexterm>renaming<indexterm>XML schema files</indexterm></indexterm>

-<indexterm>XML schemas<indexterm>editing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<prereq></prereq>

-<context>Refactoring eliminates the need for the tedious editing necessary

-to recover broken dependencies caused by artifact changes which cause ripple

-effects on other dependant artifacts (such as renaming an XML Schema element).</context>

-<steps>

-<step><cmd>Create a new XML schema or double-click an existing schema in the

-Navigator view.</cmd><info> It will automatically open in the XML schema editor.</info>

-</step>

-<step><cmd>To refactor an artifact, position cursor within the artifact, right-click

-the artifact, click <menucascade><uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol>

-</menucascade></cmd><info>A popup dialog will request the entry of a new name

-for that artifact</info>

-<substeps>

-<substep><cmd>Type in the new name of the artifact.</cmd></substep>

-<substep><cmd>(Optional) Click <b>Preview</b>.</cmd><info>A window

-will open indicating all of the changes which will take place due to the refactoring.</info>

-</substep>

-<substep><cmd>Click <uicontrol>OK.</uicontrol></cmd></substep>

-</substeps>

-</step>

-</steps>

-<result>The new name will be entered in the opened XSD source, as well as

-in all dependant artifacts</result>

-<example><b><u>Component References in XML Schema</u></b><simpletable>

-<sthead>

-<stentry>Global named components</stentry>

-<stentry>Reference</stentry>

-</sthead>

-<strow>

-<stentry><ul>

-<li>&lt;element name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;element ref="foo"></li>

-<li>&lt;element substitutionGroup="foo"</li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;simple/complexType name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;element type="foo"></li>

-<li>&lt;attribute type="foo"></li>

-<li>&lt;restriction base="foo"></li>

-<li>&lt;substitution base="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;attribute name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;attribute ref="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;attributeGroup name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;attributeGroup ref="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;group name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;group ref="foo"></li>

-</ul></stentry>

-</strow>

-</simpletable></example>

-<postreq></postreq>

-</taskbody>

-</task>

-<?Pub *0000003131?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
deleted file mode 100644
index ceb881d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Refactoring in XML Schema Files" />
-<meta name="abstract" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta name="description" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta content="XML schema files, XML schema editor, refactoring, renaming, editing XML schemas, dependant artifacts" name="DC.subject" />
-<meta content="XML schema files, XML schema editor, refactoring, renaming, editing XML schemas, dependant artifacts" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="refactoring" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Refactoring in XML Schema Files</title>
-</head>
-<body id="refactoring"><a name="refactoring"><!-- --></a>
-
-
-<h1 class="topictitle1">Refactoring in XML Schema Files</h1>
-
-
-
-
-<div><p>Within an XML Schema file, refactoring allows authors to make a
-single artifact change, and have that change implemented throughout all other
-dependant artifacts.</p>
-
-<div class="p" />
-
-<div class="section">Refactoring eliminates the need for the tedious editing necessary
-to recover broken dependencies caused by artifact changes which cause ripple
-effects on other dependant artifacts (such as renaming an XML Schema element).</div>
-
-<ol>
-<li class="stepexpand"><span>Create a new XML schema or double-click an existing schema in the
-Navigator view.</span>  It will automatically open in the XML schema editor.
-</li>
-
-<li class="stepexpand"><span>To refactor an artifact, position cursor within the artifact, right-click
-the artifact, click <span class="menucascade"><span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span>
-</span></span> A popup dialog will request the entry of a new name
-for that artifact
-<ol type="a">
-<li class="substepexpand"><span>Type in the new name of the artifact.</span></li>
-
-<li class="substepexpand"><span>(Optional) Click <strong>Preview</strong>.</span> A window
-will open indicating all of the changes which will take place due to the refactoring.
-</li>
-
-<li class="substepexpand"><span>Click <span class="uicontrol">OK.</span></span></li>
-
-</ol>
-
-</li>
-
-</ol>
-
-<div class="section">The new name will be entered in the opened XSD source, as well as
-in all dependant artifacts</div>
-
-<div class="example"><strong><u>Component References in XML Schema</u></strong><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N100EB">Global named components</th>
-
-<th valign="bottom" align="left" id="N100F1">Reference</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100EB"><ul>
-<li>&lt;element name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N100F1"><ul>
-<li>&lt;element ref="foo"&gt;</li>
-
-<li>&lt;element substitutionGroup="foo"</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100EB"><ul>
-<li>&lt;simple/complexType name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N100F1"><ul>
-<li>&lt;element type="foo"&gt;</li>
-
-<li>&lt;attribute type="foo"&gt;</li>
-
-<li>&lt;restriction base="foo"&gt;</li>
-
-<li>&lt;substitution base="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100EB"><ul>
-<li>&lt;attribute name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N100F1"><ul>
-<li>&lt;attribute ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100EB"><ul>
-<li>&lt;attributeGroup name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N100F1"><ul>
-<li>&lt;attributeGroup ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100EB"><ul>
-<li>&lt;group name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N100F1"><ul>
-<li>&lt;group ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
deleted file mode 100644
index 580f90c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tvdtschm" xml:lang="en-us">

-<title>Validating XML schemas</title>

-<titlealts>

-<searchtitle>Validating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>Validating an XML schema determines whether the current state of

-the XML schema file is semantically valid. Any errors will be displayed in

-the Problems view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To validate an XML

-schema:</p></context>

-<steps>

-<step><cmd>Right-click your file in the Navigator view and click <uicontrol>Validate</uicontrol>.</cmd>

-</step>

-<step><cmd> If validation was not successful, you can refer to the Problems

-view to see what problems were logged. </cmd><info> <note>If you receive an

-error message indicating that the Problems view is full, you can increase

-the number of error messages allowed by selecting  <menucascade><uicontrol>Properties

-> Validation</uicontrol></menucascade> and specifying the maximum number of

-error messages allowed.</note></info></step>

-</steps>

-<result><p>The XML schema support in the XML schema editor is based on the

-W3C XML Schema Recommendation Specification. The XML Schema specifications

-XML Schema Part 1: Structures and XML Schema Part 2: Datatypes from the W3C

-Web site are used for validation.</p><p>Certain error messages contain a reference

-to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures

-document. Each constraint has a unique name that will be referenced in the

-error message. For example, if you receive an error message with this text:

- <systemoutput>ct-props-correct</systemoutput> and you searched in the Structure

-document for the text, you would find that it is for the section "Schema Component

-Constraint: Complex Type Definition Properties Correct". </p><p>You can set

-up a project's properties so that different types of project resources are

-automatically validated when you save them. From a project's pop-up menu select <uicontrol>Properties</uicontrol>,

-then select <uicontrol>Validation</uicontrol>. Any validators you can run

-against your project will be listed in the Validation page.</p></result>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

-<desc>General validation information</desc>

-</link>

-<link href="http://www.w3.org/TR/xmlschema-1" scope="external"><linktext>XML

-Schema Part 1: Structures</linktext>

-<desc>See the W3C Web site for more information on XML Schema specifications</desc>

-</link>

-<link href="http://www.w3.org/TR/xmlschema-2" scope="external"><linktext>XML

-Schema Part 2: Datatypes</linktext>

-<desc>See the W3C Web site for more information on XML Schema specifications</desc>

-</link>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
deleted file mode 100644
index f6ef002..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="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" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating XML schemas" />
-<meta name="abstract" content="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view." />
-<meta name="description" content="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view." />
-<meta content="XML schema files, validating" name="DC.subject" />
-<meta content="XML schema files, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="http://www.w3.org/TR/xmlschema-1" />
-<meta scheme="URI" name="DC.Relation" content="http://www.w3.org/TR/xmlschema-2" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tvdtschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating XML schemas</title>
-</head>
-<body id="tvdtschm"><a name="tvdtschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating XML schemas</h1>
-
-
-
-
-<div><p>Validating an XML schema determines whether the current state of
-the XML schema file is semantically valid. Any errors will be displayed in
-the Problems view.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To validate an XML
-schema:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Right-click your file in the Navigator view and click <span class="uicontrol">Validate</span>.</span>
-</li>
-
-<li class="stepexpand"><span> If validation was not successful, you can refer to the Problems
-view to see what problems were logged. </span>  <div class="note"><span class="notetitle">Note:</span> If you receive an
-error message indicating that the Problems view is full, you can increase
-the number of error messages allowed by selecting  <span class="menucascade"><span class="uicontrol">Properties
-&gt; Validation</span></span> and specifying the maximum number of
-error messages allowed.</div>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML schema support in the XML schema editor is based on the
-W3C XML Schema Recommendation Specification. The XML Schema specifications
-XML Schema Part 1: Structures and XML Schema Part 2: Datatypes from the W3C
-Web site are used for validation.</p>
-<p>Certain error messages contain a reference
-to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures
-document. Each constraint has a unique name that will be referenced in the
-error message. For example, if you receive an error message with this text:
- <tt class="sysout">ct-props-correct</tt> and you searched in the Structure
-document for the text, you would find that it is for the section "Schema Component
-Constraint: Complex Type Definition Properties Correct". </p>
-<p>You can set
-up a project's properties so that different types of project resources are
-automatically validated when you save them. From a project's pop-up menu select <span class="uicontrol">Properties</span>,
-then select <span class="uicontrol">Validation</span>. Any validators you can run
-against your project will be listed in the Validation page.</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html</a></div>
-<div><a href="http://www.w3.org/TR/xmlschema-1" target="_blank" title="See the W3C Web site for more information on XML Schema specifications">XML
-Schema Part 1: Structures</a></div>
-<div><a href="http://www.w3.org/TR/xmlschema-2" target="_blank" title="See the W3C Web site for more information on XML Schema specifications">XML
-Schema Part 2: Datatypes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature/.cvsignore b/features/org.eclipse.wst.web_core.feature/.cvsignore
deleted file mode 100644
index 8a9b065..0000000
--- a/features/org.eclipse.wst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_core.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.web_core.feature/.project b/features/org.eclipse.wst.web_core.feature/.project
deleted file mode 100644
index fa0ce1f..0000000
--- a/features/org.eclipse.wst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_core.feature/build.properties b/features/org.eclipse.wst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_core.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/epl-v10.html b/features/org.eclipse.wst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature/feature.properties b/features/org.eclipse.wst.web_core.feature/feature.properties
deleted file mode 100644
index 2cbed5c..0000000
--- a/features/org.eclipse.wst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web tools core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
deleted file mode 100644
index 1c0ac30..0000000
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_core.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.apache.xerces" version="2.8.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.commands" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="equivalent"/>
-      <import plugin="org.eclipse.jem.util" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.css.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_core.feature/license.html b/features/org.eclipse.wst.web_core.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_core.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 57260a4..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST Web core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index a4fd7a7..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_core.feature.source"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.web_core.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 61f1e6e..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index c9d38d6..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_sdk.feature/.cvsignore b/features/org.eclipse.wst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 2ad302e..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-features
-plugins
-org.eclipse.wst.web_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.web_sdk.feature/.project b/features/org.eclipse.wst.web_sdk.feature/.project
deleted file mode 100644
index b79f84b..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_sdk.feature/build.properties b/features/org.eclipse.wst.web_sdk.feature/build.properties
deleted file mode 100644
index 7860612..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-generate.feature@org.eclipse.wst.web_ui.feature.source=org.eclipse.wst.web_ui.feature
-
diff --git a/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/epl-v10.html b/features/org.eclipse.wst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.properties b/features/org.eclipse.wst.web_sdk.feature/feature.properties
deleted file mode 100644
index c1e2ef3..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for the WST web tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
deleted file mode 100644
index 05d2876..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_sdk.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_sdk.feature/license.html b/features/org.eclipse.wst.web_sdk.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_ui.feature/.cvsignore b/features/org.eclipse.wst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.web_ui.feature/.project b/features/org.eclipse.wst.web_ui.feature/.project
deleted file mode 100644
index 024b477..0000000
--- a/features/org.eclipse.wst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_ui.feature/build.properties b/features/org.eclipse.wst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/epl-v10.html b/features/org.eclipse.wst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.properties b/features/org.eclipse.wst.web_ui.feature/feature.properties
deleted file mode 100644
index e74829b..0000000
--- a/features/org.eclipse.wst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web UI tools.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
deleted file mode 100644
index 1b5855f..0000000
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_ui.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.wst.css.ui" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.javascript.ui" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.javascript.core" version="1.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.web" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.environment" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.html.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.css.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_ui.feature/license.html b/features/org.eclipse.wst.web_ui.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_ui.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index dd8a618..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.wst.web_core.feature.source = org.eclipse.wst.web_core.feature
-
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 1d92f12..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST Web UI.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index a074657..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_ui.feature.source"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.web_ui.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 3195c0a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 0656fb9..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_userdoc.feature/.cvsignore b/features/org.eclipse.wst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index 9cfe174..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.wst.web_userdoc.feature/.project b/features/org.eclipse.wst.web_userdoc.feature/.project
deleted file mode 100644
index 1b5eb31..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_userdoc.feature/build.properties b/features/org.eclipse.wst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.properties b/features/org.eclipse.wst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 35a1216..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.xml b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
deleted file mode 100644
index 2881ce2..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_userdoc.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.webtools.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_userdoc.feature/license.html b/features/org.eclipse.wst.web_userdoc.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/.project b/features/org.eclipse.wst.xml_core.feature.patch/.project
deleted file mode 100644
index 648c793..0000000
--- a/features/org.eclipse.wst.xml_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/description.txt b/features/org.eclipse.wst.xml_core.feature.patch/description.txt
deleted file mode 100644
index 2d8148a..0000000
--- a/features/org.eclipse.wst.xml_core.feature.patch/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This head trunk is deliberatly empty. 
-
-Please load the appropriate maintenance branch. 
-
diff --git a/features/org.eclipse.wst.xml_core.feature/.cvsignore b/features/org.eclipse.wst.xml_core.feature/.cvsignore
deleted file mode 100644
index b235ae1..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.xml_core.feature_1.5.0.200605080104.bin.dist.zip
-dev.properties
diff --git a/features/org.eclipse.wst.xml_core.feature/.project b/features/org.eclipse.wst.xml_core.feature/.project
deleted file mode 100644
index 11ae248..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b409276..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 08 09:10:27 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.xml_core.feature/build.properties b/features/org.eclipse.wst.xml_core.feature/build.properties
deleted file mode 100644
index 364480b..0000000
--- a/features/org.eclipse.wst.xml_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
diff --git a/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/epl-v10.html b/features/org.eclipse.wst.xml_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.properties b/features/org.eclipse.wst.xml_core.feature/feature.properties
deleted file mode 100644
index 3544f59..0000000
--- a/features/org.eclipse.wst.xml_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
deleted file mode 100644
index 292ae8e..0000000
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_core.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.apache.xml.resolver"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.apache.xerces" version="2.8.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.xsd" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.apache.xml.resolver"
-         download-size="71"
-         install-size="71"
-         version="1.1.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xerces"
-         download-size="1200"
-         install-size="1200"
-         version="2.8.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.standard.schemas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_core.feature/license.html b/features/org.eclipse.wst.xml_core.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_core.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index be282aa..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST XML core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 7fde4bb..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_core.feature.source"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.xml_core.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e1c2716..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - XML Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index f95b457..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 8f43777..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - XML Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_sdk.feature/.cvsignore b/features/org.eclipse.wst.xml_sdk.feature/.cvsignore
deleted file mode 100644
index 8774952..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-dev.properties
diff --git a/features/org.eclipse.wst.xml_sdk.feature/.project b/features/org.eclipse.wst.xml_sdk.feature/.project
deleted file mode 100644
index 4275fa6..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/build.properties b/features/org.eclipse.wst.xml_sdk.feature/build.properties
deleted file mode 100644
index e846029..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties
-
-generate.feature@org.eclipse.wst.xml_ui.feature.source=org.eclipse.wst.xml_ui.feature
diff --git a/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html b/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.properties b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
deleted file mode 100644
index f0132ff..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for the WST XML tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
deleted file mode 100644
index 3fcd647..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_sdk.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-    <includes
-         id="org.eclipse.wst.xml_ui.feature"
-         version="0.0.0"/>
-    <includes
-         id="org.eclipse.wst.xml_ui.feature.source"
-         version="0.0.0"/>
-
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/license.html b/features/org.eclipse.wst.xml_sdk.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_ui.feature/.cvsignore b/features/org.eclipse.wst.xml_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.xml_ui.feature/.project b/features/org.eclipse.wst.xml_ui.feature/.project
deleted file mode 100644
index 69318c7..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_ui.feature/build.properties b/features/org.eclipse.wst.xml_ui.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/epl-v10.html b/features/org.eclipse.wst.xml_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/feature.properties
deleted file mode 100644
index 14f341b..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse XML Editors and Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=XML, DTD and XML Schema Editors, validators, and XML Catalog support
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
deleted file mode 100644
index 75774f4..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_ui.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.xml_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.dtd.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
-      <import plugin="com.ibm.icu" version="3.4.4" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.validation" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.emf.common" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.1.0" match="equivalent"/>
-      <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.xsd.edit" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xsd.core" version="1.1.0" match="equivalent"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_ui.feature/license.html b/features/org.eclipse.wst.xml_ui.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 19b7468..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.wst.xml_core.feature.source = org.eclipse.wst.xml_core.feature
-
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 90609a9..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for WST XML UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index bc9e0db..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_ui.feature.source"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature.source"
-         version="0.0.0"
-         search-location="both"/>
-
-   <plugin
-         id="org.eclipse.wst.xml_ui.feature.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@

diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 04e10ea..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - XML UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 29b5f4d..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools - XML UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/.cvsignore b/features/org.eclipse.wst.xml_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/.project b/features/org.eclipse.wst.xml_userdoc.feature/.project
deleted file mode 100644
index 6b391b2..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/build.properties b/features/org.eclipse.wst.xml_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/epl-v10.html b/features/org.eclipse.wst.xml_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties b/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
deleted file mode 100644
index 29b3638..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 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\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
deleted file mode 100644
index 44edea6..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_userdoc.feature"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.dtdeditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xmleditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsdeditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/license.html b/features/org.eclipse.wst.xml_userdoc.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_userdoc.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>