1 files changed, 0 insertions, 46 deletions
diff --git a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Types.java b/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Types.java
deleted file mode 100644
index 81910625c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src/org/eclipse/wst/wsdl/Types.java
+++ /dev/null
@@ -1,46 +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.wsdl;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getTypes()
- * @model 
- * @generated
- */
-public interface Types extends ExtensibleElement, javax.wsdl.Types{
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	List getSchemas();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	List getSchemas(String namespaceURI);
-
-} // Types
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c09..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350fb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a7b18c5eb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:46:32 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index 3ceab41a0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               jspcoretests.jar
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.xml b/tests/org.eclipse.jst.jsp.core.tests/plugin.xml
deleted file mode 100644
index ec9a6efba..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-	id="org.eclipse.jst.jsp.core.tests"
-	name="JSP Core Tests"
-	version="1.0.0"
-	provider-name="Eclipse.org"
-	class="org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin">
-
-	<runtime>
-		<library name="jspcoretests.jar">
-			<export name="*" />
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.junit" />
-		<import plugin="org.eclipse.wst.html.core" />
-		<import plugin="org.eclipse.wst.xml.core" />
-		<import plugin="org.eclipse.wst.sse.core" />
-  		<import plugin="org.eclipse.core.resources"/>
-    <import plugin="org.eclipse.core.runtime"/>
-    <import plugin="org.eclipse.jst.jsp.core"/>
-    <import plugin="org.eclipse.wst.css.core"/>
-	</requires>
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.java
deleted file mode 100644
index b0d76f337..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.java
+++ /dev/null
@@ -1,31 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class CleanupFormatTests extends TestSuite {
-	public static Test suite() {
-		return new CleanupFormatTests();
-	}
-
-	public CleanupFormatTests() {
-		super("CleanupFormatTests");
-
-		addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
-		addTest(new TestSuite(FormatTester.class, "FormatTester"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index 092b08ad6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,37 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-
-
-
-public class JSPCoreTestSuite extends TestSuite {
-	public static Test suite() {
-		return new JSPCoreTestSuite();
-	}
-
-	public JSPCoreTestSuite() {
-		super("SSEModelTestSuiteForJSP");
-
-		addTest(CleanupFormatTests.suite());
-		addTest(ModelCloneTests.suite());
-		addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
-		addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
-		addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
-		addTest(new TestSuite(FormatTester.class, "FormatTester"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 7f38eaea8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,95 +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.jst.jsp.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCoreTestsPlugin extends Plugin {
-	//The shared instance.
-	private static JSPCoreTestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public JSPCoreTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPCoreTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = Platform.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-	
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		//String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index 2c09e046e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,141 +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.jst.jsp.core.tests;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-/**
- * 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 {
-	private static Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
-	private static final String fPluginId = fPlugin.getDescriptor().getUniqueIdentifier();
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * 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 == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!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, fPluginId, severity, message, exception);
-		fPlugin.getLog().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 (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, fPluginId, IStatus.OK, message, exception);
-			fPlugin.getLog().log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the plugin for this logger is debugging
-	 */
-	public static boolean isDebugging() {
-		return fPlugin.isDebugging();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(fPluginId + 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) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java
deleted file mode 100644
index 18e4ccaad..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java
+++ /dev/null
@@ -1,26 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneTests extends TestSuite {
-	public static Test suite() {
-		return new ModelCloneTests();
-	}
-
-	public ModelCloneTests() {
-		super("ModelCloneTests");
-
-		addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index debfacf52..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-class NullInputStream extends InputStream {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#mark(int)
-	 */
-	public synchronized void mark(int readlimit) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#markSupported()
-	 */
-	public boolean markSupported() {
-		// we can mark nothing.
-		// and, we are using this Null class specifically for
-		// a "fake" resettable stream.
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#reset()
-	 */
-	public synchronized void reset() throws IOException {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#skip(long)
-	 */
-	public long skip(long n) throws IOException {
-		return 0;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index d1f8e03be..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +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.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-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.StructuredModelManager;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- * 
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
-	/**
-	 * Constructor for TestModelManager.
-	 * 
-	 * @param name
-	 */
-	public TestModelManager(String name) {
-		super(name);
-	}
-
-	public void testModelManager() throws IOException {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		assertTrue("modelManager must not be null", modelManager != null);
-
-		try {
-			model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-			assertTrue("basic XML empty model could not be created", model != null);
-		} finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-
-	}
-
-	public void testNullArgument() throws UnsupportedEncodingException, IOException {
-		IStructuredModel model = null;
-		Exception e = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		try {
-			model = modelManager.getModelForEdit((String) null, null, null);
-		} catch (IllegalArgumentException exception) {
-			e = exception;
-			assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
-		} finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index b5f1d17f5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,116 +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.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestStructuredDocumentClone extends TestCase {
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestStructuredDocumentClone(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-	}
-
-	public static Test getTest() {
-		return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
-	}
-
-	public void testCloneStructuredDocumentXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
-	}
-
-	/**
-	 * This test is most useful to check breakpoints and dig deep in object 
-	 * to check clones values
-	 */
-	public void testCloneStructuredDocumentJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
-	}
-
-	/**
-	 * This test is most useful to check breakpoints and dig deep in object 
-	 * to check clones values
-	 */
-	public void testCloneStructuredDocumentJSPXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		String testContent = "<@! page contentType=\"text/xml\" @>";
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index 4fb7adb9e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,341 +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.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
-	protected IModelManager fModelManager = null;
-	protected CleanupProcessorXML fCleanupProcessor = null;
-	protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
-
-	public CleanupTester(String name) {
-		super(name);
-		// get model manager
-		fModelManager = StructuredModelManager.getModelManager();
-
-		// get cleanup processor
-		fCleanupProcessor = new CleanupProcessorXML();
-
-		// get HTML cleanup processor
-		fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
-	}
-
-	public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("invoice.xml");
-
-		// use for debugging
-//		String precleaned = structuredModel.getStructuredDocument().get();
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupInsertTags() throws IOException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("invoice.xml");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(false);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "invoice.afterCleanupInsertTags.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(true);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(false);
-		cleanupPreferences.setQuoteAttrValues(false);
-		cleanupPreferences.setFormatSource(true);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterCompressEmptyElementTags.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("cleanup.html");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
-		cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "cleanup.afterCleanup.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
-		cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "cleanup.afterCleanup.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-//	public void testCleanupJSPEmptyTags1() throws UnsupportedEncodingException, IOException {
-//		// get model
-//		IStructuredModel structuredModel = getModel("login.jsp");
-//
-//		// init CleanupPreferences
-//		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-//		cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-//		cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-//		cleanupPreferences.setCompressEmptyElementTags(false);
-//		cleanupPreferences.setInsertRequiredAttrs(false);
-//		cleanupPreferences.setInsertMissingTags(true);
-//		cleanupPreferences.setQuoteAttrValues(true);
-//		cleanupPreferences.setFormatSource(true);
-//		cleanupPreferences.setConvertEOLCodes(false);
-//
-//		// cleanup
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-//		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-//		// compare
-//		String cleaned = structuredModel.getStructuredDocument().get();
-//		String expectedFileName = "login.afterCleanup.jsp";
-//		String expected = getFile(expectedFileName);
-//		compare(expectedFileName, expected, cleaned);
-//
-//		// release model
-//		structuredModel.releaseFromRead();
-//	}
-//
-//	public void testCleanupJSPEmptyTags2() throws UnsupportedEncodingException, IOException {
-//		// get model
-//		IStructuredModel structuredModel = getModel("subscription.jsp");
-//
-//		// init CleanupPreferences
-//		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-//		cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-//		cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-//		cleanupPreferences.setCompressEmptyElementTags(false);
-//		cleanupPreferences.setInsertRequiredAttrs(false);
-//		cleanupPreferences.setInsertMissingTags(true);
-//		cleanupPreferences.setQuoteAttrValues(true);
-//		cleanupPreferences.setFormatSource(true);
-//		cleanupPreferences.setConvertEOLCodes(false);
-//
-//		// cleanup
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-//		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-//		// compare
-//		String cleaned = structuredModel.getStructuredDocument().get();
-//		String expectedFileName = "subscription.afterCleanup.jsp";
-//		String expected = getFile(expectedFileName);
-//		compare(expectedFileName, expected, cleaned);
-//
-//		// release model
-//		structuredModel.releaseFromRead();
-//	}
-
-	protected String readFile(String fileName) throws IOException {
-		String inputString = null;
-		InputStream fileInputStream = null;
-
-		try {
-			fileInputStream = getClass().getResourceAsStream(fileName);
-
-			byte[] inputBuffer = new byte[2048];
-			inputString = new String();
-			int bytesRead = -1;
-
-			while (true) {
-				bytesRead = fileInputStream.read(inputBuffer);
-				if (bytesRead == -1)
-					break;
-				String bufferString = new String(inputBuffer, 0, bytesRead);
-				//bufferString = bufferString.substring(0, bytesRead);
-				inputString = inputString.concat(bufferString);
-			}
-		}
-		finally {
-			if (fileInputStream != null)
-				fileInputStream.close();
-		}
-
-		return inputString;
-	}
-
-	protected static void printException(Exception exception) {
-		exception.printStackTrace();
-	}
-
-	protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
-		IStructuredModel structuredModel = null;
-		InputStream inputStream = null;
-
-		try {
-			String input = getFile(fileName);
-			inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
-			String id = inputStream.toString().concat(fileName);
-			structuredModel = fModelManager.getModelForRead(id, inputStream, null);
-		}
-		// since in test code, no need to catch this
-		//		catch (Exception exception) {
-		//			Logger.logException(exception);
-		//		}
-		finally {
-			try {
-				inputStream.close();
-			}
-			catch (Exception exception) {
-				// hopeless
-			}
-		}
-
-		return structuredModel;
-	}
-
-	protected String getFile(String fileName) throws IOException {
-		return readFile("testfiles/".concat(fileName));
-	}
-
-	protected void compare(String testcaseName, String expected, String cleaned) {
-		if (cleaned.compareTo(expected) != 0) {
-			if (Debug.failedTests) {
-				System.out.println();
-				System.out.println(testcaseName + " failed");
-				System.out.println("========== expected file ==========");
-				System.out.println(expected);
-				System.out.println("========== cleaned file ==========");
-				System.out.println(cleaned);
-				System.out.println("========== expected file ==========");
-				String expectedString = StringUtils.replace(expected, "\r", "\\r");
-				expectedString = StringUtils.replace(expectedString, "\n", "\\n");
-				expectedString = StringUtils.replace(expectedString, "\t", "\\t");
-				System.out.println(expectedString);
-				System.out.println("========== cleaned file ==========");
-				String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
-				cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
-				cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
-				System.out.println(cleanedString);
-				System.out.println("=======================================");
-			}
-			assertTrue(false);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index 3920351e8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,577 +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.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
-	protected IModelManager fModelManager = null;
-	protected FormatProcessorXML fFormatProcessor = null;
-	protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
-	public FormatTester(String name) {
-		super(name);
-
-		// get model manager
-		fModelManager = StructuredModelManager.getModelManager();
-
-		// get format processor
-		fFormatProcessor = new FormatProcessorXML();
-
-		// get HTML format processor
-		fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
-	}
-
-	public void testFormat261968() {
-		// get model
-		IStructuredModel structuredModel = getModel("261968.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "261968.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTagOpen() {
-		// get model
-		IStructuredModel structuredModel = getModel("tagOpen.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tagOpen.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTagOpenTagClose() {
-		// get model
-		IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tagOpenTagClose.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTags() {
-		// get model
-		IStructuredModel structuredModel = getModel("tags.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tags.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatEmpty() {
-		// get model
-		IStructuredModel structuredModel = getModel("empty.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatOneSpace() {
-		// get model
-		IStructuredModel structuredModel = getModel("oneSpace.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatOneChar() {
-		// get model
-		IStructuredModel structuredModel = getModel("oneChar.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "oneChar.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSpaces() {
-		// get model
-		IStructuredModel structuredModel = getModel("spaces.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatChars() {
-		// get model
-		IStructuredModel structuredModel = getModel("chars.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "chars.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSpacesAndChars() {
-		// get model
-		IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "chars.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormat() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSplitLinesSplitMultiAttrs() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSplitLines() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterSplitLinesFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatBlockComments() {
-		// get model
-		IStructuredModel structuredModel = getModel("blockComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "blockComments.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatInlineComments() {
-		// get model
-		IStructuredModel structuredModel = getModel("inlineComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "inlineComments.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
-		// get model
-		IStructuredModel structuredModel = getModel("inlineComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testHTMLFormat() {
-		// get model
-		IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
-		fHTMLFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	protected String readFile(String fileName) {
-		String inputString = null;
-		InputStream fileInputStream = null;
-
-		try {
-			fileInputStream = getClass().getResourceAsStream(fileName);
-
-			byte[] inputBuffer = new byte[1024];
-			inputString = new String();
-			int bytesRead = -1;
-
-			while (true) {
-				bytesRead = fileInputStream.read(inputBuffer);
-				if (bytesRead == -1)
-					break;
-				String bufferString = new String(inputBuffer);
-				bufferString = bufferString.substring(0, bytesRead);
-				inputString = inputString.concat(bufferString);
-			}
-
-			if (fileInputStream != null)
-				fileInputStream.close();
-		}
-		catch (IOException exception) {
-			printException(exception);
-		}
-
-		return inputString;
-	}
-
-	protected static void printException(Exception exception) {
-		exception.printStackTrace();
-	}
-
-	protected IStructuredModel getModel(String fileName) {
-		IStructuredModel structuredModel = null;
-		InputStream inputStream = null;
-
-		try {
-			String input = getFile(fileName);
-			inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
-			String id = inputStream.toString().concat(fileName);
-			structuredModel = fModelManager.getModelForRead(id, inputStream, null);
-		}
-		catch (Exception exception) {
-			exception.printStackTrace();
-		}
-		finally {
-			try {
-				inputStream.close();
-			}
-			catch (Exception exception) {
-				// hopeless
-			}
-		}
-
-		return structuredModel;
-	}
-
-	protected String getFile(String fileName) {
-		return readFile("testfiles/".concat(fileName));
-	}
-
-	protected void compare(String testcaseName, String expected, String formatted) {
-		if (formatted.compareTo(expected) != 0) {
-			if (Debug.failedTests) {
-				System.out.println();
-				System.out.println(testcaseName + " failed");
-				System.out.println("========== expected file ==========");
-				System.out.println(expected);
-				System.out.println("========== formatted file ==========");
-				System.out.println(formatted);
-				System.out.println("========== expected file ==========");
-				String expectedString = StringUtils.replace(expected, "\r", "\\r");
-				expectedString = StringUtils.replace(expectedString, "\n", "\\n");
-				expectedString = StringUtils.replace(expectedString, "\t", "\\t");
-				System.out.println(expectedString);
-				System.out.println("========== formatted file ==========");
-				String formattedString = StringUtils.replace(formatted, "\r", "\\r");
-				formattedString = StringUtils.replace(formattedString, "\n", "\\n");
-				formattedString = StringUtils.replace(formattedString, "\t", "\\t");
-				System.out.println(formattedString);
-				System.out.println("=======================================");
-			}
-			assertTrue(false);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 048388219..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
-	<t1></t1>
-	<t2></t2
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2>
-		/t2>
-		<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	t2>
-	</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	t3>
-	</t3>
-</tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
-       <t1></t1>
-       <t2></t2
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2>/t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       t2></t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      >       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      ><t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      >t3></t3>
-</tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index c3cb6435b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,116 +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">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
-	action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
-				height="25" alt=""></TD>
-		</TR>
-		<TR>
-			<TD rowspan="2" align="LEFT" width="220" height="300"><IMG
-				src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
-			<TD align="LEFT" width="380">
-			<P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD align="LEFT" valign="TOP">
-			<P><FONT size="-1">This sample shows you how to use a Java servlet to
-			count how many times a page was visited.</FONT></P>
-			<P><FONT size="-1">This sample requires a database to store the
-			counter. If you have not already installed and configured your
-			database for the WebSphere samples, refer to <A
-				href="../Configuration/DBConfig.html">Database Configuration</A> for
-			instructions. </FONT></P>
-			<P><FONT size="-1"><A href="javascript:document.myForm.submit()"
-				target="_self"> <B>Run this sample</B></A> </FONT></P>
-			<INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
-				name="db_region" type="hidden" value="true" /></TD>
-		</TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">How this sample works:</FONT>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">This sample has:</FONT></P>
-						<UL>
-							<LI><FONT size="-1">A Java servlet that increments a counter
-							every time it is invoked </FONT>
-							<UL>
-								<LI><FONT size="-1">A Java Server Page (JSP) that invokes the
-								servlet and displays the counter </FONT>
-								<LI><FONT size="-1">A .servlet file that provides information
-								about the servlet to the WebSphere Application Server </FONT>
-							</UL>
-						</UL>
-						<P><FONT size="-1">The Application Server processes .jsp files
-						with its JSP 1.0 processor servlet. It handles the &lt;jsp:include
-						... /&gt; tag as a server-side include, replacing the tag with the
-						variable data generated by the servlet.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
-	cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
-	cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
-	width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1"> How to use this sample on your web page:</FONT></B></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">You can add this exact tag to any HTML page you
-						have on your site. Rename the HTML file with a .jsp file
-						extension, put the Java .class and .servlet files in the classes
-						folder, publish.... and you're ready to go.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca180a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +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">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name   =   "myForm" method="post" action="../Controllers/SampleController">
-	<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD colspan="2">
-			<IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
-		</TR>
-		<TR>
-			<TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
-			<TD align="LEFT" width="380">
-			<P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD align="LEFT" valign="TOP">
-			<P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
-			<P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
-			<P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
-			<INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
-		</TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">How this sample works:</FONT>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">This sample has:</FONT></P>
-						<UL>
-							<LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
-	<LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
-	<LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
-						</UL>
-						<P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the &lt;jsp:include ... /&gt; tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-				</TR>
-					</TBODY>
-						</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b841349..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
-	<rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<item type="appetizer">
-		<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-		<price units="usd">6.95<!-- inline comment after text --></price>
-		<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	</item>
-	<!-- comment on a new line -->
-	<!--   comment   on   a   new   line   -->
-	<!--comment on a new line with no space-->
-	<!--
-		No space
-	-->
-	<!--
-		OneSpace
-	-->
-	<!--
-		One tab
-	-->
-	<!--
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.-->
-	<!--
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		This is a long paragraph.
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		This is a long paragraph.
-		
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-		
-	-->
-	<!--
-		
-		
-		
-		This is a long paragraph.
-		
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-		
-		
-		
-	-->
-	<item type="appetizer">
-		<!-- a
-			b-->
-		<!-- a
-			b -->
-		<!--
-			a
-			b-->
-		<!--
-			a
-			b -->
-		<!--
-			a
-			b
-		-->
-		<!-- a
-			b
-		-->
-		<!--
-			
-			
-			
-			a
-			
-			
-			
-			b
-			
-			
-			
-		-->
-		<desc>Prosciutto ham with melon</desc>
-		<!-- this block comment should line up with the sibilings
-			Black = #000000
-			Silver= #C0C0C0
-			Gray  = #808080
-			White = #FFFFFF
-		-->
-		<price units="usd">7.95</price>
-		<!-- comment before missing end tag -->
-</menu>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 296987833..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-	<!-- comment on a new line -->
-		<menu date="11/30/2000"><!-- inline comment after tag -->
-	<rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<!-- block comment
-			Black = #000000
-		Silver= #C0C0C0
-				Gray  = #808080
-	White = #FFFFFF
--->
-	<item type="appetizer">
-		<desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	</item>
-	<!-- comment on a new line -->
-	<!--   comment   on   a   new   line   -->
-	<!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
-	One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
-	<item type="appetizer">
-<!-- a
-     b-->
-<!-- a
-     b -->
-<!--
-a
-     b-->
-<!--
-a
-     b -->
-<!--
-a
-     b
--->
-<!-- a
-     b
-      -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
-		<desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
-	Black = #000000
-	Silver= #C0C0C0
-	Gray  = #808080
-	White = #FFFFFF
--->
-	<price units="usd">7.95</price>
-	<!-- comment before missing end tag -->
-</menu>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f84a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7c6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
-   <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-   <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages.  Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c 
- </I></A> 
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter:  </I> </A> 
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters.  For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion.  This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes:  </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.  
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.  
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix.  It is written in good ol' C.
-
-<BR ><BR  >
-</LI><LI> 
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list.  This is written in Lisp, of all things.  There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.  
-It relies heavily on recursion, so it takes a different
-mindset to program in this language.  But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR   ><BR    >
-
-</LI><LI> 
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I>  This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program.  This works for any programming
-language as you can supply the comment character on the command line.  This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
-        an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.  
-Peruse (peruse, mind you.  I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c 
- </I></A> 
-<BR abc = "def"><BR abc  =  "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B> 
-A math class written in Java using Object Oriented design principles.  The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values.  Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" > 
-<I> RegressionCalc.java </I> </A>  This is the main class that does the
-calculations.  It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" > 
-<I> MathClass.java </I>  </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers.  This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" > 
-<I> Regression.java </I>  </A> This is basically the main routine, or where the
-program starts.  It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be:  <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)  
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC.  The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272 
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay.  Really.  If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk. 
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt"> 
-<I> Lost LILO?  Recover.</I>  </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO.  I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux.  Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a0020..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
-   <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-   <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages.  Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c 
- </I></A> 
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter:  </I> </A> 
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters.  For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion.  This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes:  </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.  
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.  
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix.  It is written in good ol' C.
-
-<BR ><BR  >
-</LI><LI> 
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list.  This is written in Lisp, of all things.  There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.  
-It relies heavily on recursion, so it takes a different
-mindset to program in this language.  But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR   ><BR    >
-
-</LI><LI> 
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I>  This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program.  This works for any programming
-language as you can supply the comment character on the command line.  This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
-        an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.  
-Peruse (peruse, mind you.  I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c 
- </I></A> 
-<BR abc = "def"><BR abc  =  "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B> 
-A math class written in Java using Object Oriented design principles.  The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values.  Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" > 
-<I> RegressionCalc.java </I> </A>  This is the main class that does the
-calculations.  It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" > 
-<I> MathClass.java </I>  </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers.  This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" > 
-<I> Regression.java </I>  </A> This is basically the main routine, or where the
-program starts.  It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be:  <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)  
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC.  The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272 
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay.  Really.  If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk. 
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt"> 
-<I> Lost LILO?  Recover.</I>  </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO.  I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux.  Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4bea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
-	<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-	<desc>Warmed leek salad</desc><!-- inline comment after text -->
-	<price units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
-		dollars
-	</price>
-	<price units="usd" units="usd">
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number />
-		<!-- comment on a new line -->
-		<unit />
-	</price>
-	<price><!-- inline comment --></price>
-	<th>
-		<b>Fahrenheit<!-- testing --></b>
-	</th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5e6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
-	<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-	<desc>Warmed leek salad</desc><!-- inline comment after text -->
-	<price units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		6.95<!-- inline comment after text -->
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		6.95<!-- inline comment after text and followed by text -->
-		dollars
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number />
-		<!-- comment on a new line -->
-		<unit />
-	</price>
-	<price><!-- inline comment --></price>
-	<th>
-		<b>Fahrenheit<!-- testing --></b>
-	</th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bcf4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc>   <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/>   <!-- inline comment after tag --></price>
-<price units="usd">   <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982d9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber=12345>
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Year></Date>
-    <BillTo custNumber=/>
-    <BillTo custNumber=   />
-    <BillTo custNumber   =/>
-    <BillTo custNumber   =   />
-    <BillTo custNumber name=Craig    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name   = Craig    phone/>
-    <BillTo custNumber name phone/>
-    <BillTo custNumber   =   X5739 name="Craig Salter" phone=416-448-4414>
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </country></Address></BillTo></Header>
-  <Item discount=promotion price=57>
-    <description>A wedding ring</description></Item></Invoice>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812da0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber="12345">
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Year></Date>
-    <BillTo custNumber="custNumber"/>
-    <BillTo custNumber=   "custNumber"/>
-    <BillTo custNumber   ="custNumber"/>
-    <BillTo custNumber   =   "custNumber"/>
-    <BillTo custNumber="custNumber" name="Craig"    phone =     "416-448-4414" />
-    <BillTo custNumber   =   "X5739" name="name"    phone =     "416-448-4414" />
-    <BillTo custNumber   =   "X5739" name   = "Craig"    phone="phone"/>
-    <BillTo custNumber="custNumber" name="name" phone="phone"/>
-    <BillTo custNumber   =   "X5739" name="Craig Salter" phone="416-448-4414">
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </country></Address></BillTo></Header>
-  <Item discount="promotion" price="57">
-    <description>A wedding ring</description></Item></Invoice>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b59f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber=12345>
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Date>
-    <BillTo custNumber=/>
-    <BillTo custNumber=   />
-    <BillTo custNumber   =/>
-    <BillTo custNumber   =   />
-    <BillTo custNumber name=Craig    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name   = Craig    phone/>
-    <BillTo custNumber name phone/>
-    <BillTo custNumber   =   X5739 name="Craig Salter" phone=416-448-4414>
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </Header>
-  <Item discount=promotion price=57>
-    <description>A wedding ring
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c976..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
-      function submitForm(dest){
-         document.myForm.action = dest
-         document.myForm.submit()
-      }
-      </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<%  session.removeAttribute("error_message");
-      }  %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
-	type="hidden" name="command"
-	value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
-	name="previous_page" value="Login/Login.jsp"> <A
-	href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD><FONT color="#993333"> username: </FONT></TD>
-			<TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> password: </FONT></TD>
-			<TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> drivername: </FONT></TD>
-			<TD><INPUT name="driver" type="text" size="30" maxlength="40"
-				value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> url: </FONT></TD>
-			<TD><INPUT name="url" type="text" size="30" maxlength="40"
-				value="jdbc:db2:WSSAMPLE"></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67bd8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
-      function submitForm(dest){
-         document.myForm.action = dest
-         document.myForm.submit()
-      }
-      </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<%  session.removeAttribute("error_message");
-      }  %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD><FONT color="#993333"> username: </FONT></TD>
-			<TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> password: </FONT></TD>
-			<TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> drivername: </FONT></TD>
-			<TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> url: </FONT></TD>
-			<TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe2a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecba6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
- 
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7fd6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion />
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion />
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name" v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e15..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
-	xmi.version="1.0"
-	timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel
-				xmi.name="UML"
-				xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package
-			xmi.id="_1"
-			xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension
-				xmi.extender="IXT"
-				xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv
-						t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv
-						t="quid"
-						v="3780E272032D" />
-					<ixttv
-						t="is_unit"
-						v="TRUE" />
-					<ixttv
-						t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv
-						t="is_loaded"
-						v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv
-						t="charSet"
-						v="0" />
-					<ixttv
-						t="version"
-						v="43" />
-					<ixttv
-						t="_written"
-						v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5cc0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>
-			XMI Toolkit
-			</XMI.exporter>
-			
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1">    1.05    </XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1">    1.05    </XMI.exporterVersion> </XMI.documentation>
-		<XMI.metamodel xmi.name    =			"UML" xmi.version
-		=
-		"1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package
-			xmi.id="_1"					xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>ejb    </Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public"/>
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
-					/>
-				</ixts>
-				<ixts s="Rose">
-					<ixttv
-						t="quid"
-						v="3780E272032D"
-						/>
-					<ixttv
-					t="is_unit"
-					v="TRUE"
-					/>
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;"
-									/>
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-							<ixttv t="version" v="43" />
-	<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" /></ixts></XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-   
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb569..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
-   abc   
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0f8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
-  java.util.ArrayList list = new java.util.ArrayList();
-  list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
-  list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
-  pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Create">
-	<TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Delete">
-	<TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Edit">
-	<TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
-	<html:hidden property="action" />
-	<TABLE border="0" width="100%">
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.username" />:</TH>
-			<TD align="left"><bean:write name="user" property="username"
-				filter="true" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
-			<TD align="left"><logic:equal name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:text property="host" size="50" />
-			</logic:equal> <logic:notEqual name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:hidden property="host" write="true" />
-			</logic:notEqual></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
-			<TD align="left"><html:text property="username" size="50" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
-			<TD align="left"><html:password property="password" size="50" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
-			<TD align="left"><html:select property="type">
-				<html:options collection="serverTypes" property="value"
-					labelProperty="label" />
-			</html:select></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
-			<TD align="left"><html:checkbox property="autoConnect" /></TD>
-		</TR>
-
-		<TR>
-			<TD align="right"><logic:equal name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:submit>
-					<bean:message key="button.save" />
-				</html:submit>
-			</logic:equal> <logic:equal name="subscriptionForm" property="action"
-				scope="request" value="Delete">
-				<html:submit>
-					<bean:message key="button.confirm" />
-				</html:submit>
-			</logic:equal> <logic:equal name="subscriptionForm" property="action"
-				scope="request" value="Edit">
-				<html:submit>
-					<bean:message key="button.save" />
-				</html:submit>
-			</logic:equal></TD>
-			<TD align="left"><logic:notEqual name="subscriptionForm"
-				property="action" scope="request" value="Delete">
-				<html:reset>
-					<bean:message key="button.reset" />
-				</html:reset>
-			</logic:notEqual> &nbsp; <html:cancel>
-				<bean:message key="button.cancel" />
-			</html:cancel></TD>
-		</TR>
-
-	</TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea48..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
-  java.util.ArrayList list = new java.util.ArrayList();
-  list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
-  list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
-  pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Create">
-  <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Delete">
-  <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Edit">
-  <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.username"/>:
-    </th>
-    <td align="left">
-        <bean:write name="user" property="username" filter="true"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailHostname"/>:
-    </th>
-    <td align="left">
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Create">
-        <html:text property="host" size="50"/>
-      </logic:equal>
-      <logic:notEqual name="subscriptionForm" property="action"
-                     scope="request" value="Create">
-        <html:hidden property="host" write="true"/>
-      </logic:notEqual>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailUsername"/>:
-    </th>
-    <td align="left">
-      <html:text property="username" size="50"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailPassword"/>:
-    </th>
-    <td align="left">
-      <html:password property="password" size="50"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailServerType"/>:
-    </th>
-    <td align="left">
-      <html:select property="type">
-        <html:options collection="serverTypes" property="value"
-                   labelProperty="label"/>
-      </html:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.autoConnect"/>:
-    </th>
-    <td align="left">
-      <html:checkbox property="autoConnect"/>
-    </td>
-  </tr>
-
-  <tr>
-    <td align="right">
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Create">
-        <html:submit>
-          <bean:message key="button.save"/>
-        </html:submit>
-      </logic:equal>
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Delete">
-        <html:submit>
-          <bean:message key="button.confirm"/>
-        </html:submit>
-      </logic:equal>
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Edit">
-        <html:submit>
-          <bean:message key="button.save"/>
-        </html:submit>
-      </logic:equal>
-    </td>
-    <td align="left">
-      <logic:notEqual name="subscriptionForm" property="action"
-                     scope="request" value="Delete">
-        <html:reset>
-          <bean:message key="button.reset"/>
-        </html:reset>
-      </logic:notEqual>
-      &nbsp;
-      <html:cancel>
-        <bean:message key="button.cancel"/>
-      </html:cancel>
-    </td>
-  </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa78456..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e487a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235dfa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-	<tag></tag>
-	<tag></tag>
-	<tag></tag>
-	<tag></tag>
-	<tag>
-		<tag></tag>
-		<tag></tag>
-		<tag></tag>
-		<tag></tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949bb5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag >
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f838f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-		return -1;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index 9fe4877d8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- * 
- * It tests that
- * 
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- * 
- * 
- * 
- *  
- */
-public class TestContentTypeHandlers extends TestCase {
-	private static final boolean DEBUG = false;
-
-	public TestContentTypeHandlers(String name) {
-		super(name);
-	}
-
-	private static IContentTypeManager getContentTypeRegistry() {
-		IContentTypeManager registry = Platform.getContentTypeManager();
-		return registry;
-	}
-
-	public void testCreation() {
-		IContentTypeManager registry = getContentTypeRegistry();
-		assertTrue("content type identifer registry must exist", registry != null);
-		if (DEBUG) {
-			IContentType[] allTypes = registry.getAllContentTypes();
-			for (int i = 0; i < allTypes.length; i++) {
-				System.out.println(allTypes[i]);
-
-			}
-		}
-	}
-
-	public void testXMLExists() {
-		String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
-	}
-
-	public void testHTMLExists() {
-		String id = ContentTypeIdForHTML.ContentTypeID_HTML;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
-	}
-
-	public void testJSPExists() {
-		String id = ContentTypeIdForJSP.ContentTypeID_JSP;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
-	}
-
-	public void testCSSExists() {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
-	}
-
-	public void testDTDExists() {
-		String id = "org.eclipse.wst.dtd.core.dtdsource";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
-	}
-
-	public void testXMLExistsByFileExtension() throws IOException {
-		String filename = "test.xml";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
-	}
-
-	public void testHTMLExistsByFileExtension() throws IOException {
-		String filename = "test.html";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
-	}
-
-	public void testJSPExistsByFileExtension() throws IOException {
-		String filename = "test.jsp";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
-	}
-
-	public void testCSSExistsByFileExtension() throws IOException {
-		String filename = "test.css";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
-	}
-
-	public void testDTDExistsByFileExtension() throws IOException {
-		String filename = "test.dtd";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
-	}
-
-	public void testMultipleDefinitions() throws IOException {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS;
-		String filename = "test.css";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier1 = registry.getContentType(id);
-		IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("mulitple content type identifiers need to be equal (but not same instance) ", identifier1.equals(identifier2));
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index b652b9322..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
-	private static ModelHandlerRegistry getModelHandlerRegistry() {
-		ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
-		return registry;
-	}
-
-	public TestModelHandlers() {
-		super();
-	}
-
-	public void testCreation() {
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		assertTrue("model handler registry must exist", registry != null);
-	}
-
-	public void testCSSExists() {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS; //"com.ibm.sse.model.handler.css"; 
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testCSSExistsFromFilename() throws IOException {
-		String filename = "test.css";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
-	}
-
-	public void testDTDExists() {
-		String id = "org.eclipse.wst.dtd.core.dtdsource"; 
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testDTDExistsFromFilename() throws IOException {
-		String filename = "test.dtd";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
-	}
-
-	public void testHTMLExists() {
-		String id = ContentTypeIdForHTML.ContentTypeID_HTML;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testHTMLExistsFromFilename() throws IOException {
-		String filename = "test.html";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
-	}
-
-	public void testJSPExists() {
-		String id = ContentTypeIdForJSP.ContentTypeID_JSP;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testJSPExistsFromFilename() throws IOException {
-		String filename = "test.jsp";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
-	}
-
-	public void testXMLExists() {
-		String id = ContentTypeIdForXML.ContentTypeID_XML;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
-	}
-
-	public void testXMLExistsFromFilename() throws IOException {
-		String filename = "test.xml";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
-	}
-
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index 7cb892192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +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.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
-	private static final String fCategory = "unittests";
-
-	public TestOrphan(String name) {
-
-		super(name);
-	}
-
-	private Document getJSPDoc() {
-		IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		Document doc = structuredModel.getDocument();
-		return doc;
-	}
-
-	private Document getHTMLDoc() {
-
-		IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		Document doc = structuredModel.getDocument();
-		return doc;
-	}
-
-	private Element makeElement(Document document) {
-
-		Element element = document.createElement("IMG");
-		element.setAttribute("src", "<bean:message />");
-		return element;
-	}
-
-	public void testNonOrphanInHTMLDoc() {
-
-		Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
-		Document doc = getHTMLDoc();
-		Element element = makeElement(doc);
-		AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		doc.appendChild(element);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-	}
-
-	public void testNonOrphanInJSPDoc() {
-
-		Logger.trace(fCategory, "testNonOrphanInJSPDoc");
-		Document doc = getJSPDoc();
-		Element element = makeElement(doc);
-		AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		doc.appendChild(element);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-	}
-
-	public void testNonOrphanInBoth() {
-
-		Logger.trace(fCategory, "testNonOrphanInBoth");
-		Document jspDoc = getJSPDoc();
-		Element commonElement = makeElement(jspDoc);
-		AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		jspDoc.appendChild(commonElement);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-		Document htmlDoc = getHTMLDoc();
-		// this test will cause a "region management error" to be
-		// thrown in parser (and its subsequent 'handleRefresh').
-		// this is "normal" in this error case, of appending an jsp
-		// element to an html document. This error/exception is not
-		// normally printed out, but is if 'debug' is turned on.
-		htmlDoc.appendChild(commonElement);
-		isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-	}
-
-	public void testNonOrphanInBothReversedOrder() {
-
-		Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
-		Document htmlDoc = getHTMLDoc();
-		Element commonElement = makeElement(htmlDoc);
-		AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		htmlDoc.appendChild(commonElement);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-		Document jspDoc = getJSPDoc();
-		// this little test shows its important to
-		// actually create the element with the right kind of
-		// document, not just append.
-		// (and, append is needed too, as can be seen by
-		// commenting out one or the other of the following
-		// two lines.
-		commonElement = makeElement(jspDoc);
-		jspDoc.appendChild(commonElement);
-		//
-		attr = (AttrImpl) commonElement.getAttributeNode("src");
-		attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-	}
-
-	public void doBothTests() {
-
-		testNonOrphanInHTMLDoc();
-		testNonOrphanInJSPDoc();
-		testNonOrphanInBoth();
-		testNonOrphanInBothReversedOrder();
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 3529f08db..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.jst.jsp.core.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
-		<echo message="basedir ${basedir}" />
-		<echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsp.core.tests.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true"/>
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${wst-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!-- <delete dir="${workspace}" quiet="true" /> -->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.jst.jsp.core.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-		<!--		<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f00..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d693..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.tests.encoding</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6c8ddd452..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:46:57 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 5b5de8488..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = plugin.xml,\
-               jspencodingtests.jar,\
-               testfiles/,\
-               test.xml
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml
deleted file mode 100644
index 03ed1c48b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.jsp.tests.encoding"
-   name="JSP Encoding Tests Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin">
-
-   <runtime>
-      <library name="jspencodingtests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jst.jsp.core"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.xml.tests.encoding"/>
-   </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 87cfaa3f0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +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.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
-	public static Test suite() {
-		return new JSPEncodingTestSuite();
-	}
-
-	public JSPEncodingTestSuite() {
-		super("JSP Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public JSPEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 3798ccb92..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +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.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static JSPEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-		else {
-			result = getFilesInDir(topDir);
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = Platform.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public JSPEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index 7ff1bf99b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,182 +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.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-	private boolean DEBUG = false;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	public JSPEncodingTests(String name) {
-		super(name);
-	}
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = JSPEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = detector.getEncodingMemento();
-			String foundIANAEncoding = encodingMemento.getJavaCharsetName();
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if throws exception.
-			ensureCanRead(filename, foundIANAEncoding, istream);
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testdefect4205wpsjsp() throws IOException {
-		String filename = fileLocation + "defect_4205_wps.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testJSPEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * Caution, when this file prints out in console (when debug set to true,
-	 * it appears incorrect (due to font problems in console).
-	 */
-	public void testUTF16() throws IOException {
-		String filename = fileLocation + "testUTF16.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 * Note: UTF-16 == UTF-16BE
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF16WithJapaneseChars() throws IOException {
-		String filename = fileLocation + "utf16WithJapaneseChars.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF83ByteBOM() throws IOException {
-		String filename = fileLocation + "UTF8With3ByteBOM.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLIllformedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNormalNonDefault() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index f0ea074c6..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,267 +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.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fCharset;
-	private String fContentType;
-	private String fContentTypeValue;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private String fPageEncodingValue = null;
-	private String fXMLDecEncodingName;
-
-	private void doTestFile(String filename, String expectedName) throws IOException {
-		doTestFile(filename, expectedName, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
-		JSPHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new JSPHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-		}
-		HeadParserToken resultToken = null;
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = getAppropriateEncoding();
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-		else {
-			if (expectedName == null) {
-				assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
-			}
-			else {
-				assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
-			}
-		}
-	}
-
-	// public void testMalformedNoEncoding() {
-	// String filename = fileLocation + "MalformedNoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testMalformedNoEncodingXSL() {
-	// String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNoEncoding() {
-	// String filename = fileLocation + "NoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNormalNonDefault() {
-	// String filename = fileLocation + "NormalNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNormalPageCaseNonDefault() {
-	// String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testdefect223365() {
-	// String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
-	// doTestFile(filename);
-	// }
-	/**
-	 * returns encoding according to priority: 1. XML Declaration 2. page
-	 * directive pageEncoding name 3. page directive contentType charset name
-	 */
-	private String getAppropriateEncoding() {
-		String result = null;
-		if (fXMLDecEncodingName != null)
-			result = fXMLDecEncodingName;
-		else if (fPageEncodingValue != null)
-			result = fPageEncodingValue;
-		else if (fCharset != null)
-			result = fCharset;
-		return result;
-	}
-
-	protected String getContentType() {
-		return fContentType;
-	}
-
-	private boolean isLegalString(String tokenType) {
-		if (tokenType == null)
-			return false;
-		else
-			return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-	}
-
-	private void parseContentTypeValue(String contentType) {
-		Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
-		String[] parts = pattern.split(contentType);
-		if (parts.length > 0) {
-			// if only one item, it can still be charset instead of
-			// contentType
-			if (parts.length == 1) {
-				if (parts[0].length() > 6) {
-					String checkForCharset = parts[0].substring(0, 7);
-					if (checkForCharset.equalsIgnoreCase("charset")) {
-						int eqpos = parts[0].indexOf('=');
-						eqpos = eqpos + 1;
-						if (eqpos < parts[0].length()) {
-							fCharset = parts[0].substring(eqpos);
-							fCharset = fCharset.trim();
-						}
-					}
-				}
-			}
-			else {
-				fContentType = parts[0];
-			}
-		}
-		if (parts.length > 1) {
-			fCharset = parts[1];
-		}
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws IOException {
-		fPageEncodingValue = null;
-		fCharset = null;
-		fContentType = null;
-		/*
-		 * if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) { if
-		 * (tokenizer.hasMoreTokens()) { ITextHeadRegion valueToken =
-		 * tokenizer.getNextToken(); String valueTokenType =
-		 * valueToken.getType(); if (isLegal(valueTokenType)) { resultValue =
-		 * valueToken.getText(); if (DEBUG) { System.out.println("XML Head
-		 * Tokenizer Found Encoding: " + resultValue); } } } }
-		 */
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			String tokenType = token.getType();
-			if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fXMLDecEncodingName = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fPageEncodingValue = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fContentTypeValue = valueToken.getText();
-					}
-				}
-			}
-			// else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
-			// if (tokenizer.hasMoreTokens()) {
-			// IHeadParserToken valueToken = tokenizer.getNextToken();
-			// String valueTokenType = valueToken.getType();
-			// if (isLegalString(valueTokenType)) {
-			// fLanguage = valueToken.getText();
-			// }
-			// }
-		}
-		while (tokenizer.hasMoreTokens());
-		if (fContentTypeValue != null) {
-			parseContentTypeValue(fContentTypeValue);
-		}
-		finalToken = token;
-		return finalToken;
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCase.jsp";
-		doTestFile(filename, "ISO-8859-2");
-	}
-
-	// public void testIllFormed() {
-	// String filename = fileLocation + "testIllFormed.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testIllFormed2() {
-	// String filename = fileLocation + "testIllFormed2.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testIllformedNormalNonDefault() {
-	// String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNomalDirectiveCaseUsingXMLSyntax() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
-		doTestFile(filename, "ISO-8859-2");
-	}
-
-	public void testNoPageDirective() throws IOException {
-		String filename = fileLocation + "testNoPageDirective.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNoPageDirectiveAtFirst() throws IOException {
-		String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
-		doTestFile(filename, "ISO-8859-2");
-	}
-
-	public void testNoPageDirectiveInLargeFile() throws IOException {
-		String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
-		doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
-	}
-
-	public void testNormalCaseWithNeither() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNormalCharset() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
-		doTestFile(filename, "ISO-8859-3");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index 45e05bbc8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,176 +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.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
-	public void testFile100() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null);
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
-	}
-
-	public void testFile65() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null);
-	}
-
-	public void testFile66() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
-	}
-
-	public void testFile67() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
-	}
-
-	public void testFile68() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null);
-	}
-
-	public void testFile69() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null);
-	}
-
-	public void testFile70() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
-	}
-
-	public void testFile71() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null);
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null);
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
-	}
-
-	public void testFile79() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null);
-	}
-
-
-	public void testFile90() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index b6568cf26..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	
-	<!-- Configurable Properties -->
-	
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-	
-		<echo message="basedir ${basedir}" />
-	    <echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.jst.jsp.tests.encoding" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-	
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsp.tests.encoding.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true" />
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${wst-folder}" />
-			<property name="plugin-name" value="org.eclipse.jst.jsp.tests.encoding" />
-			<property name="classname" value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.jst.jsp.tests.encoding.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-		<!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75a3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15e7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australi�
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d5d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australi�
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76ce8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e681a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248fe7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba82..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6a8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
-	background-color: #ffffff !important;
-}
-H1 {
-	color: #0000ff !important;
-	text-align: center !important;
-}
-TH {
-	text-align:left !important;
-	color: #000000 !important;
-	vertical-align: top !important;
-}
-TD {
-	text-align:left !important;
-	vertical-align: top !important;
-}
-TH.result {
-	background-color: #999999 !important;
-}
-TD.result {
-	background-color: #cccccc;
-	vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
-			<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_�\�Z�_</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_�\�Z�_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_�\�Z�_().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cfad..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652ab..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 8e9cf4a7c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ page import="com.ibm.wps.*" %>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次：<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e304..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"  
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f15..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff9c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 76569028b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page 
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f50..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a0802..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981c0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  
-
-encoding="ISO-8859-3" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f49..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684f9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958c4..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  abcd="efc"
-
-encoding="ISO-8859-1" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a4a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b73..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8 
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c1804..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0"    ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a77..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3bcc..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636fca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c89..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850f8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e81783..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e691612..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d94..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc37..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore b/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
deleted file mode 100644
index 3a5e93254..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.jst.jsp.ui.tests_1.0.0.jar
-jspuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.project b/tests/org.eclipse.jst.jsp.ui.tests/.project
deleted file mode 100644
index 71a50f1c0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cf1194c6f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:06 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
deleted file mode 100644
index 8e79234df..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               PerformanceResults/,\
-               testfiles.zip,\
-               test.xml,\
-               projecttestfiles/,\
-               testfiles/,\
-               jspuitests.jar
-jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/
-output.jspuitests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
deleted file mode 100644
index a422c94e3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.jsp.ui.tests"
-   name="Structured Source Editor for JSP Tests"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin">
-
-   <runtime>
-      <library name="jspuitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jst.jsp.ui"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.wst.xml.core"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.sse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.jst.jsp.core"/>
-      <import plugin="org.eclipse.wst.html.core"/>
-      <import plugin="org.eclipse.wst.css.core"/>
-      <import plugin="org.eclipse.wst.html.ui"/>
-      <import plugin="org.eclipse.wst.xml.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.wst.css.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.javascript.ui"/>
-   </requires>
-
-
-<!-- TO GET PICKED UP BY com.ibm.etools.commontests.testcollector -->
-	<!--
-   <extension
-         point="com.ibm.etools.commontests.testcollector.suites">
-      <suite
-            suiteName="SSE JSP Tests"
-            suiteClass="org.eclipse.jst.jsp.ui.tests.application.SSEJSPTestSuite">
-      </suite>
-   </extension>
-   -->
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="Embedded JSP Structured Text Viewer"
-            icon="icons/sourceEditor.gif"
-            category="org.eclipse.wst.sse.ui.tests"
-            class="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"
-            id="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"/>
-   </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
deleted file mode 100644
index aaf751de5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
deleted file mode 100644
index 14aadb302..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
deleted file mode 100644
index 65bbbe598..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
deleted file mode 100644
index 12156c76e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.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.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.internal.preferences.JSPUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the JSP Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class JSPUIPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.html.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE);
-		bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
-		pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
-		pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE, "<");
-	}
-
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
-		pluginSetPreferenceBoolean(store, JSPUIPreferenceNames.AUTO_PROPOSE);
-		pluginSetPreferenceString(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-
-	private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
-		String originalValue = store.getString(prefKey);
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-		store.setValue(prefKey, expectedValue);
-		String foundValue = store.getString(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
deleted file mode 100644
index 931cb6795..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ /dev/null
@@ -1,64 +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.jst.jsp.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
-import org.eclipse.jst.jsp.ui.tests.document.FileBufferDocumentTester;
-import org.eclipse.jst.jsp.ui.tests.model.TestModelsFromFiles;
-import org.eclipse.jst.jsp.ui.tests.modelquery.ModelQueryTester;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.other.UnitTests;
-import org.eclipse.jst.jsp.ui.tests.pagedirective.TestPageDirective;
-import org.eclipse.jst.jsp.ui.tests.partitioning.TestStructuredPartitionerJSP;
-import org.eclipse.jst.jsp.ui.tests.registry.AdapterFactoryRegistryTest;
-import org.eclipse.jst.jsp.ui.tests.viewer.TestViewerConfigurationJSP;
-
-
-
-
-public class JSPUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new JSPUITestSuite();
-	}
-
-	public JSPUITestSuite() {
-		super("SSE JSP UI Test Suite");
-		
-		addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
-		addTest(new TestSuite(UnitTests.class, "UnitTests"));
-		addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
-		addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
-		addTest(new TestSuite(JSPJavaTranslatorTest.class, "JSPJavaTranslatorTest"));
-		addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
-		addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfoProviderTest"));
-		addTest(new TestSuite(JSPTranslationTest.class, "JSPTranslationTest"));
-		addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistryText"));
-		addTest(new TestSuite(JSPUIPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfigurationJSP.class));
-		
-		// moved from jsp core tests because they require UI
-		addTest(new TestSuite(TestPageDirective.class));
-		addTest(new TestSuite(FileBufferDocumentTester.class));
-		addTest(new TestSuite(TestModelClone.class));
-		
-		addTest(new TestSuite(TestModelsFromFiles.class, "TestModelsFromFiles"));
-		addTest(new TestSuite(TestModelEmbeddedContentType.class, "TestModelEmbeddedContentType"));
-
-		
-		// pa_TODO fix this test
-		//addTest(new TestSuite(JSPSearchTests.class));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
deleted file mode 100644
index 13f504ab8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
+++ /dev/null
@@ -1,95 +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.jst.jsp.ui.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPUITestsPlugin extends Plugin {
-	//The shared instance.
-	private static JSPUITestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	public static final String ID = "org.eclipse.jst.jsp.ui.tests";
-
-	/**
-	 * The constructor.
-	 */
-	public JSPUITestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.ui.tests.SSEForJSPTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPUITestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-	
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.ui.tests").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = Platform.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-	
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		//String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
deleted file mode 100644
index 44de87258..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.jst.jsp.ui.tests;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * 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 {
-	private static final String PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * 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 == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!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, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(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 (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(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 (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + 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) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
deleted file mode 100644
index 154156da6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.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.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-public class TestEmailNotice extends TestCase {
-	private boolean sendNotifications = false;
-
-	public TestEmailNotice() {
-		super();
-	}
-
-	public TestEmailNotice(String name) {
-		super(name);
-	}
-
-	public void testEmail() {
-		assertFalse("Simple test to be sure email gets sent on failure", sendNotifications);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
deleted file mode 100644
index b39685bb3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
+++ /dev/null
@@ -1,316 +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.jst.jsp.ui.tests;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-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.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- * 
- */
-public class TestModelClone extends TestCase {
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestModelClone(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-	}
-
-	public static Test getTest() {
-		return new TestModelClone("testCreateStructuredModelJSP");
-	}
-
-	public void testCloneStructuredModelXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the embedded type is correct
-		boolean passed = true;
-		Document doc = ((IDOMModel) clonedModel).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("cloned model did not have embedded adapter", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
-		//		if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
-		//		if (clonedModel.getParser() == model.getParser()) passed = false;
-		//		if (clonedModel.getReParser() == model.getReParser()) passed = false;
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-	public void testCloneStructuredModelJSPXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-		// note, we initialy expect HTML, since there is not content
-		checkEmbeddedType(model, EmbeddedHTML.class);
-
-		String testContent = "<%@ page contentType=\"text/xml\" %>";
-		model.getStructuredDocument().setText(this, testContent);
-
-		// modified for design change, where re-init should be handled before 
-		// set returns.
-		assertTrue("model should not need reinit", !model.isReinitializationNeeded());
-
-		//		but if it did need re-init, here's the right calling sequence		
-		//		if (model.isReinitializationNeeded()) {
-		//			model.aboutToChangeModel();
-		//			model = model.reinit();
-		//			model.changedModel();
-		//		}
-
-		checkEmbeddedType(model, EmbeddedXML.class);
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		checkEmbeddedType(clonedModel, EmbeddedXML.class);
-
-	}
-
-	private void checkEmbeddedType(IStructuredModel model, Class expectedType) {
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("model did not have embedded handler", embeddedHandler);
-
-		assertTrue("embeddedHandler is wrong type", embeddedHandler.getClass().equals(expectedType));
-
-	}
-
-	public void testCreateStructuredModelJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
-		factories = (ArrayList) factories.clone();
-
-		IStructuredModel clonedModel = model.newInstance();
-		if (model.getModelHandler() == null) {
-			System.out.println();
-			assertTrue(false);
-		}
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are correct.
-
-		ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		newFactories = (ArrayList) newFactories.clone();
-
-		boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		// Now, assigning some content shouldn't change the factories
-		clonedModel.getStructuredDocument().replaceText(this, 0, 0, "<sample> text");
-		ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		twoFactories = (ArrayList) twoFactories.clone();
-
-		passed = checkFactoriesListForIdentity(factories, twoFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		clonedModel.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\"");
-		ArrayList threeFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		threeFactories = (ArrayList) threeFactories.clone();
-
-		passed = checkFactoriesListForIdentity(factories, threeFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		passed = checkForSameEmbeddedFactories(model, clonedModel);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-
-	}
-
-	/**
-	 * Method checkEmbeddedFactories.
-	 * @param model
-	 * @param clonedModel
-	 * @return boolean
-	 */
-	private boolean checkForSameEmbeddedFactories(IStructuredModel model, IStructuredModel clonedModel) {
-		boolean result = true;
-
-
-		EmbeddedTypeHandler oldEmbeddedType = getEmbeddedType(model);
-		EmbeddedTypeHandler newEmbeddedType = getEmbeddedType(clonedModel);
-		// expect to be the same type
-		if (!oldEmbeddedType.getClass().equals(newEmbeddedType.getClass())) {
-			result = false;
-			assertTrue(result);
-		}
-
-		List oldFactories = oldEmbeddedType.getAdapterFactories();
-		List newFactories = newEmbeddedType.getAdapterFactories();
-		result = checkFactoriesListForEquivalence(oldFactories, newFactories);
-
-
-		return result;
-	}
-
-	private EmbeddedTypeHandler getEmbeddedType(IStructuredModel model) {
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
-		assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
-		assertNotNull("model did not have embedded handler", embeddedHandler);
-
-		return embeddedHandler;
-	}
-
-
-	/**
-	 * Method checkFactoriesList.
-	 * @param factories
-	 * @param newFactories
-	 * @return boolean
-	 */
-	private boolean checkFactoriesListForIdentity(List factories, List newFactories) {
-		boolean result = true;
-		if (factories.size() != newFactories.size()) {
-			result = false;
-		}
-		else {
-			// nned not be identical, nor same order
-			//			for (int i = 0; i < factories.size(); i++) {
-			//				if (!(factories.get(i) == newFactories.get(i))) {
-			//					result = false;
-			//					break;
-			//				}
-			//			}
-		}
-		return result;
-	}
-
-	private boolean checkFactoriesListForEquivalence(List factories, List newFactories) {
-		boolean result = true;
-		if (factories.size() != newFactories.size()) {
-			result = false;
-		}
-		else {
-			for (int i = 0; i < factories.size(); i++) {
-				if (!factories.get(i).getClass().equals(newFactories.get(i).getClass())) {
-					result = false;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-
-	public void testCreateStructuredModelHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
-		factories = (ArrayList) factories.clone();
-
-		IStructuredModel clonedModel = model.newInstance();
-		assertTrue("cloned model could not be created!", clonedModel != null);
-		// make sure the critical variables are correct.
-
-		ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		newFactories = (ArrayList) newFactories.clone();
-
-		boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-
-		assertTrue("newInstance of structured model is not correct", passed);
-
-		// Now, assigning some content shouldn't change the factories
-		clonedModel.getStructuredDocument().setText(this, "<sample> text");
-		ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
-		twoFactories = (ArrayList) twoFactories.clone();
-
-		passed = checkFactoriesListForIdentity(factories, newFactories);
-		assertTrue("newInstance of structured model is not correct", passed);
-
-	}
-
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
deleted file mode 100644
index 5751c4ee4..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
+++ /dev/null
@@ -1,139 +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.jst.jsp.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerUtility;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-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.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- * @author davidw
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-public class TestModelEmbeddedContentType extends TestCase {
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestModelEmbeddedContentType(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-	}
-
-	public static Test getTest() {
-		return new TestModelEmbeddedContentType("testStructuredModelEmbeddedJSPChange");
-	}
-
-	protected void checkEmbeddedType(IStructuredModel clonedModel, Object expectedType) {
-		Document doc = ((IDOMModel) clonedModel).getDocument();
-		PageDirectiveAdapter embeddedTypeAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-		assertNotNull("cloned model did not have embedded adapter", embeddedTypeAdapter);
-
-		EmbeddedTypeHandler embeddedHandler = embeddedTypeAdapter.getEmbeddedType();
-		assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
-		assertTrue("cloned model embeddedHandler is wrong type", embeddedHandler.equals(expectedType));
-	}
-
-	public void testStructuredModelEmbeddedXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		assertTrue("model could not be created!", model != null);
-
-		// XML should NOT have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
-		assertTrue("embededHanlder should be null for XML", embeddedHandler == null);
-
-	}
-
-	public void testStructuredModelEmbeddedHTML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertTrue("model could not be created!", model != null);
-
-		// should NOT have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
-		assertTrue("embededHanlder should be null for HTML", embeddedHandler == null);
-
-	}
-
-	protected IStructuredModel doStructuredModelEmbeddedJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// should have an embedded type
-		Document doc = ((IDOMModel) model).getDocument();
-		PageDirectiveAdapter embeddedHandler = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
-		assertTrue("embededHanlder should NOT be null for JSP", embeddedHandler != null);
-
-		// embedded type should be HTML since no content
-		checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
-		String testContent = "<%@ page contentType=\"text/html\" %>";
-		model.getStructuredDocument().replaceText(this, 0, 0, testContent);
-		assertTrue("reinit should NOT be needed in this case", !model.isReinitializationNeeded());
-
-		// embedded type should STILL be HTML since no contentType was
-		// text/html
-		checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
-		return model;
-		//
-	}
-
-	public void testStructuredModelEmbeddedJSP() throws IOException {
-		doStructuredModelEmbeddedJSP();
-	}
-
-	public void testStructuredModelEmbeddedJSPChange() throws IOException {
-
-		// start with the full test case
-		IStructuredModel model = doStructuredModelEmbeddedJSP();
-		// change "html" to "xml"
-		model.getStructuredDocument().replaceText(this, 27, 4, "xml");
-		// with reinit in XML model ... its already been re-initialized
-		// assertTrue("reinit SHOULD be needed in this case",
-		// model.isReiniitializationNeeded());
-
-		if (model.isReinitializationNeeded()) {
-			model.reinit();
-		}
-
-		// embedded type should now be XML
-		checkEmbeddedType(model, ModelHandlerUtility.getEmbeddedContentTypeFor("text/xml"));
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
deleted file mode 100644
index 4ea073c5d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
+++ /dev/null
@@ -1,222 +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.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.ui.internal.contentassist.BeanInfoProvider;
-import org.eclipse.jst.jsp.ui.internal.contentassist.IJavaPropertyDescriptor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-
-/**
- * This class tests the BeanInfoProvider. Currently test workspace MUST point
- * to the specific one for this test.
- * 
- * @author pavery
- */
-public class BeanInfoProviderTest extends TestCase {
-	class OverwriteNone implements IOverwriteQuery {
-		public String queryOverwrite(String pathString) {
-			return IOverwriteQuery.ALL;
-		}
-	}
-
-	private IResource fResource;
-	private BeanInfoProvider fProvider;
-	private HashSet fAlreadyOpen = new HashSet();
-	private ProjectUnzipUtility fProjUtil = null;
-	private boolean fIsSetup = false;
-
-	public BeanInfoProviderTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.fIsSetup) {
-			initializeResource();
-			this.fIsSetup = true;
-		}
-	}
-
-	private void initializeResource() throws Exception {
-		fProjUtil = new ProjectUnzipUtility();
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-		// platform location may be null -- depends on "mode" of platform
-		if (platformLocation != null) {
-			File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "beaninfo_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-			fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
-			fProjUtil.initJavaProject("BEANINFO");
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			String workspaceRelativeLocation = "/BEANINFO/BEAN_TESTS/beanInfo_test.jsp";
-			fResource = root.getFile(new Path(workspaceRelativeLocation));
-			IJavaProject javaProj = JavaCore.create(fResource.getProject());
-			openPath(javaProj);
-		}
-	}
-
-	protected File getSourceDirectory(String absoluteSourceDirectoryPath) {
-		File sourceDirectory = new File(absoluteSourceDirectoryPath);
-		if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
-			return null;
-		}
-		return sourceDirectory;
-	}
-
-	private void openPath(IJavaProject javaProj) {
-		try {
-			if (javaProj.exists() && !javaProj.isOpen()) {
-				javaProj.open(null);
-			}
-			IPackageFragmentRoot root = javaProj.getPackageFragmentRoot(fResource.getProject());
-			if (!root.isOpen())
-				root.open(null);
-			IPackageFragment frag = getPackageFragment(root, "BEAN_TESTS");
-			openAll(frag);
-			frag = getPackageFragment(root, "com");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "com.ibm");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-			frag = getPackageFragment(root, "com.ibm.test");
-			if (frag != null && !frag.isOpen())
-				openAll(frag);
-		}
-		catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private IPackageFragment getPackageFragment(IPackageFragmentRoot root, String fragmentName) throws JavaModelException {
-		IPackageFragment frag = null;
-		IJavaElement[] children = root.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].getElementName().equals(fragmentName)) {
-				frag = (IPackageFragment) children[i];
-				break;
-			}
-		}
-		return frag;
-	}
-
-	private void openAll(IJavaElement javaElem) throws JavaModelException {
-		if (javaElem instanceof IOpenable) {
-			if (!((IOpenable) javaElem).isOpen())
-				((IOpenable) javaElem).open(null);
-		}
-		if (javaElem instanceof IParent && ((IParent) javaElem).hasChildren()) {
-			IJavaElement[] children = ((IParent) javaElem).getChildren();
-			for (int i = 0; i < children.length; i++) {
-				if (!fAlreadyOpen.contains(children[i].getElementName())) {
-					fAlreadyOpen.add(children[i].getElementName());
-					openAll(children[i]);
-				}
-			}
-		}
-	}
-
-	public void testAll() {
-		beanOnClasspath();
-		beanInProject();
-	}
-
-	private void beanOnClasspath() {
-		// pa_TODO don't use JButton, properties change
-		// use something more static
-		IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "javax.swing.JButton");
-		//		assertEquals("Number of properties for JButton:", 122, descriptors.length);
-		assertNotNull("descriptors shouldn't be null", descriptors);
-
-		//		List getOnly = new ArrayList();
-		//		List setOnly = new ArrayList();
-		//		List both = new ArrayList();
-		//		IJavaPropertyDescriptor jpd = null;
-		//		for (int i = 0; i < descriptors.length; i++) {
-		//			jpd = descriptors[i];
-		//			if (jpd.getReadable() && jpd.getWriteable())
-		//				both.add(jpd);
-		//			else if (jpd.getReadable() && !jpd.getWriteable())
-		//				getOnly.add(jpd);
-		//			else
-		//				setOnly.add(jpd);
-		//		}
-		//		assertEquals("Number of getOnly properties:", 62, getOnly.size());
-		//assertEquals("Number of setOnly properties:", 0, setOnly.size());
-		//assertEquals("Number of get & set properties that:", 59,
-		// both.size());
-	}
-
-	private void beanInProject() {
-		IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "com.ibm.test.BaseAlbumCollectionBean");
-		assertEquals("Number of properties for BaseAlbumCollectionBean:", 4, descriptors.length);
-		List getOnly = new ArrayList();
-		List setOnly = new ArrayList();
-		List both = new ArrayList();
-		IJavaPropertyDescriptor jpd = null;
-		for (int i = 0; i < descriptors.length; i++) {
-			jpd = descriptors[i];
-			if (jpd.getReadable() && jpd.getWriteable())
-				both.add(jpd);
-			else if (jpd.getReadable() && !jpd.getWriteable())
-				getOnly.add(jpd);
-			else
-				setOnly.add(jpd);
-		}
-		assertEquals("Number of getOnly properties:", 1, getOnly.size());
-		assertEquals("Number of setOnly properties:", 1, setOnly.size());
-		assertEquals("Number of get & set properties that:", 2, both.size());
-		// get only
-		jpd = (IJavaPropertyDescriptor) getOnly.get(0);
-		assertEquals("get readable for get only property: ", true, jpd.getReadable());
-		assertEquals("get writable for get only property:", false, jpd.getWriteable());
-		assertEquals("name for get only property", "numCds", jpd.getDisplayName());
-		assertEquals("type for get only property", "int", jpd.getDeclaredType());
-		// set only
-		jpd = (IJavaPropertyDescriptor) setOnly.get(0);
-		assertEquals("get readable for set only property: ", false, jpd.getReadable());
-		assertEquals("get writable for set only property:", true, jpd.getWriteable());
-		assertEquals("name for set only property", "cds", jpd.getDisplayName());
-		assertEquals("type for set only property", "String[]", jpd.getDeclaredType());
-		// both
-		jpd = (IJavaPropertyDescriptor) both.get(0);
-		assertEquals("get readable for both property: ", true, jpd.getReadable());
-		assertEquals("get writable for both property:", true, jpd.getWriteable());
-	}
-
-	private BeanInfoProvider getProvider() {
-		if (fProvider == null)
-			fProvider = new BeanInfoProvider();
-		return fProvider;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
deleted file mode 100644
index 606d28cc2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.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.jst.jsp.ui.tests.contentassist;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * This class tests the sed JSPJavaTranslator class
- * @author pavery
- */
-public class JSPJavaTranslatorTest extends TestCase {
-
-	public JSPJavaTranslatorTest(String name) {
-		super(name);
-	}
-
-	public void testAllFiles() {
-		// this test is for PMR: 91930  CMVC:218469
-		testJSPInJavascript("testfiles/jspInJavascript.jsp");
-	}
-
-	public void testJSPInJavascript(String filename) {
-		IStructuredModel sm = getStructuredModelForRead(filename);
-		if (sm != null) {
-			IStructuredDocument structuredDocument = sm.getStructuredDocument();
-			String text = structuredDocument.getText();
-
-			IDOMNode xmlNode = (IDOMNode) sm.getIndexedRegion(0);
-
-			if (xmlNode != null) {
-				JSPTranslator jspt = new JSPTranslator();
-				jspt.reset(xmlNode, null);
-				//int sourceTextPos = text.indexOf("<%= testJspString") + 17;
-				//jspt.setSourceCursor(sourceTextPos); // right after the text
-				jspt.translate();
-				String translation = jspt.getTranslation().toString();
-				// offsets are found using JSPTranslation now
-				//int translatedCursorPosition = jspt.getCursorPosition();
-				//assertEquals("incorrect cursor position >" + translatedCursorPosition, 519, translatedCursorPosition);
-				//assertEquals("translation was incorrect", "testJspString", translation.substring(519, 532));
-				int cursorStart = translation.indexOf("out.print(\"\"+\n testJspString") + 14;
-				assertEquals("incorrect cursor position >" + cursorStart, 585, cursorStart);
-			}
-			sm.releaseFromRead();
-		}
-	}
-
-	/**
-	 * IMPORTANT whoever calls this must releaseFromRead after they are done using it.
-	 * @param filename
-	 * @return
-	 */
-	protected IStructuredModel getStructuredModelForRead(String filename) {
-		try {
-			// create model
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			InputStream inStream = getClass().getResourceAsStream(filename);
-			IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
-			return sModel;
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file > " + filename);
-		}
-		return null;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
deleted file mode 100644
index bb2472e4e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ /dev/null
@@ -1,245 +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.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-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.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-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.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * This class unit tests the sed JSPTranslation mechanism.
- * That includes JSPTranslationAdapterFactory, JSPTranslationAdapter, and JSPTranslation.
- * It uses the jsp_include_test.jsp, because of the more complicated translation and offsets.
- * 
- * @author pavery
- */
-public class JSPTranslationTest extends TestCase {
-
-	private ProjectUnzipUtility fProjUtil = null;
-	private boolean isSetup = false;
-
-	public JSPTranslationTest(String name) {
-		super(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.isSetup) {
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-
-	private void doSetup() throws Exception {
-		fProjUtil = new ProjectUnzipUtility();
-
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "includes_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
-		fProjUtil.initJavaProject("INCLUDES_TESTS");
-	}
-
-	public void testAll() {
-		getTranslationAdapterTest();
-		translationAdapterTest();
-		translationTextTest();
-		translationPositionsTest();
-	}
-
-	private void translationPositionsTest() {
-
-		IDOMModel model = getIncludeTestModelForRead();
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-		try {
-			HashMap java2jsp = translation.getJava2JspMap();
-			assertEquals("java2jsp map size:", 11, java2jsp.size());
-
-			HashMap jsp2java = translation.getJsp2JavaMap();
-			assertEquals("jsp2java map size:", 3, jsp2java.size());
-
-			// some test positions (out.print("" + | );)
-			
-			// we need to ignore the classname length in our comparisons
-			// with java offsets that we get from the translation
-			// since it can vary depending on workspace location
-			int classnameLength = translation.getClassname().length();
-			
-			int jspTestPosition = translation.getJspText().indexOf("<%= ") + 4;
-			int javaOffset = translation.getJavaOffset(jspTestPosition) - classnameLength;
-			assertEquals("JSPTranslation java offset:", 890, javaOffset);
-			
-			// (<%= | %>)
-			int javaTestPostition = translation.getJavaText().indexOf("out.print(\"\"+\n   \n);") + 14;
-			// dont' need to worry about classname length here because we are comparing
-			// with a position in the JSP document (which doesn't contain classname)
-			int jspOffset = translation.getJspOffset(javaTestPostition);
-			assertEquals("JSPTranslation jsp offset:", 564, jspOffset);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	private static String loadChars(InputStream input) {
-
-		StringBuffer s = new StringBuffer();
-		try {
-			int c = -1;
-			while ((c = (char) input.read()) >= 0) {
-				if (c > 255)
-					break;
-				s.append((char) c);
-			}
-			input.close();
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while loading :");
-			System.out.println(e);
-		}
-		return s.toString();
-	}
-
-	private void translationTextTest() {
-
-		IDOMModel model = getIncludeTestModelForRead();
-		ScannerUnitTests.verifyLengths(model, model.getStructuredDocument().get());
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-		// named as .bin so no line conversion occurs (\n is in use)
-		InputStream in = getClass().getResourceAsStream("translated_text.bin");
-		String knownTranslationText = loadChars(in);
-		try {
-			// improvements: may need finer tuned text compares later
-			// for different types of translations (includes, xml-jsp in script, attributes, etc...)
-			String text = translation.getJavaText();
-			
-			int splitStart = text.indexOf(translation.getClassname());
-			int splitEnd = splitStart + translation.getClassname().length();
-			String newText  = text.substring(0, splitStart) + text.substring(splitEnd);
-			
-			assertNotNull("JSP translation text:", newText);
-			assertEquals("JSP translation text does not match expected", knownTranslationText, newText);
-			assertEquals("translation length:", 935, newText.length());
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void translationAdapterTest() {
-		IDOMModel model = getIncludeTestModelForRead();
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = adapter.getJSPTranslation();
-
-		try {
-			IJavaProject proj = adapter.getJavaProject();
-			assertNotNull("couldn't get java project:" + proj);
-
-			translation = adapter.getJSPTranslation();
-			assertNotNull("couldn't get translation:", translation);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	private void getTranslationAdapterTest() {
-		IDOMModel model = getIncludeTestModelForRead();
-		JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-
-		try {
-			assertNotNull("XMLModel null:", model);
-
-			setupAdapterFactory(model);
-
-			IDOMDocument doc = model.getDocument();
-			adapter = (JSPTranslationAdapter) doc.getAdapterFor(IJSPTranslation.class);
-			assertNotNull("couldn't get JSPTranslationAdapter:", adapter);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	/**
-	 * add the factory for JSPTranslationAdapter here
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-		JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-		sm.getFactoryRegistry().addFactory(factory);
-	}
-
-	/**
-	 * IMPORTANT - release model (model.releaseFromRead()) after use
-	 * @param file
-	 * @return
-	 */
-	private IStructuredModel getStructuredModelForRead(IFile file) {
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			return modelManager.getModelForRead(file);
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file > " + file);
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	private IDOMModel getIncludeTestModelForRead() {
-
-		IPath jspTestFilePath = new Path("INCLUDES_TESTS/jsp_include_test.jsp");
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-		IDOMModel xmlModel = (IDOMModel) getStructuredModelForRead(file);
-		setupAdapterFactory(xmlModel);
-		return xmlModel;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
deleted file mode 100644
index f8c7c028c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script> 
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<%  %>
-<P>Place jspInJavascript.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
deleted file mode 100644
index b07e0229a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
+++ /dev/null
@@ -1,31 +0,0 @@
-public class  extends javax.servlet.http.HttpServlet{
- String argh = "argh"; 
-
- protected String with_space = "withspace";
-
- public String globalIncludedString = "included";
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
-		throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.http.HttpSession session = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-
-try {
- int include_include_int = 5; 
-javax.swing.JButton includesUseBean = new javax.swing.JButton();
- String localIncludedString = globalIncludedString;
-for(int i=0; i<5; i++) {
-}
-javax.swing.JButton BEAN_includedBean = new javax.swing.JButton();
-out.print(""+
-i
-);
-out.print(""+
-   
-);
- } catch (java.lang.Exception e) {} 
-}}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index d8e866bbb..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,342 +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.jst.jsp.ui.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
-	private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertNotNull("Test Case in error. Could not find file " + filePath, file);
-		IPath locationPath = file.getLocation();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		bufferManager.connect(locationPath, null);
-		ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
-		IDocument document = buffer.getDocument();
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		IDocumentPartitioner setupPartitioner = null;
-		if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-			setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-		}
-		else {
-			setupPartitioner = document.getDocumentPartitioner();
-		}
-		assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		bufferManager.disconnect(locationPath, null);
-
-//		doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-		 
-	}
-
-	/**
-	 * @param file
-	 * @param expectedDocumentClass
-	 * @param expectedPartioner
-	 * @throws CoreException
-	 * @throws IOException
-	 */
-//	private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-//		DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-//		IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-//		assertNotNull(document);
-//	}
-
-	private void doTestCreateCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
-		IPath locationPath = new Path(filePath);
-		IFile nonExistingFile = fTestProject.getFile(locationPath);
-		locationPath = nonExistingFile.getFullPath();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		// can not "connect" to non-existant location
-		//bufferManager.connect(locationPath, BasicStructuredDocument.class,
-		// StructuredTextPartitionerForXML.class);
-		IDocument document = bufferManager.createEmptyDocument(locationPath);
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
-		bufferManager.disconnect(locationPath, null);
-
-	}
-
-/*
-
-	public void testFile103() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile104() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile105() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile106() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile107() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile108() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile109() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile110() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile111() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile112() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile113() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile114() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile115() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile116() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile117() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile118() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile119() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile120() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile121() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile122() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile123() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile124() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile125() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile126() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile127() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile128() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXML() throws CoreException {
-		doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleCase() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	
-	public void testFile1() throws CoreException, IOException {
-		doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
-	}
-
-*/
-
-	public void testFile70() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile90() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile100() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-
-	public void testFile71() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile79() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index 08f1fddb7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-
-/**
- * @author pavery
- */
-public class UnzippedProjectTester extends TestCase {
-
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static int nSetups = 0;
-	private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		nSetups++;
-		if (!fTestProjectInitialized) {
-			getAndCreateProject();
-			// unzip files to the root of workspace directory
-			String destinationProjectString = fTestProject.getLocation().toOSString();
-			String destinationFolder = destinationProjectString + "/";
-			// this zip file is sitting in the "root" of test plugin
-			File zipFile = JSPUITestsPlugin.getTestFile("testfiles.zip");
-			ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-			projUtil.unzipAndImport(zipFile, destinationFolder);
-			projUtil.initJavaProject(TEST_PROJECT_NAME);
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		nSetups--;
-		if (nSetups == 0) {
-			if (!DEBUG) {
-				//				Display display = PlatformUI.getWorkbench().getDisplay();
-				//				display.asyncExec(new Runnable() {
-				//					public void run() {
-				//						ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-				//						IProject proj = fTestProject;
-				//						fTestProject = null;
-				//						try {
-				//							projUtil.deleteProject(proj);
-				//						} catch (Exception e) {
-				//							e.printStackTrace();
-				//						}
-				//					}
-				//				});
-			}
-		}
-	}
-
-	private static final boolean DEBUG = false;
-
-	private static void getAndCreateProject() throws CoreException {
-		//TestsPlugin testsPlugin = (TestsPlugin)
-		// Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-		// this form creates project as "linked" back to 'fileRoot'
-		//createProject(testProject, new Path(fileRoot), null);
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-		//		IContainer dotestFiles = testProject.getFolder("dotestFiles");
-		//		assertTrue(dotestFiles.exists());
-		//		IResource[] allFolders = dotestFiles.members();
-		//		assertNotNull(allFolders);
-	}
- 
-	private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try {
-			if (!project.exists()) {
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath)) {
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen()) {
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
deleted file mode 100644
index d41da590c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
+++ /dev/null
@@ -1,73 +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.jst.jsp.ui.tests.examples;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-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.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CreatingJSPExpression extends TestCase {
-
-	/**
-	 * 
-	 */
-	public CreatingJSPExpression() {
-		super();
-	}
-
-	/**
-	 * @param name
-	 */
-	public CreatingJSPExpression(String name) {
-		super(name);
-	}
-
-	public void testCreateJSPExpression() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-
-		Document doc = ((IDOMModel) model).getDocument();
-
-		Element jspexpression = doc.createElement("jsp:expression");
-		((IDOMElement) jspexpression).setJSPTag(true);
-		doc.appendChild(jspexpression);
-		Text javacode = doc.createTextNode(" // some java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
-		jspexpression.appendChild(javacode);
-
-
-		Text cdatasection = doc.createCDATASection(" // some cdata java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
-		doc.appendChild(cdatasection);
-
-		// format's not needed, just prettier ... not sure why 
-		// it won't work right on whole document.
-		new NodeFormatter().format(jspexpression);
-		new NodeFormatter().format(cdatasection);
-		System.out.println("document text: ");
-		System.out.println(model.getStructuredDocument().get());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index f0d1bd018..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,254 +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.jst.jsp.ui.tests.model;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
-	public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXMLDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNonExistentDocument("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestCreate("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testNonExistentJSPDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNonExistentDocument("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleDocumentCaseXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmptyDocument("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleDocumentCaseJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmptyDocument("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testComplexCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testReload() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestReload("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-/*  
- * TODO: these test files are missing, for some reason when running on build machine ... need to re-construct
-	public void testNearEmptyJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/jsp/nearEmpty.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testNearEmptyXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/xml/nearEmpty.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNearEmptyHTML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		doTestNotEmpty("testfiles/html/nearEmpty.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
-	}
-*/
-	private void doTestNotEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = doTestCreate(filePath, expectedDocumentClass, expectedPartioner);
-		assertNotNull("contents were null", contents);
-		assertTrue("contents were empty", contents.length() > 0);
-
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private void doTestNotEmptyDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredDocument document = modelManager.createStructuredDocumentFor(file);
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		IDocumentPartitioner setupPartitioner = null;
-		if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-			setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-		}
-		else {
-			setupPartitioner = document.getDocumentPartitioner();
-		}
-		assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		contents = document.get();
-		assertNotNull("contents were null", contents);
-		assertTrue("contents were empty", contents.length() > 0);
-
-	}
-
-	private void doTestNonExistentDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		boolean expectedExceptionCaught = false;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredDocument document = null;
-		try {
-			document = modelManager.createStructuredDocumentFor(file);
-		} catch (FileNotFoundException e) {
-			expectedExceptionCaught = true;
-		}
-
-		if (expectedExceptionCaught) {
-			document = modelManager.createNewStructuredDocumentFor(file);
-			assertNotNull(document);
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-			contents = document.get();
-			assertNotNull("contents were null", contents);
-			assertTrue("contents were *not* empty as expected", contents.length() == 0);
-		} else {
-			assertTrue("FileNotFound exception was *not* thrown as expected", false);
-		}
-
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private void doTestReload(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-		try {
-			assertNotNull(model);
-			IStructuredDocument document = model.getStructuredDocument();
-			assertNotNull(document);
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
-			InputStream inStream = null;
-			try {
-				inStream = file.getContents();
-				model.reload(inStream);
-				assertNotNull(model);
-				IStructuredDocument documentReloaded = model.getStructuredDocument();
-				// note: NOT same instance of document
-				// FIXME: this test has to be changed back, once the reload
-				// API is
-				// fixed to work with different document.
-				// assertFalse(document == documentReloaded);
-				assertTrue(document == documentReloaded);
-			} finally {
-				if (inStream != null) {
-					inStream.close();
-				}
-			}
-		} finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * @param string
-	 * @param class1
-	 * @param class2
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws ResourceInUse
-	 * @throws ResourceAlreadyExists
-	 */
-	private String doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-		String contents = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		// file will be null if the resource does not exist
-		if (file == null) {
-			file = fTestProject.getFile(filePath);
-		}
-		IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-		try {
-			assertNotNull(model);
-			IStructuredDocument document = model.getStructuredDocument();
-			assertNotNull(document);
-			contents = document.get();
-			assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-			IDocumentPartitioner setupPartitioner = null;
-			if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
-				setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-			}
-			else {
-				setupPartitioner = document.getDocumentPartitioner();
-			}
-			assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-		} finally {
-			if (model != null)
-				model.releaseFromEdit();
-		}
-		return contents;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
deleted file mode 100644
index 7bdbb4b53..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.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.jst.jsp.ui.tests.modelquery;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-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.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author pavery
- */
-public class ModelQueryTester extends TestCase {
-
-	private final boolean testShippedDTDLookup = false;
-
-	// Our Structured Model, which should always be an XMLModel (or subclass)
-	protected IDOMModel fModel = null;
-
-	protected ModelQuery fModelQuery = null;
-
-	public ModelQueryTester(String name) {
-		super(name);
-	}
-
-	protected static Test suite() {
-		return new TestSuite(ModelQueryTester.class);
-	}
-
-	public static void main(java.lang.String[] args) {
-		if (args == null || args.length == 0) {
-			runAll();
-		} else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-
-	}
-
-	protected static void runAll() {
-		TestRunner.run(suite());
-
-	}
-
-	protected static void runOne(String methodName) {
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new ModelQueryTester(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-	}
-
-	/**
-	 * Create an empty HTML model
-	 */
-	protected void setUpHTML() {
-		fModel = (IDOMModel) createModel(ContentTypeIdForHTML.ContentTypeID_HTML);
-		initVars();
-	}
-
-	/**
-	 * Create an empty XML model
-	 */
-	protected void setUpXML() {
-		fModel = (IDOMModel) createModel(ContentTypeIdForXML.ContentTypeID_XML);
-		initVars();
-	}
-
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		// This method was emptied when a test case required a different model
-		// type than HTML. At that point, we needed separate methods to create
-		// each type
-		// and had to call them from the test cases directly, like in
-		// ScannerUnitTests
-	}
-
-	/**
-	 * Initialize local fields for this test
-	 */
-	protected void initVars() {
-		fModelQuery = ModelQueryUtil.getModelQuery(fModel.getDocument());
-
-
-	}
-
-	/**
-	 * Test the HTML BODY Element for the "bgcolor" attribute declaration
-	 */
-	public void testBodyElement() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
-		// text
-
-		// TEST getting a CMElementDeclaration
-		Element bodyElement = (Element) fModel.getIndexedRegion(7); // node at
-		// offset7--should
-		// be
-		// <body>
-		CMElementDeclaration bodyDecl = fModelQuery.getCMElementDeclaration(bodyElement);
-
-		int contentType = bodyDecl.getContentType();
-		assertTrue("CMElementDeclaration CONTENT TYPE INCORRECT FOR BODY", (contentType == CMElementDeclaration.MIXED));
-
-		// get permissible attrs
-		CMNamedNodeMap map = bodyDecl.getAttributes();
-		assertTrue("ATTRIBUTES FROM ELEMENT DECLARATION == NULL", (map != null));
-		Vector allowed = new Vector();
-		for (int i = 0; i < map.getLength(); i++) {
-			CMAttributeDeclaration node = (CMAttributeDeclaration) map.item(i);
-			String name = node.getNodeName();
-			allowed.add(name);
-			if (name.equalsIgnoreCase("bgcolor")) {
-				assertTrue("GOT INCORRECT ATTRIBUTE NODE TYPE", (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION));
-
-				CMDataType attrType = node.getAttrType();
-				// System.out.println("attribute type > " + attrType);
-				assertTrue("COULD NOT GET ATTRIBUTE TYPE", (attrType != null));
-				assertTrue("COULDN'T GET IMPLIED VALUE KIND", (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_NONE));
-			}
-		}
-	}
-
-	/**
-	 * Test the HTML HTML Element for its declared children
-	 */
-	public void testHtmlChildren() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html></html>"); // set text
-		Element htmlElement = fModel.getDocument().getDocumentElement();
-		CMElementDeclaration htmlDecl = fModelQuery.getCMElementDeclaration(htmlElement);
-
-		// HTML's children are within a group
-		CMContent contents = htmlDecl.getContent();
-
-		assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
-		CMGroup group = (CMGroup) contents;
-		int operator = group.getOperator();
-		CMNodeList childList = group.getChildNodes();
-		int max = contents.getMaxOccur();
-		int min = contents.getMinOccur();
-
-		// the group should be allowed once, with a sequence whose first entry
-		// is the declaration for HEAD
-		assertTrue("occurrance of group", min == 1 && max == 1);
-		assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
-		assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
-		assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.HEAD));
-
-		assertTrue("content descriptor type, position 1", childList.item(1).getNodeType() == CMNode.GROUP);
-		// The second child should be a group as well, containing BODY and
-		// FRAMESET with an
-		// operator of CMGroup.CHOICE
-		assertTrue("content descriptor type, position 1 - relationship of group", ((CMGroup) childList.item(1)).getOperator() == CMGroup.CHOICE);
-	}
-
-	public void testFormMethodAttr() {
-		setUpHTML();
-		fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
-		// text
-
-		// TEST GETTING A CMAttributeDeclaratoin
-		Element formElement = (Element) fModel.getIndexedRegion(31); // <form>
-		Attr attrNode = formElement.getAttributeNode(HTML40Namespace.ATTR_NAME_METHOD);
-		CMAttributeDeclaration methodAttrDecl = fModelQuery.getCMAttributeDeclaration(attrNode);
-		assertTrue("Content Model missing the attribute declaration for \"method\"", methodAttrDecl != null);
-
-		List values = getValidStrings(formElement, methodAttrDecl);
-		assertTrue("wrong number of values for attribute \"method\"", (values.size() == 2));
-		assertTrue("default value for attribute \"method\" is wrong", (methodAttrDecl.getAttrType().getImpliedValue().equalsIgnoreCase("get")));
-	}
-
-	/**
-	 * A short test to ensure that a DTD can be loaded from a system
-	 * reference.
-	 * 
-	 * Note: May require a functioning network connection for the references
-	 * to be resolved properly.
-	 */
-	public void testDTDLoadFromSystemID_1() {
-		if (testShippedDTDLookup) {
-			setUpXML();
-			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
-			String diskLocation = null;
-			try {
-				diskLocation = Platform.resolve(installationPath).toExternalForm();
-			} catch (IOException e) {
-			} catch (NullPointerException e) {
-			}
-			assertTrue("failed to resolve plugin install path", diskLocation != null);
-			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "TestFiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd\"" + "><html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:wml=\"http://www.wapforum.org/2001/wml\"></html>";
-			fModel.getStructuredDocument().set(content);
-			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
-			Node domNode = (Node) fModel.getIndexedRegion(content.length() - 2);
-			CMNode node = fModelQuery.getCMNode(domNode);
-			assertTrue("wml20.dtd failed to load", node != null && node.getNodeName().equalsIgnoreCase("html"));
-		}
-	}
-
-
-	/**
-	 * A short test to ensure that a DTD, the XHTML 1.0 Transitional one, can
-	 * be loaded from a system reference.
-	 * 
-	 * Note: May require a functioning network connection for the references
-	 * to be resolved properly.
-	 */
-	public void testDTDLoadFromSystemID_2() {
-		if (testShippedDTDLookup) {
-			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
-			String diskLocation = null;
-			try {
-				diskLocation = Platform.resolve(installationPath).toExternalForm();
-			} catch (IOException e) {
-			} catch (NullPointerException e) {
-			}
-			assertTrue("failed to resolve plugin install path", diskLocation != null);
-			setUpXML();
-			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "testfiles/XHTML/xhtml1-transitional.dtd\"" + "><html></html>";
-			fModel.getStructuredDocument().set(content);
-
-			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
-			// see defect 282429
-			CMElementDeclaration htmlDecl = (CMElementDeclaration) fModelQuery.getCMNode((Node) fModel.getIndexedRegion(content.length() - 2));
-			assertTrue("xhtml1-transitional.dtd not loaded", htmlDecl != null);
-
-			// HTML's children are within a group
-			CMContent contents = htmlDecl.getContent();
-
-			assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
-			CMGroup group = (CMGroup) contents;
-			int operator = group.getOperator();
-			CMNodeList childList = group.getChildNodes();
-			int max = contents.getMaxOccur();
-			int min = contents.getMinOccur();
-
-			// the group should be allowed once, with a sequence whose first
-			// entry
-			// is the declaration for HEAD
-			assertTrue("occurrance of group", min == 1 && max == 1);
-			assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
-			assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
-			assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equals(HTML40Namespace.ElementName.HEAD.toLowerCase()));
-			assertTrue("child order (BODY second)", childList.item(1).getNodeName().equals(HTML40Namespace.ElementName.BODY.toLowerCase()));
-		}
-	}
-
-	/**
-	 * A short test to ensure that the DTD for JSP 1.2 tag libraries can be
-	 * loaded from a public reference registered in the XML catalog
-	 */
-	public void testDTDLoadFromPublicID() {
-		// No longer provided in WTP
-		// TODO: provide DTD?
-//		if (testShippedDTDLookup) {
-//			setUpXML();
-//			String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN\"> <taglib><tag>foo</tag></taglib>";
-//			fModel.getStructuredDocument().set(contents);
-//
-//			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-//			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-//			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-//
-//
-//			// taglib
-//			CMNode node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 2));
-//			assertTrue("web-jsptaglibrary_1_2.dtd failed to load through catalog", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("taglib"));
-//
-//			// tag
-//			node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 12));
-//			assertTrue("CMElementDeclaration for \"tag\" from web-jsptaglibrary_1_2.dtd is missing", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("tag"));
-//			CMContent content = ((CMElementDeclaration) node).getContent();
-//			assertTrue("only one occurrence of child group allowed", content.getNodeType() == CMNode.GROUP && content.getMaxOccur() == 1);
-//		}
-	}
-
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public static IStructuredModel createModel(String contentTypeID) {
-		// create an empty model with its default factories
-		IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-
-		// add editor adapter factories
-		AdapterFactoryRegistry adapterRegistry = JSPUIPlugin.getDefault().getAdapterFactoryRegistry();
-		Iterator adapterList = adapterRegistry.getAdapterFactories();
-		// And all those appropriate for this particular type of content
-		while (adapterList.hasNext()) {
-			try {
-				AdapterFactoryProvider provider = (AdapterFactoryProvider) adapterList.next();
-				if (provider.isFor(model.getModelHandler())) {
-					provider.addAdapterFactories(model);
-				}
-			} catch (Exception e) {
-				Logger.logException(e);
-			}
-		}
-		return model;
-	}
-
-	/**
-	 * Return the valid values for an attribute with the given declaration on
-	 * the given element. Derived from XMLPropertySourceAdapter
-	 */
-	private List getValidStrings(Element element, CMAttributeDeclaration attrDecl) {
-		CMDataType valuesHelper = attrDecl.getAttrType();
-		Vector values = new Vector();
-
-		if (valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED && valuesHelper.getImpliedValue() != null) {
-			// FIXED value
-			values.add(valuesHelper.getImpliedValue());
-		} else {
-			// ENUMERATED values
-			String[] valueStrings = null;
-			// new way
-			valueStrings = fModelQuery.getPossibleDataTypeValues(element, attrDecl);
-			if (valueStrings == null)
-				// older way
-				valueStrings = attrDecl.getAttrType().getEnumeratedValues();
-			if (valueStrings != null) {
-				for (int i = 0; i < valueStrings.length; i++) {
-					values.add(valueStrings[i]);
-				}
-			}
-		}
-		if (valuesHelper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE && valuesHelper.getImpliedValue() != null) {
-			if (!values.contains(valuesHelper.getImpliedValue()))
-				values.add(valuesHelper.getImpliedValue());
-		}
-
-		return values;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
deleted file mode 100644
index 82eccdf94..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
+++ /dev/null
@@ -1,59 +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.jst.jsp.ui.tests.other;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/21/00 4:14:40 PM)
- * @author: David Williams
- */
-public class ColorRegions extends java.util.Vector {
-	/**
-	 * Default <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * ColorRegions constructor comment.
-	 */
-	public ColorRegions() {
-		super();
-	}
-
-	/**
-	 * ColorRegions constructor comment.
-	 * @param initialCapacity int
-	 */
-	public ColorRegions(int initialCapacity) {
-		super(initialCapacity);
-	}
-
-	/**
-	 * ColorRegions constructor comment.
-	 * @param initialCapacity int
-	 * @param capacityIncrement int
-	 */
-	public ColorRegions(int initialCapacity, int capacityIncrement) {
-		super(initialCapacity, capacityIncrement);
-	}
-
-	public int[] asIntArray() {
-		trimToSize();
-		int arraySize = elementData.length;
-		int[] results = new int[arraySize];
-		//
-		for (int i = 0; i < arraySize; i++) {
-			results[i] = ((Integer) elementData[i]).intValue();
-		}
-		//
-		return results;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
deleted file mode 100644
index a3f4676aa..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
+++ /dev/null
@@ -1,104 +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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.PrintStream;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class DebugDocument {
-
-	public static void dump(Document document) {
-		if (document == null)
-			return;
-		System.out.println("Dump of DOM"); //$NON-NLS-1$
-
-		dump(document, System.out);
-
-		//
-		System.out.println();
-		System.out.println("= = = = = ="); //$NON-NLS-1$
-		System.out.println();
-
-	}
-
-	public static void dump(Document document, PrintStream out) {
-		Node node = document.getFirstChild();
-		while (node != null) {
-			dump(node, out);
-			node = node.getNextSibling();
-		}
-
-	}
-
-	public static void dump(Node topNode) {
-		dump(topNode, System.out);
-	}
-
-	public static void dump(Node topNode, PrintStream out) {
-		if (topNode == null)
-			return;
-		// print out this node
-		//
-		printNode(topNode, out);
-
-		// now print out its children
-		//NodeList nodes = topNode.getChildNodes();
-		//int len = nodes.getLength();
-		//for (int i = 0; i < len; i++) {
-
-		//Node node = nodes.item(i);
-		//dump(node, out);
-		//}
-	}
-
-	public static void printNode(Node topNode) {
-		printNode(topNode, System.out);
-
-	}
-
-	public static void printNode(Node topNode, PrintStream out) {
-		// print out this node
-		//
-		IStructuredDocumentRegion firstStructuredDocumentRegion = ((IDOMNode) topNode).getFirstStructuredDocumentRegion();
-		IStructuredDocumentRegion lastStructuredDocumentRegion = ((IDOMNode) topNode).getLastStructuredDocumentRegion();
-		if ((firstStructuredDocumentRegion == null) || (lastStructuredDocumentRegion == null)) {
-			// no text to output
-		} else {
-			int start = firstStructuredDocumentRegion.getStart();
-			int end = lastStructuredDocumentRegion.getEnd();
-
-			String outString = topNode.toString();
-			outString = org.eclipse.wst.sse.core.internal.util.StringUtils.escape(outString);
-			out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-		}
-		// now do its children
-		NodeList nodes = topNode.getChildNodes();
-		int len = nodes.getLength();
-		for (int i = 0; i < len; i++) {
-			Node childNode = nodes.item(i);
-			printNode(childNode, out);
-		}
-
-	}
-
-	public DebugDocument() {
-		super();
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
deleted file mode 100644
index 58642fb73..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
+++ /dev/null
@@ -1,1257 +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.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-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.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.CoreNodeList;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * @author Nitin Dahyabhai <nitind@us.ibm.com>
- */
-public class ScannerUnitTests extends TestCase {
-
-	public static boolean checkComplexRegionTypes(ITextRegionList regions, String[] contexts, String[][] embeddedContexts) {
-
-		int embedCount = 0;
-		Iterator iterator = regions.iterator();
-		for (int i = 0; i < contexts.length; i++) {
-			if (!iterator.hasNext())
-				return false;
-			ITextRegion region = (ITextRegion) iterator.next();
-			if (region.getType() == contexts[i]) {
-				if (region instanceof ITextRegionContainer) {
-					ITextRegionContainer container = (ITextRegionContainer) region;
-					boolean embeddedResult = checkSimpleRegionCount(container, embeddedContexts[embedCount].length) && checkSimpleRegionTypes(container.getRegions(), embeddedContexts[embedCount]);
-					embedCount++;
-					if (embeddedResult)
-						continue;
-					else
-						return false;
-				}
-				else {
-					continue;
-				}
-			}
-			return false;
-		}
-		return true;
-	}
-
-	public static boolean checkModelLength(IStructuredDocument document, int length) {
-		return checkModelLength(document.getLastStructuredDocumentRegion(), length);
-	}
-
-	public static boolean checkModelLength(IStructuredDocumentRegion region, int length) {
-		return region.getEndOffset() == length;
-	}
-
-	public static boolean checkSimpleRegionCount(ITextRegionContainer regionContainer, int size) {
-
-		// yes, this looks silly, but it makes it easier to find the exact
-		// failure point
-		if (!(regionContainer.getRegions().size() == size))
-			return false;
-		return true;
-	}
-
-	public static boolean checkSimpleRegionCounts(IStructuredDocumentRegionList regionContainers, int[] sizes) {
-
-		int containers = regionContainers.getLength();
-		if (containers != sizes.length)
-			return false;
-		for (int i = 0; i < sizes.length; i++) {
-			if (i >= containers)
-				return false;
-			if (regionContainers.item(i).getNumberOfRegions() == sizes[i])
-				continue;
-			return false;
-		}
-		return true;
-	}
-
-	public static boolean checkSimpleRegionTypes(ITextRegionList regions, String[] contexts) {
-
-		for (int i = 0; i < contexts.length; i++) {
-			ITextRegion region = regions.get(i);
-			if (region.getType() == contexts[i])
-				continue;
-			//			else
-			//				Sys("region "+ i + ": "+region.getType()+" != " + contexts[i]);
-			return false;
-		}
-		return true;
-	}
-
-	public static String loadChars(InputStream input) {
-
-		StringBuffer s = new StringBuffer();
-		try {
-			int c = -1;
-			while ((c = (char) input.read()) >= 0) {
-				if (c > 255)
-					break;
-				s.append((char) c);
-			}
-			input.close();
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while scanning :");
-			System.out.println(e);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return s.toString();
-	}
-
-	/**
-	 * Starts the application.
-	 * 
-	 * @param args
-	 *            an array of command-line arguments
-	 */
-	public static void main(java.lang.String[] args) {
-
-		if (args == null || args.length == 0) {
-			runAll();
-		}
-		else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-	}
-
-	protected static void runAll() {
-
-		junit.textui.TestRunner.run(suite());
-	}
-
-	protected static void runOne(String methodName) {
-
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new ScannerUnitTests(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-	}
-
-	protected static Test suite() {
-
-		return new TestSuite(ScannerUnitTests.class);
-	}
-
-	public static void verifyLengths(int startOffset, IStructuredDocumentRegion firstDocumentRegion, String text) {
-		IStructuredDocumentRegion holdRegion = firstDocumentRegion;
-		assertTrue("document does not start at expected offset", holdRegion.getStartOffset() == startOffset);
-		int lastEnd = 0;
-		while (holdRegion != null && holdRegion.getEndOffset() > 0) {
-			assertTrue("zero-length StructuredDocumentRegion found", holdRegion.getStartOffset() == lastEnd);
-			assertTrue("TextRegionless StructuredDocumentRegion found", holdRegion.getNumberOfRegions() > 0);
-			ITextRegionList list = holdRegion.getRegions();
-			int index = 0;
-			for (int i = 0; i < list.size(); i++) {
-				ITextRegion region = list.get(i);
-				assertTrue("text region seams don't match", region.getStart() == index);
-				index += region.getLength();
-			}
-			lastEnd = holdRegion.getEndOffset();
-			holdRegion = holdRegion.getNext();
-		}
-
-		holdRegion = firstDocumentRegion;
-		while (holdRegion != null && holdRegion.getNext() != null) {
-			holdRegion = holdRegion.getNext();
-		}
-		checkModelLength(holdRegion, text.length());
-	}
-
-	public static void verifyLengths(int startOffset, IStructuredDocumentRegionList list, String text) {
-		verifyLengths(startOffset, list.item(0), text);
-	}
-
-	public static void verifyLengths(IStructuredDocument document, String text) {
-		verifyLengths(0, document.getFirstStructuredDocumentRegion(), text);
-	}
-
-	public static void verifyLengths(IStructuredModel model, String text) {
-		verifyLengths(model.getStructuredDocument(), text);
-	}
-
-	protected IStructuredDocument fModel;
-	protected String input;
-	private BlockTagParser parser;
-	protected Object type;
-
-	public ScannerUnitTests(String name) {
-
-		super(name);
-	}
-
-	protected void appendTagBlock(StringBuffer buffer, String tagname, int length) {
-
-		buffer.append('<');
-		buffer.append(tagname);
-		buffer.append('>');
-		for (int i = 0; i < length; i++)
-			buffer.append('_');
-		buffer.append("</");
-		buffer.append(tagname);
-		buffer.append('>');
-	}
-
-	protected void setUp() {
-
-		setUpXML(null);
-	}
-
-	protected IStructuredDocumentRegionList setUpJSP(String text) {
-
-		setupModel(new ModelHandlerForJSP());
-		parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-
-		/*
-		 * IStructuredDocumentRegionList nodes = setUpJSP("content <script>
-		 * <%= expression %> </script> <a> </a> <foo:disallowJSP> <%= %>
-		 * </foo:disallowJSP> >"); parser.addBlockMarker(new
-		 * BlockMarker("jsp:declaration", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
-		 * BlockMarker("jsp:expression", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
-		 * BlockMarker("jsp:scriptlet", null,
-		 * XMLJSPRegionContexts.JSP_CONTENT, true));
-		 */
-		input = text;
-		fModel.set(input);
-		return fModel.getRegionList();
-	}
-
-	/*
-	 * protected void setupModel(Object contentType) { if(contentType == null)
-	 * type = com.ibm.sed.model.IStructuredModel.XML; else type = contentType;
-	 * fModel = new
-	 * com.ibm.sed.structuredDocument.impl.IStructuredDocument(type); parser =
-	 * (HTMLSourceParser)fModel.getParser(); }
-	 */
-	protected void setupModel(IModelHandler contentType) {
-
-		fModel = (IStructuredDocument) contentType.getDocumentLoader().createNewStructuredDocument();
-		this.parser = (BlockTagParser) fModel.getParser();
-	}
-
-	protected IStructuredDocumentRegionList setUpXML(String text) {
-
-		setupModel(new ModelHandlerForXML());
-		parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-		input = text;
-		fModel.set(input);
-		return fModel.getRegionList();
-	}
-
-	protected void testBlockScanBufferBoundaries(String contentTypeID) {
-		IStructuredDocument document = null;
-		// the interesting offsets are around 16k (16384)
-		// for (int i = 16500; i > 16100; i--) {
-		// for (int i = 17000; i > 15000; i--) {
-		for (int i = 16384 + 25; i > 16364 - 25; i--) {
-			StringBuffer text = new StringBuffer();
-			document = StructuredModelManager.getModelManager().createStructuredDocumentFor(contentTypeID);
-			appendTagBlock(text, "script", i);
-			String string = text.toString();
-			try {
-				document.setText(this, string);
-				verifyLengths(document, string);
-				assertTrue("too few document regions [run value " + i + "] ", new CoreNodeList(document.getFirstStructuredDocumentRegion()).getLength() == 3);
-				verifyLengths(document, string);
-				IStructuredDocumentRegion startTag = document.getFirstStructuredDocumentRegion();
-				IStructuredDocumentRegion middleBlock = startTag.getNext();
-//				IStructuredDocumentRegion endTag = middleBlock.getNext();
-				assertTrue("not block text in middle", middleBlock.getFirstRegion().getType() == DOMRegionContext.BLOCK_TEXT);
-			}
-			catch (Exception e) {
-				assertNull("exception caught" + e, e);
-			}
-			//System.gc();
-		}
-	}
-
-	public void testBlockScanBufferBoundariesForHTML() {
-		testBlockScanBufferBoundaries("org.eclipse.wst.html.core.htmlsource");
-	}
-
-	public void testBlockScanBufferBoundariesForJSP() {
-		testBlockScanBufferBoundaries("org.eclipse.jst.jsp.core.jspsource");
-	}
-
-	private void testBlockTag(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
-					&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBlockTag_JSP() {
-		testBlockTag(setUpJSP("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
-	}
-
-	/**
-	 * Check block tag scanning between XML content
-	 */
-	public void testBlockTag_XML() {
-
-		testBlockTag(setUpXML("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
-	}
-
-	/**
-	 * Check block tag scanning between XML content
-	 */
-	public void testBlockTagWithJSPExpressions() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <script type=\"pl2\"> <%= \"expression\"%> </scrIPt> <a></a> <disallowJSP> <%= \"expression\" %> </disallowJSP> end");
-
-		// OLD
-		//		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6,
-		// 3, 3, 1, 3, 3, 1, 3, 3, 3, 1});
-		// NEW
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 3, 3, 1, 3, 3, 1, 3, 1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int i = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkComplexRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN,
-								DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE}})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					// CORRECT BEHAVIOR
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
-					// OLD, BROKEN BEHAVIOR
-					//			&& checkSimpleRegionTypes(nodes.item(i++).getRegions(),
-					// new
-					// String[]{
-					//				XMLRegionContext.BLOCK_TEXT,
-					//				XMLRegionContext.BLOCK_TEXT,
-					//				XMLRegionContext.BLOCK_TEXT})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBufferOverrun_2_JSP() {
-
-		IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		InputStream testInput = JSPUITestsPlugin.class.getResourceAsStream("parsing/testfiles/DefaultSubPerson0ResultsForm.jsp");
-		assertTrue("no input loaded", testInput != null);
-		String text = loadChars(testInput);
-		int originalLength = text.length();
-		try {
-			model.getStructuredDocument().setText(this, text);
-		}
-		catch (StackOverflowError e) {
-			// probably will never trigger
-			assertNull("Upper boundary looping error encountered, exception not caught in source parser", e);
-		}
-		assertTrue("Upper boundary looping error encountered; data lost", model.getStructuredDocument().getLastStructuredDocumentRegion().getEndOffset() == originalLength);
-	}
-
-	public void testBufferOverrun_JSP() {
-
-		IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		InputStream input = JSPUITestsPlugin.class.getResourceAsStream("parsing/testfiles/ChecksApprover.jsp");
-		assertTrue("no input loaded", input != null);
-		String text = loadChars(input);
-		int originalLength = text.length();
-		String insertedText = "123456789012345678";
-		model.getStructuredDocument().setText(this, text);
-		try {
-			model.getStructuredDocument().replaceText(this, 11073, 0, insertedText);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			// probably will never trigger
-			assertNull("Upper boundary violated, exception not caught in source parser", e);
-		}
-		assertTrue("Upper boundary of tokenizer array violated; data lost", model.getStructuredDocument().getLastStructuredDocumentRegion().getEndOffset() == originalLength + insertedText.length());
-	}
-
-	private void testBufferUnderRun_1(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 2});
-		assertTrue("IStructuredDocumentRegion region count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBufferUnderRun_1_JSP() {
-		testBufferUnderRun_1(setUpJSP("content <tag a=b/><!--c"));
-	}
-
-	/**
-	 * Check for buffer under-runs on block scanning
-	 */
-	public void testBufferUnderRun_1_XML() {
-		testBufferUnderRun_1(setUpXML("content <tag a=b/><!--c"));
-	}
-
-	private void testBufferUnderRun_2(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1});
-		assertTrue("IStructuredDocumentRegion region count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testBufferUnderRun_2_JSP() {
-
-		testBufferUnderRun_2(setUpJSP("content <tag a=b/><!--"));
-	}
-
-	/**
-	 * Check for buffer under-runs on block scanning
-	 */
-	public void testBufferUnderRun_2_XML() {
-
-		testBufferUnderRun_2(setUpXML("content <tag a=b/><!--"));
-	}
-
-	private void testCDATA(IStructuredDocumentRegionList nodes) {
-
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testCDATA_JSP() {
-
-		testCDATA(setUpJSP("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
-	}
-
-	/**
-	 * Check CDATA section scanning between content
-	 */
-	public void testCDATA_XML() {
-
-		testCDATA(setUpXML("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
-	}
-
-	public void testCDATAinBlockJSP1() {
-		setUpJSP("<script><![CDATA[ contents]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2() {
-		setUpJSP("<script><![CDATA[</script>]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2a() {
-		setUpJSP("<script><![CDATA[contents</script>]]></script>");
-	}
-
-	public void testCDATAinBlockJSP2b() {
-		setUpJSP("<script><![CDATA[</script>contents]]></script>");
-	}
-
-	public void testCDATAinBlockJSP3() {
-		setUpJSP("<script><![CDATA[]]></script>");
-	}
-
-	public void testCDATAinBlockJSP4() {
-		setUpJSP("<script><![CDATA[ ]]>");
-	}
-
-	public void testCDATAinBlockJSP5() {
-		setUpJSP("<script><![CDATA[ ]]]>");
-	}
-
-	public void testCDATAinBlockJSP6() {
-		setUpJSP("<script><![CDATA[ ]]");
-	}
-
-	public void testCDATAinBlockJSP7() {
-		setUpJSP("<script><![CDATA[ ");
-	}
-
-	public void testCDATAinBlockJSP8() {
-		setUpJSP("<script><![CDATA[");
-	}
-
-	public void testCDATAinBlockXML1() {
-		setUpXML("<script><![CDATA[ ]]></script>");
-	}
-
-	public void testCDATAinBlockXML2() {
-		setUpXML("<script><![CDATA[</script>]]></script>");
-	}
-
-	public void testCDATAinBlockXML3() {
-		setUpXML("<script><![CDATA[]]></script>");
-	}
-
-	public void testCDATAinBlockXML4() {
-		setUpXML("<script><![CDATA[ ]]>");
-	}
-
-	public void testCDATAinBlockXML5() {
-		setUpXML("<script><![CDATA[ ]]]>");
-	}
-
-	public void testCDATAinBlockXML6() {
-		setUpXML("<script><![CDATA[ ]]");
-	}
-
-	public void testCDATAinBlockXML7() {
-		setUpXML("<script><![CDATA[ ");
-	}
-
-	public void testCDATAinBlockXML8() {
-		setUpXML("<script><![CDATA[");
-	}
-
-	/**
-	 * Check comments between XML content
-	 */
-	public void testComments_JSP() {
-		String text = "a <!-- --><!----><%-- --%> b";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 2, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check comments between JSP content
-	 */
-	public void testComments_XML() {
-		String text = "a <!-- --><<!---->b";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 2, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN})
-					&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	private void testContent(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	/**
-	 * Check simple content scanning
-	 */
-	public void testContentJSP() {
-
-		testContent(setUpJSP("hello world"));
-	}
-
-	public void testContentXML() {
-
-		testContent(setUpXML("hello world"));
-	}
-
-	public void testDollarsign_Leading() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$ \"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testDollarsign_Single() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testDollarsign_SingleWithSpaces() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\" $ \"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELinContent() {
-		String text = "${out.foo}";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-
-	public void testELtolerance_transparency_Dquote() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"${out.foo}\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN,
-					DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELtolerance_transparency_DquoteWithSpaces() {
-		// note: whitespace on either side returns a WHITE_SPACE context
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"_${out.foo}_\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
-					DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testELtolerance_transparency_Squote() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type='${out.foo}'/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN,
-					DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPDeclaration() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%! int foo; %>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
-								new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
-											DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPDeclarationInCDATA() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%!%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
-					DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPExpression() {
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%= \"Hello, World\"%>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
-								new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
-											DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPExpressionInCDATA() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%=%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
-					DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPScriptlet() {
-		IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%  %>\" baz=\"il\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
-								new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
-											DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedJSPScriptletInCDATA() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%%>]]>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
-					DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testEmbeddedTagInAttr() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("<a href=\"<jsp:getProperty/>\">");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
-					DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE}});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSP_DHTMLimport() {
-		String text = "<a> <?import type=\"foo\">";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testJSP_PI() {
-		String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPAmpersandInTagNameInAttValue() {
-		String text = "<a href=\"<a&b>\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{7, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (broken embedded tag)", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
-					DOMRegionContext.UNDEFINED});
-		assertTrue("region context type check (broken embedded tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testJSPCommentInXMLComment() {
-		String text = "s<!--\n<%--c--%>\n-->\n<html>\n<body><script> <%--c--%> </script>\n";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 5, 1, 3, 1, 3, 3, 3, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		int item = 0;
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT,
-								DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN,
-								DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
-					&& checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check that jsp:directive.(include|page|taglib) are recognized and
-	 * treated properly
-	 */
-	public void testJSPDirectiveTags() {
-		String text = "begin <jsp:directive.taglib> <jsp:directive.page a> <jsp:directive.include a=> <jsp:directive.pages a=b> end";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPDollarsign_Trailing() {
-		String text = "<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPDollarsign_TrailingInContent() {
-		String text = "nnn$<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check (content)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check JSP code sections between HTML content
-	 */
-	public void testJSPExpression() {
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <%= \"Hello,World\" %> end");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 1, 1, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPGreaterThanInAttValue() {
-		IStructuredDocumentRegionList nodes = setUpJSP("<a type=\">next\"/>");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		assertTrue("region is not somple", !(nodes.item(0).getRegions().get(4) instanceof ITextRegionContainer));
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPInvalidTagNameInAttValue() {
-		String text = "S<a type=\"a<4\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(1).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(1).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
-					DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testJSPLessThanInAttValue() {
-		//bails out of the attribute value with an UNDEFINED region for the
-		// end quote
-		String text = "<button label=\"<previous\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
-					DOMRegionContext.UNDEFINED});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * Check JSP code sections, as a tag, scanning between HTML content
-	 */
-	//	public void testJSPScriptletTag() {
-	//		IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:scriptlet>
-	// int foo = bar; //<jsp:Scriptlet>//</jsp:scriptlets</jsp:scriptlet>
-	// end");
-	//	
-	//		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
-	// 3,
-	// 1});
-	//		assertTrue("IStructuredDocumentRegion and ITextRegion count",
-	// sizeCheck);
-	//
-	//		boolean typeCheck =
-	//			checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
-	//				XMLRegionContext.XML_CONTENT})
-	//			&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
-	//				XMLRegionContext.XML_TAG_OPEN,
-	//				XMLRegionContext.XML_TAG_NAME,
-	//				XMLRegionContext.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.JSP_CONTENT})
-	//			&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
-	//				XMLRegionContext.XML_END_TAG_OPEN,
-	//				XMLRegionContext.XML_TAG_NAME,
-	//				XMLRegionContext.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CONTENT});
-	//		assertTrue("region context type check", typeCheck);
-	//		
-	//		verifyModelLength();
-	//	}
-	/**
-	 * Check JSP code sections, as a tag, scanning between HTML content
-	 */
-	//	public void testJSPTextTag() {
-	//		IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:text> int
-	// foo
-	// = bar; //<jsp:TEXT>//</jsp:Texts</jsp:text> <a> </a> end");
-	//	
-	//		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
-	// 3,
-	// 1, 3, 1, 3, 1});
-	//		assertTrue("IStructuredDocumentRegion and ITextRegion count",
-	// sizeCheck);
-	//
-	//		boolean typeCheck =
-	//			checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CONTENT})
-	//			&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_TAG_OPEN,
-	//				XMLJSPRegionContexts.XML_TAG_NAME,
-	//				XMLJSPRegionContexts.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CDATA_TEXT})
-	//			&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_END_TAG_OPEN,
-	//				XMLJSPRegionContexts.XML_TAG_NAME,
-	//				XMLJSPRegionContexts.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CONTENT})
-	//			&& checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_TAG_OPEN,
-	//				XMLJSPRegionContexts.XML_TAG_NAME,
-	//				XMLJSPRegionContexts.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CONTENT})
-	//			&& checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_END_TAG_OPEN,
-	//				XMLJSPRegionContexts.XML_TAG_NAME,
-	//				XMLJSPRegionContexts.XML_TAG_CLOSE})
-	//			&& checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{
-	//				XMLJSPRegionContexts.XML_CONTENT});
-	//		assertTrue("region context type check", typeCheck);
-	//		
-	//		verifyModelLength();
-	//	}
-	/**
-	 * Check that jsp:root is recognized and treated properly
-	 */
-	public void testJSPRootTag() {
-
-		IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:root> <jsp:roots a> <jsp:roo a=> </jsp:root a=b><a>end");
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 3, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testJSPTagInAttValue() {
-		String text = "<a type=\"<a/>\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check (tag)", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
-					DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check (att value)", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testNothinginBlockJSP9() {
-		String text = "<script>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testNothinginBlockXML9() {
-		String text = "<script>";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	private void testSimpleTag(IStructuredDocumentRegionList nodes) {
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 10, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME,
-								DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
-								DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyModelLength();
-	}
-
-	public void testSimpleTag_JSP() {
-		testSimpleTag(setUpJSP("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
-	}
-
-	/**
-	 * Check simple tag scanning between XML content
-	 */
-	public void testSimpleTag_XML() {
-		testSimpleTag(setUpXML("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
-	}
-
-	public void testVBLinContent() {
-		String text = "#{out.foo}";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_Dquote() {
-		String text = "<a type=\"#{out.foo}\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN,
-					DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_DquoteWithSpaces() {
-		// note: whitespace on either side returns a WHITE_SPACE context
-		String text = "<a type=\"_#{out.foo}_\"/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
-					DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testVBLtolerance_transparency_Squote() {
-		String text = "<a type='#{out.foo}'/>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN,
-					DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testXML_DHTMLimport() {
-		String text = "<a> <?import type=\"foo\">";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes, text);
-	}
-
-	public void testXML_PI() {
-		String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
-					&& checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE})
-					&& checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testXMLDollarsign_Trailing() {
-		String text = "<a type=\" $\"/>";
-		IStructuredDocumentRegionList nodes = setUpXML(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
-		assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-		boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
-					DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
-		assertTrue("region context type check", typeCheck);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	public void testUndefinedRegionContainer() {
-		// see RATLC RATLC00284776
-		String text = "<option <elms:inputValue value=\"<%=uomvox.uomID%>\"/><%=uomvox.uomID.equals(uomID) ? \" selected\" : \"\"%>>";
-		IStructuredDocumentRegionList nodes = setUpJSP(text);
-		boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{5});
-		assertTrue("IStructuredDocumentRegion and overall ITextRegion count", sizeCheck);
-		//		checkComplexRegionTypes(nodes.item(0).getRegions(), new
-		// String[]{XMLRegionContext.XML_TAG_OPEN,
-		// XMLRegionContext.XML_TAG_NAME,
-		// XMLRegionContext.XML_TAG_ATTRIBUTE_NAME,
-		// XMLRegionContext.UNDEFINED, XMLRegionContext.XML_TAG_CLOSE}, new
-		// String[][] {{}});
-		verifyEmbeddedContainerParentage(nodes);
-		verifyLengths(0, nodes.item(0), text);
-	}
-
-	/**
-	 * @param nodes
-	 */
-	private void verifyEmbeddedContainerParentage(IStructuredDocumentRegionList nodes) {
-		for (int i = 0; i < nodes.getLength(); i++) {
-			IStructuredDocumentRegion r = nodes.item(i);
-			ITextRegionList list = r.getRegions();
-			for (int j = 0; j < list.size(); j++) {
-				ITextRegion region = list.get(j);
-				if (region instanceof ITextRegionContainer) {
-					assertNotNull("parent is null for " + region, ((ITextRegionContainer) region).getParent());
-				}
-			}
-		}
-	}
-
-	protected boolean verifyModelLength() {
-		return checkModelLength(fModel, input.length());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
deleted file mode 100644
index e25474f00..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
+++ /dev/null
@@ -1,293 +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.jst.jsp.ui.tests.other;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-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.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentRegionIterator;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * test class for basic parsing and scanning
- */
-
-public class ScanningTests {
-	private static IStructuredDocument textStore = null;
-	private static long startTime = 0;
-	private static long stopTime = 0;
-
-	/**
-	 * ScanningTests constructor comment.
-	 */
-	public ScanningTests() {
-		super();
-	}
-
-	public static void checkNodeSeams(String fileName) {
-		System.out.println("CHECKING NODE BOUNDARIES AND CONTENTS FOR " + fileName);
-		Enumeration e = parseFile(fileName).elements();
-		int lastEnd = 0;
-		while (e.hasMoreElements()) {
-			IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.nextElement();
-			if (r.getStartOffset() != lastEnd)
-				System.out.println("ERROR: dropped in " + r);
-			if (r.getNumberOfRegions() < 1)
-				System.out.println("ERROR: empty IStructuredDocumentRegion " + r);
-			lastEnd = r.getEndOffset();
-		}
-		System.out.println("DONE");
-	}
-
-	public static void checkParse(String fileName) {
-		checkTokenSeams(fileName);
-		checkNodeSeams(fileName);
-	}
-
-	public static void checkTokenSeams(String fileName) {
-		System.out.println("CHECKING TOKENIZER REGION BOUNDARIES FOR " + fileName);
-		Iterator e = tokenizeFile(fileName).iterator();
-		int lastEnd = 0;
-		while (e.hasNext()) {
-			IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.next();
-			if (r.getStartOffset() != lastEnd)
-				System.out.println("ERROR: dropped in " + r);
-			lastEnd = r.getEndOffset();
-		}
-		System.out.println("DONE");
-	}
-
-	public static char[] loadChars(String fileName) {
-		char[] chars = null;
-		int c = 0;
-		int length = 0;
-		int count = 0;
-		File file = null;
-		FileInputStream fis = null;
-		try {
-			file = new File(fileName);
-			length = (int) file.length();
-			chars = new char[length];
-			fis = new FileInputStream(file);
-			while (((c = fis.read()) >= 0) && (count < length)) {
-				chars[count++] = (char) c;
-			}
-		}
-		catch (FileNotFoundException e) {
-			System.out.println("File not found : \"" + fileName + "\"");
-			System.exit(1);
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println("Usage : java JSPLexer3 <inputfile>");
-			System.exit(1);
-		}
-		catch (IOException e) {
-			System.out.println("An I/O error occured while scanning :");
-			System.out.println(e);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return chars;
-	}
-
-	public static void main(String[] args) {
-		//checkTokenSeams(args[args.length - 1]);
-		//Vector nodes = ScanningTests.parseFile(args[args.length - 1]);
-		//com.ibm.sed.contentassist.xml.FlatToXMLTreeConvertor conv = new com.ibm.sed.contentassist.xml.FlatToXMLTreeConvertor();
-		//conv.createTree(nodes.elements());
-	}
-
-	public static RegionParser newParser() {
-		JSPSourceParser parser = new JSPSourceParser();
-		parser.addBlockMarker(new BlockMarker("foo", null, DOMRegionContext.BLOCK_TEXT, true));
-		parser.addBlockMarker(new BlockMarker("globalFoo", null, DOMRegionContext.BLOCK_TEXT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:expression", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:scriptlet", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:declaration", null, XMLJSPRegionContexts.JSP_CONTENT, true));
-		//		parser.addBlockMarker(new BlockMarker("jsp:text", null, XMLRegionContext.XML_CDATA_TEXT, true));
-		return parser;
-	}
-
-	public static RegionParser newXMLParser() {
-		XMLSourceParser parser = new XMLSourceParser();
-		parser.addBlockMarker(new BlockMarker("Script", DOMRegionContext.BLOCK_TEXT, false));
-		parser.addBlockMarker(new BlockMarker("stylE", DOMRegionContext.BLOCK_TEXT, false));
-		return parser;
-	}
-
-	public static Vector parse(String stringdata) {
-		return parse(stringdata, false);
-	}
-
-	public static Vector parse(String stringdata, boolean useXML) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		RegionParser parser = null;
-		if (useXML)
-			parser = newXMLParser();
-		else
-			parser = newParser();
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) creating a " + parser.getClass().getName());
-		}
-		// Caution: cast
-		parser.reset(new StringReader(stringdata));
-		IStructuredDocumentRegion aNode = setNodeDocument(parser.getDocumentRegions());
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
-		textStore.setText(null, stringdata);
-		StructuredDocumentRegionIterator.setParentDocument(aNode, textStore);
-		Vector v = new Vector();
-		while (aNode != null) {
-			v.addElement(aNode);
-			aNode = aNode.getNext();
-		}
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) setting text and storing nodes");
-		}
-		return v;
-	}
-
-	public static Vector parseFile(String fileName) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		char[] input = loadChars(fileName);
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
-		}
-		return parse(new String(input));
-	}
-
-	private static IStructuredDocumentRegion setNodeDocument(IStructuredDocumentRegion startNode) {
-		// Caution: cast
-		IStructuredDocumentRegion aNode = startNode;
-		while (aNode != null) {
-			aNode.setParentDocument(textStore);
-			aNode = aNode.getNext();
-		}
-		return startNode;
-	}
-
-	public static List tokenizeFile(String fileName) {
-		List v = null;
-		StringBuffer buff = new StringBuffer();
-		try {
-			//char[] input = loadChars(fileName);
-			Reader input = new FileReader(fileName);
-			RegionParser parser = newParser();
-			// parser must be given input, before tokenizer is valid
-			parser.reset(input);
-			int c = 0;
-			parser.getDocumentRegions();
-			v = parser.getRegions();
-			input.reset();
-			while ((c = input.read()) >= 0) {
-				buff.append((char) c);
-			}
-			textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
-			textStore.setText(null, buff.toString());
-		}
-		catch (FileNotFoundException e) {
-			System.out.println("File not found : \"" + fileName + "\"");
-		}
-		catch (IOException e) {
-		}
-		catch (ArrayIndexOutOfBoundsException e) {
-			System.out.println("Usage : java JSPLexer3 <inputfile>");
-		}
-		return v;
-	}
-
-	public static String viewableTokenizeWithSeparator(String data) {
-		StringBuffer s = new StringBuffer();
-		s.append("\"");
-		s.append(data);
-		s.append("\"\n");
-		s.append(viewableTokenize(data));
-		s.append("--------------------------------------------------------------------------------\n");
-		return s.toString();
-	}
-
-	public static String viewableTokenize(String stringdata) {
-		return viewableTokenize(stringdata, false);
-	}
-
-	public static String viewableTokenize(String stringdata, boolean useXML) {
-		java.util.List l = parse(stringdata, useXML);
-		String s = "";
-		for (int i = 0; i < l.size(); i++) {
-			IStructuredDocumentRegion node = (IStructuredDocumentRegion) l.get(i);
-			try {
-				s += StringUtils.escape(node.toString()) + "\n";
-			}
-			catch (Exception e) {
-				s += "[" + node.getStart() + ", " + node.getEnd() + "] (UNPRINTABLE " + e + ")";
-			}
-			ITextRegionList m = node.getRegions();
-			for (int j = 0; j < m.size(); j++)
-				if (m.get(j) instanceof ITextRegionContainer) {
-					s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
-					ITextRegionList n = ((ITextRegionContainer) m.get(j)).getRegions();
-					for (int k = 0; k < n.size(); k++)
-						s = s + "\t\t" + StringUtils.escape(n.get(k).toString()) + "\n";
-				}
-				else
-					s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
-		}
-		return s;
-	}
-
-	public static String viewableTokenizeFile(String fileName) {
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		if (Debug.perfTest) {
-			startTime = System.currentTimeMillis();
-		}
-		char[] input = loadChars(fileName);
-		if (Debug.perfTest) {
-			stopTime = System.currentTimeMillis();
-			System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
-		}
-		return viewableTokenize(new String(input));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java
deleted file mode 100644
index 6f334a056..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java
+++ /dev/null
@@ -1,402 +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.jst.jsp.ui.tests.other;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-
-/**
- * Insert the type's description here. Creation date: (8/23/2000 9:24:02 PM)
- * 
- * @author: Kit Lo
- */
-public class SimpleNode implements Node {
-	String fNodeName;
-
-	/**
-	 * SimpleNode constructor comment.
-	 */
-	public SimpleNode() {
-		super();
-	}
-
-	/**
-	 * SimpleNode constructor comment.
-	 */
-	public SimpleNode(String nodeName) {
-		fNodeName = nodeName;
-	}
-
-	/**
-	 * appendChild method comment.
-	 */
-	public Node appendChild(Node newChild) throws DOMException {
-		return null;
-	}
-
-	/**
-	 * cloneNode method comment.
-	 */
-	public Node cloneNode(boolean deep) {
-		return null;
-	}
-
-	/**
-	 * getAttributes method comment.
-	 */
-	public NamedNodeMap getAttributes() {
-		return null;
-	}
-
-	/**
-	 * getChildNodes method comment.
-	 */
-	public NodeList getChildNodes() {
-		return null;
-	}
-
-	/**
-	 * getFirstChild method comment.
-	 */
-	public Node getFirstChild() {
-		return null;
-	}
-
-	/**
-	 * getLastChild method comment.
-	 */
-	public Node getLastChild() {
-		return null;
-	}
-
-	/**
-	 * Returns the local part of the qualified name of this node. <br>
-	 * For nodes of any type other than <code>ELEMENT_NODE</code> and
-	 * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
-	 * method, such as <code>createElement</code> from the
-	 * <code>Document</code> interface, this is always <code>null</code>.
-	 * 
-	 * @since DOM Level 2
-	 */
-	public String getLocalName() {
-		return null;
-	}
-
-	/**
-	 * The namespace URI of this node, or <code>null</code> if it is
-	 * unspecified. <br>
-	 * This is not a computed value that is the result of a namespace lookup
-	 * based on an examination of the namespace declarations in scope. It is
-	 * merely the namespace URI given at creation time. <br>
-	 * For nodes of any type other than <code>ELEMENT_NODE</code> and
-	 * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
-	 * method, such as <code>createElement</code> from the
-	 * <code>Document</code> interface, this is always <code>null</code>.Per
-	 * the Namespaces in XML Specification an attribute does not inherit its
-	 * namespace from the element it is attached to. If an attribute is not
-	 * explicitly given a namespace, it simply has no namespace.
-	 * 
-	 * @since DOM Level 2
-	 */
-	public String getNamespaceURI() {
-		return null;
-	}
-
-	/**
-	 * getNextSibling method comment.
-	 */
-	public Node getNextSibling() {
-		return null;
-	}
-
-	/**
-	 * getNodeName method comment.
-	 */
-	public String getNodeName() {
-		return fNodeName;
-	}
-
-	/**
-	 * getNodeType method comment.
-	 */
-	public short getNodeType() {
-		return (short) 0;
-	}
-
-	/**
-	 * getNodeValue method comment.
-	 */
-	public String getNodeValue() throws DOMException {
-		return "NodeValue";
-	}
-
-	/**
-	 * getOwnerDocument method comment.
-	 */
-	public Document getOwnerDocument() {
-		return null;
-	}
-
-	/**
-	 * getParentNode method comment.
-	 */
-	public Node getParentNode() {
-		return null;
-	}
-
-	/**
-	 * The namespace prefix of this node, or <code>null</code> if it is
-	 * unspecified. <br>
-	 * Note that setting this attribute, when permitted, changes the
-	 * <code>nodeName</code> attribute, which holds the qualified name, as
-	 * well as the <code>tagName</code> and <code>name</code> attributes
-	 * of the <code>Element</code> and <code>Attr</code> interfaces, when
-	 * applicable. <br>
-	 * Note also that changing the prefix of an attribute that is known to
-	 * have a default value, does not make a new attribute with the default
-	 * value and the original prefix appear, since the
-	 * <code>namespaceURI</code> and <code>localName</code> do not change.
-	 * <br>
-	 * For nodes of any type other than <code>ELEMENT_NODE</code> and
-	 * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
-	 * method, such as <code>createElement</code> from the
-	 * <code>Document</code> interface, this is always <code>null</code>.
-	 * 
-	 * @exception DOMException
-	 *                INVALID_CHARACTER_ERR: Raised if the specified prefix
-	 *                contains an illegal character. <br>
-	 *                NO_MODIFICATION_ALLOWED_ERR: Raised if this node is
-	 *                readonly. <br>
-	 *                NAMESPACE_ERR: Raised if the specified
-	 *                <code>prefix</code> is malformed, if the
-	 *                <code>namespaceURI</code> of this node is
-	 *                <code>null</code>, if the specified prefix is "xml"
-	 *                and the <code>namespaceURI</code> of this node is
-	 *                different from " http://www.w3.org/XML/1998/namespace",
-	 *                if this node is an attribute and the specified prefix is
-	 *                "xmlns" and the <code>namespaceURI</code> of this node
-	 *                is different from " http://www.w3.org/2000/xmlns/", or
-	 *                if this node is an attribute and the
-	 *                <code>qualifiedName</code> of this node is "xmlns" .
-	 * @since DOM Level 2
-	 */
-	public String getPrefix() {
-		return null;
-	}
-
-	/**
-	 * getPreviousSibling method comment.
-	 */
-	public Node getPreviousSibling() {
-		return null;
-	}
-
-	/**
-	 * Returns whether this node (if it is an element) has any attributes.
-	 * 
-	 * @return <code>true</code> if this node has any attributes,
-	 *         <code>false</code> otherwise.
-	 * @since DOM Level 2
-	 */
-	public boolean hasAttributes() {
-		return false;
-	}
-
-	/**
-	 * hasChildNodes method comment.
-	 */
-	public boolean hasChildNodes() {
-		return false;
-	}
-
-	/**
-	 * insertBefore method comment.
-	 */
-	public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-		return null;
-	}
-
-	/**
-	 * Tests whether the DOM implementation implements a specific feature and
-	 * that feature is supported by this node.
-	 * 
-	 * @param featureThe
-	 *            name of the feature to test. This is the same name which can
-	 *            be passed to the method <code>hasFeature</code> on
-	 *            <code>DOMImplementation</code>.
-	 * @param versionThis
-	 *            is the version number of the feature to test. In Level 2,
-	 *            version 1, this is the string "2.0". If the version is not
-	 *            specified, supporting any version of the feature will cause
-	 *            the method to return <code>true</code>.
-	 * @return Returns <code>true</code> if the specified feature is
-	 *         supported on this node, <code>false</code> otherwise.
-	 * @since DOM Level 2
-	 */
-	public boolean isSupported(String feature, String version) {
-		return false;
-	}
-
-	/**
-	 * Puts all <code>Text</code> nodes in the full depth of the sub-tree
-	 * underneath this <code>Node</code>, including attribute nodes, into a
-	 * "normal" form where only structure (e.g., elements, comments,
-	 * processing instructions, CDATA sections, and entity references)
-	 * separates <code>Text</code> nodes, i.e., there are neither adjacent
-	 * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can
-	 * be used to ensure that the DOM view of a document is the same as if it
-	 * were saved and re-loaded, and is useful when operations (such as
-	 * XPointer lookups) that depend on a particular document tree structure
-	 * are to be used.In cases where the document contains
-	 * <code>CDATASections</code>, the normalize operation alone may not be
-	 * sufficient, since XPointers do not differentiate between
-	 * <code>Text</code> nodes and <code>CDATASection</code> nodes.
-	 * 
-	 * @version DOM Level 2
-	 */
-	public void normalize() {
-	}
-
-	/**
-	 * removeChild method comment.
-	 */
-	public Node removeChild(Node oldChild) throws DOMException {
-		return null;
-	}
-
-	/**
-	 * replaceChild method comment.
-	 */
-	public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-		return null;
-	}
-
-	/**
-	 * setNodeValue method comment.
-	 */
-	public void setNodeValue(String nodeValue) throws DOMException {
-	}
-
-	/**
-	 * setPrefix method comment.
-	 */
-	public void setPrefix(String prefix) throws DOMException {
-	}
-
-	public String toString() {
-		return getNodeName();
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public short compareDocumentPosition(Node other) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getBaseURI() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getFeature(String feature, String version) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String getTextContent() throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object getUserData(String key) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isDefaultNamespace(String namespaceURI) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isEqualNode(Node arg) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isSameNode(Node other) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupNamespaceURI(String prefix) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public String lookupPrefix(String namespaceURI) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public void setTextContent(String textContent) throws DOMException {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public Object setUserData(String key, Object data, UserDataHandler handler) {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public TypeInfo getSchemaTypeInfo() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-	/**
-	 * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
-	 */
-	public boolean isId() {
-		throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
-	}
-
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
deleted file mode 100644
index db54246bd..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
+++ /dev/null
@@ -1,354 +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.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class StructuredDocumentToDOMUnitTests implements IStructuredDocumentListener {
-	public StructuredDocumentToDOMUnitTests() {
-		super();
-	}
-
-	String getTestString1() {
-		return "<a>a<b />b</a>"; // -> <a>ab</a>;
-	}
-
-	String getTestString2() {
-		return "<menu>\n<rname>\nLiam's Chowder House and Grill\n</rname>\n</menu>";
-	}
-
-	String getTestString3() {
-		//return " <?xml version=\"1.0\" ?>\n    <testTopSibling><p>text</p></testTopSibling>";
-		return "<test/>\n\n <html>\n</html>";
-	}
-
-	String getTestString4() {
-		return "<?xml version=\"1.0\" ?>";
-	}
-
-	/**
-	 * 
-	 * @param args java.lang.String[]
-	 */
-	public static void main(String[] args) {
-
-		try {
-			StructuredDocumentToDOMUnitTests instance = new StructuredDocumentToDOMUnitTests();
-			instance.testNodeDeletion4();
-		}
-		catch (Exception t) {
-			t.printStackTrace();
-		}
-	}
-
-	void makeChange1(IDOMModel tree) {
-
-		//	
-		// pick a parent and ones of its children to delete 
-		// (note: validity of this code is highly dependent on input string)
-		org.w3c.dom.Document dom = tree.getDocument();
-		NodeList nodes = dom.getChildNodes();
-		//
-		/* for "first" test case
-		 Node testParentNode = nodes.item(0);
-		 Node testChildNode = testParentNode.getFirstChild();
-		 */
-		// for "second" test case
-		Node testParentNode = nodes.item(0);
-		Node testChildNode = testParentNode.getFirstChild();
-		testChildNode = testChildNode.getNextSibling();
-
-		testParentNode.removeChild(testChildNode);
-
-	}
-
-	void makeChange2(IStructuredDocument structuredDocument) {
-
-		// delete the apostrope in test string // 4, 4?
-		structuredDocument.replaceText(this, 19, 1, null);
-	}
-
-	void makeChange3(IDOMModel tree) {
-
-		//	
-		// pick a parent and ones of its children to delete 
-		// (note: validity of this code is highly dependent on input string)
-		org.w3c.dom.Document dom = tree.getDocument();
-		//NodeList nodes = dom.getChildNodes();
-		//
-		Node testChildNode = dom.getLastChild();
-
-		dom.removeChild(testChildNode);
-
-	}
-
-	/**
-	 * newModel method comment.
-	 */
-	public void newModel(NewDocumentEvent structuredDocumentEvent) {
-		System.out.println("newModel:");
-	}
-
-	/**
-	 * noChange method comment.
-	 */
-	public void noChange(NoChangeEvent structuredDocumentEvent) {
-		throw new SourceEditingRuntimeException("StructuredDocumentToDOMUnitTests::noChange needs to be implemented");
-	}
-
-	/**
-	 * nodesReplaced method comment.
-	 */
-	public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-		System.out.println("nodesReplaced:");
-		System.out.println("\tNewFlatNodes:");
-		IStructuredDocumentRegionList flatNodeList = structuredDocumentEvent.getNewStructuredDocumentRegions();
-		int len = flatNodeList.getLength();
-		for (int i = 0; i < len; i++) {
-			String outString = flatNodeList.item(i).toString();
-			outString = StringUtils.escape(outString);
-			System.out.println("\t\t" + outString);
-		}
-		System.out.println("\tOldFlatNodes:");
-		flatNodeList = structuredDocumentEvent.getOldStructuredDocumentRegions();
-		len = flatNodeList.getLength();
-		for (int i = 0; i < len; i++) {
-			String outString = flatNodeList.item(i).toString();
-			outString = StringUtils.escape(outString);
-			System.out.println("\t\t" + outString);
-		}
-	}
-
-	/**
-	 * regionChanged method comment.
-	 */
-	public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-		System.out.println("regionChanged:");
-	}
-
-	/**
-	 * regionsReplaced method comment.
-	 */
-	public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-		System.out.println("regionsReplaced:");
-	}
-
-	/**
-	 * Unit test -- tests basic parsing results of inserting a test string into an initial string.
-	 */
-	void testNodeDeletion()  {
-		//String initialString = "<par><x>\ntextx\n</x>\n<y>\ntexty\n</y></par>";
-		//String initialString = "<par><x>textx</x><y>texty</y></par>";
-		// test cases for two text nodes left together (remove <b/>):
-		// first case works, second doesn't
-		//	String initialString = "<a>a<b /></a>"; // -> <a>a</a>
-		//	String initialString = "<a>a<b />b</a>"; // -> <a>ab</a>
-		//	String initialString = getTestString1();
-		String initialString = getTestString2();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Deletion");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null; //new com.ibm.sed.structuredDocument.impl.IStructuredDocument(com.ibm.sed.model.IStructuredModel.XML);
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-
-
-		//
-		//we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		//makeChange1(tree);
-		makeChange2(f);
-
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument  
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-
-	/**
-	 * Unit test -- tests basic parsing results of inserting a test string into an initial string.
-	 */
-	void testNodeDeletion3()  {
-		String initialString = getTestString3();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Deletion");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null; //new com.ibm.sed.structuredDocument.impl.IStructuredDocument(com.ibm.sed.model.IStructuredModel.XML);
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		//
-		//we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		//makeChange1(tree);
-		makeChange3(tree);
-
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument  
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-
-	/**
-	 * Unit test -- test insert followed by delete at beginning of string.
-	 */
-	void testNodeDeletion4() {
-		String initialString = getTestString4();
-
-		// print out what we always can
-		System.out.println();
-		System.out.println("----------------");
-		System.out.println("Test Node Insert and Delete");
-		String outString = StringUtils.escape(initialString);
-		System.out.println("Initial String: " + outString);
-		// always start with fresh model
-		IStructuredDocument f = null; //new com.ibm.sed.structuredDocument.impl.IStructuredDocument(com.ibm.sed.model.IStructuredModel.XML);
-
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		//
-		//we'll listen to structuredDocument events to print out diagnostics
-		f.addDocumentChangedListener(this);
-		//
-
-		IDOMModel tree = new DOMModelImpl();
-		f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
-		// set text to structuredDocument (which updates tree)
-		f.setText(null, initialString);
-
-		// dump initial structuredDocument
-		Debug.dump(f);
-		// dump initial dom
-		DebugDocument.dump(tree.getDocument());
-		//
-		//
-		f.replaceText(null, 0, 0, "a");
-
-		System.out.println(" ==== Results after insert");
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument  
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-		f.replaceText(null, 0, 1, "");
-
-		System.out.println(" ==== Results after delete");
-		// display resulting text
-		System.out.println("resultString (from structuredDocument): ");
-		System.out.println(StringUtils.escape(f.getText()));
-		//
-		//
-		// dump post change structuredDocument  
-		Debug.dump(f);
-		// dump post change DOM
-		DebugDocument.dump(tree.getDocument());
-
-		//
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
deleted file mode 100644
index 3aa6e0cd8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
+++ /dev/null
@@ -1,951 +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.jst.jsp.ui.tests.other;
-
-/**
- * Use this test class to validate an implementation of the StyledTextContent
- * interface. To perform the validation, copy this class to the package where
- * your StyledTextContent implementation lives. Then specify the fully
- * qualified name of your StyledTextContent class as an argument to the main
- * method of this class.
- * 
- * NOTE: This test class assumes that your StyledTextContent implementation
- * handles the following delimiters:
- *  /r /n /r/n
- *  
- */
-// This class comes courtesy of Lynne Kues. Our StyledTextContent fails test
-// cases 6x of
-// "Special cases" since we (nor JFace) handle insertion between CR and LF. A
-// minor modification
-// was needed to getContentInstance for out version of StyleTextContent
-// (StructuredDocumentToTextAdapter).
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.StyledTextContent;
-import org.eclipse.swt.custom.TextChangeListener;
-import org.eclipse.swt.custom.TextChangedEvent;
-import org.eclipse.swt.custom.TextChangingEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.StructuredDocumentToTextAdapter;
-
-public class StyledTextContentSpec implements TextChangeListener {
-	static String contentClassName;
-	static int failCount = 0;
-	static int errorCount = 0;
-	Class contentClass = null;
-	StyledTextContent contentInstance = null;
-	int verify = 0;
-	Method currentMethod = null;
-	boolean failed = false;
-	StyledText widget = null;
-	Shell shell = null;
-
-	public StyledTextContentSpec() {
-	}
-
-	public void assertWithMessage(String message, boolean condition) {
-		System.out.print("\t" + currentMethod.getName() + " " + message);
-		if (!condition)
-			fail(message);
-		else
-			System.out.println(" passed");
-	}
-
-	public void fail(String message) {
-		failed = true;
-		System.out.println(" FAILED");
-		failCount++;
-	}
-
-	public StyledTextContent getContentInstance() {
-		contentInstance.setText("");
-		widget.setContent(contentInstance);
-		// dw. Had to add for our special version of StyledTextContent
-		// Needs to be removed for testing jface's DocumentAdapter
-		((StructuredDocumentToTextAdapter) contentInstance).setWidget(widget);
-		return contentInstance;
-	}
-
-	public static String getTestText() {
-		return "This is the first line.\r\n" + "This is the second line.\r\n" + "This is the third line.\r\n" + "This is the fourth line.\r\n" + "This is the fifth line.\r\n" + "\r\n" + "This is the first line again.\r\n" + "This is the second line again.\r\n" + "This is the third line again.\r\n" + "This is the fourth line again.\r\n" + "This is the fifth line again.\r\n" + "\r\n" + "This is the first line once again.\r\n" + "This is the second line once again.\r\n" + "This is the third line once again.\r\n" + "This is the fourth line once again.\r\n" + "This is the fifth line once again.";
-	}
-
-	public static void main(String[] args) {
-		StyledTextContentSpec spec = new StyledTextContentSpec();
-		if (args.length > 0) {
-			contentClassName = args[0];
-			//String path = System.getProperty("java.library.path");
-			//System.out.println("Java Library Path: " + path);
-		}
-		else {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		spec.run();
-		System.out.println();
-		System.out.println(failCount + " TEST FAILURES.");
-		System.out.println(errorCount + " UNEXPECTED ERRORS.");
-	}
-
-	static private Display getDisplay() {
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-	public void run() {
-		if (contentClassName.equals("")) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		if (contentClass == null) {
-			try {
-				contentClass = Class.forName(contentClassName);
-			}
-			catch (ClassNotFoundException e) {
-				MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-				box.setMessage("Content class:\n" + contentClassName + "\nnot found"); //$NON-NLS-1$
-				box.open();
-				return;
-			}
-		}
-		try {
-			contentInstance = (StyledTextContent) contentClass.newInstance();
-		}
-		catch (IllegalAccessException e) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Unable to access content class:\n" + contentClassName); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		catch (InstantiationException e) {
-			MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
-			box.setMessage("Unable to instantiate content class:\n" + contentClassName); //$NON-NLS-1$
-			box.open();
-			return;
-		}
-		Class clazz;
-		clazz = this.getClass();
-		Method[] methods = clazz.getDeclaredMethods();
-		for (int i = 0; i < methods.length; i++) {
-			setUp();
-			currentMethod = methods[i];
-			failed = false;
-			try {
-				if (currentMethod.getName().startsWith("test_")) {
-					System.out.println();
-					System.out.println(currentMethod.getName() + "...");
-					currentMethod.invoke(this, new Object[0]);
-					if (!failed) {
-						System.out.println("PASSED.");
-					}
-					else {
-						System.out.println("FAILED");
-					}
-				}
-			}
-			catch (InvocationTargetException ex) {
-				System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.getTargetException().toString());
-				System.out.println("FAILED");
-				errorCount++;
-			}
-			catch (Exception ex) {
-				System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.toString());
-				System.out.println("FAILED");
-				errorCount++;
-			}
-			if (verify != 0) {
-				verify = 0;
-				contentInstance.removeTextChangeListener(this);
-			}
-			tearDown();
-		}
-	}
-
-	protected void setUp() {
-		// create shell
-		shell = new Shell();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		shell.setSize(500, 300);
-		shell.setLayout(layout);
-		// create widget
-		widget = new StyledText(shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData spec = new GridData();
-		spec.horizontalAlignment = GridData.FILL;
-		spec.grabExcessHorizontalSpace = true;
-		spec.verticalAlignment = GridData.FILL;
-		spec.grabExcessVerticalSpace = true;
-		widget.setLayoutData(spec);
-		shell.open();
-	}
-
-	protected void tearDown() {
-		if (shell != null && !shell.isDisposed())
-			shell.dispose();
-		shell = null;
-	}
-
-	public void test_Delete() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(6, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("This\nia test\r"));
-		assertWithMessage(":1b:", content.getLine(0).equals("This"));
-		assertWithMessage(":1c:", content.getLine(1).equals("ia test"));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\n\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals(""));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(21, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("This\nis a test\nline 3"));
-		assertWithMessage(":3b:", content.getLineCount() == 3);
-		assertWithMessage(":3c:", content.getLine(0).equals("This"));
-		assertWithMessage(":3d:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":3e:", content.getLine(2).equals("line 3"));
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(0, 5, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("is a test\nline 3\nline 4"));
-		assertWithMessage(":4b:", content.getLineCount() == 3);
-		assertWithMessage(":4c:", content.getLine(0).equals("is a test"));
-		assertWithMessage(":4d:", content.getLine(1).equals("line 3"));
-		assertWithMessage(":4e:", content.getLine(2).equals("line 4"));
-		content.replaceTextRange(16, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4f:", newText.equals("is a test\nline 3"));
-		assertWithMessage(":4g:", content.getLine(0).equals("is a test"));
-		assertWithMessage(":4h:", content.getLine(1).equals("line 3"));
-		content.replaceTextRange(9, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4i:", newText.equals("is a test"));
-		assertWithMessage(":4j:", content.getLine(0).equals("is a test"));
-		content.replaceTextRange(1, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4k:", newText.equals("i"));
-		assertWithMessage(":4l:", content.getLine(0).equals("i"));
-		content.replaceTextRange(0, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4m:", newText.equals(""));
-		assertWithMessage(":4n:", content.getLine(0).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("This\n\r"));
-		assertWithMessage(":5b:", content.getLineCount() == 3);
-		assertWithMessage(":5c:", content.getLine(0).equals("This"));
-		assertWithMessage(":5d:", content.getLine(1).equals(""));
-		assertWithMessage(":5e:", content.getLine(2).equals(""));
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(4, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("L1\r\nL4\r\n"));
-		assertWithMessage(":6b:", content.getLineCount() == 3);
-		assertWithMessage(":6c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":6d:", content.getLine(1).equals("L4"));
-		assertWithMessage(":6e:", content.getLine(2).equals(""));
-		content.setText("\nL1\r\nL2");
-		content.replaceTextRange(0, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("L1\r\nL2"));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":7d:", content.getLine(1).equals("L2"));
-		content.setText("\nL1\r\nL2\r\n");
-		content.replaceTextRange(7, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", newText.equals("\nL1\r\nL2"));
-		assertWithMessage(":8b:", content.getLineCount() == 3);
-		assertWithMessage(":8c:", content.getLine(0).equals(""));
-		assertWithMessage(":8d:", content.getLine(1).equals("L1"));
-		assertWithMessage(":8e:", content.getLine(2).equals("L2"));
-		content.setText("\nLine 1\nLine 2\n");
-		content.replaceTextRange(0, 7, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("\nLine 2\n"));
-		assertWithMessage(":9b:", content.getLineCount() == 3);
-		assertWithMessage(":9c:", content.getLine(0).equals(""));
-		assertWithMessage(":9d:", content.getLine(1).equals("Line 2"));
-		assertWithMessage(":9e:", content.getLine(2).equals(""));
-		content.setText("Line 1\nLine 2\n");
-		content.replaceTextRange(6, 8, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":10a:", newText.equals("Line 1"));
-		assertWithMessage(":10b:", content.getLineCount() == 1);
-		assertWithMessage(":10c:", content.getLine(0).equals("Line 1"));
-		content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");
-		content.replaceTextRange(12, 17, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));
-		assertWithMessage(":11b:", content.getLineCount() == 3);
-		assertWithMessage(":11c:", content.getLine(0).equals("Line one is a longer line"));
-		assertWithMessage(":11d:", content.getLine(1).equals("Line 3"));
-		assertWithMessage(":11e:", content.getLine(2).equals(""));
-	}
-
-	public void test_Empty() {
-		StyledTextContent content = getContentInstance();
-		assertWithMessage(":1a:", content.getLineCount() == 1);
-		assertWithMessage(":1b:", content.getLine(0).equals(""));
-		content.setText("test");
-		content.replaceTextRange(0, 4, "");
-		assertWithMessage(":2a:", content.getLineCount() == 1);
-		assertWithMessage(":2b:", content.getLine(0).equals(""));
-	}
-
-	public void test_Insert() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(0, 0, "test\n ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("test\n This\nis a test\r"));
-		assertWithMessage(":1b:", content.getLineCount() == 4);
-		assertWithMessage(":1c:", content.getLine(0).equals("test"));
-		assertWithMessage(":1d:", content.getLine(1).equals(" This"));
-		assertWithMessage(":1e:", content.getLine(2).equals("is a test"));
-		assertWithMessage(":1f:", content.getLine(3).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 0, "*** ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\n*** is a test\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals("*** is a test"));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("Line 1\r\nLine 2");
-		content.replaceTextRange(0, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("\rLine 1\r\nLine 2"));
-		assertWithMessage(":3b:", content.getLineCount() == 3);
-		assertWithMessage(":3c:", content.getLine(0).equals(""));
-		assertWithMessage(":3d:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":3e:", content.getLine(2).equals("Line 2"));
-		content.replaceTextRange(9, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));
-		assertWithMessage(":3g:", content.getLineCount() == 4);
-		assertWithMessage(":3h:", content.getLine(0).equals(""));
-		assertWithMessage(":3i:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":3j:", content.getLine(2).equals(""));
-		assertWithMessage(":3k:", content.getLine(3).equals("Line 2"));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("\nThis\nis a test\r"));
-		assertWithMessage(":4b:", content.getLineCount() == 4);
-		assertWithMessage(":4c:", content.getLine(0).equals(""));
-		assertWithMessage(":4d:", content.getLine(1).equals("This"));
-		assertWithMessage(":4e:", content.getLine(2).equals("is a test"));
-		assertWithMessage(":4f:", content.getLine(3).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(7, 0, "\r\nnewLine");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));
-		assertWithMessage(":5b:", content.getLineCount() == 4);
-		assertWithMessage(":5c:", content.getLine(0).equals("This"));
-		assertWithMessage(":5d:", content.getLine(1).equals("is"));
-		assertWithMessage(":5e:", content.getLine(2).equals("newLine a test"));
-		assertWithMessage(":5f:", content.getLine(3).equals(""));
-		content.setText("");
-		content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));
-		assertWithMessage(":6b:", content.getLineCount() == 4);
-		assertWithMessage(":6c:", content.getLine(0).equals("This"));
-		assertWithMessage(":6d:", content.getLine(1).equals("is"));
-		assertWithMessage(":6e:", content.getLine(2).equals("newLine a test"));
-		assertWithMessage(":6f:", content.getLine(3).equals(""));
-		// insert at end
-		content.setText("This");
-		content.replaceTextRange(4, 0, "\n ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("This\n "));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("This"));
-		assertWithMessage(":7d:", content.getLine(1).equals(" "));
-		content.setText("This\n");
-		content.replaceTextRange(5, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7e:", newText.equals("This\n\n"));
-		assertWithMessage(":7f:", content.getLineCount() == 3);
-		assertWithMessage(":7g:", content.getLine(0).equals("This"));
-		assertWithMessage(":7h:", content.getLine(1).equals(""));
-		assertWithMessage(":7i:", content.getLine(2).equals(""));
-		// insert at beginning
-		content.setText("This");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", newText.equals("\nThis"));
-		assertWithMessage(":8b:", content.getLineCount() == 2);
-		assertWithMessage(":8c:", content.getLine(0).equals(""));
-		assertWithMessage(":8d:", content.getLine(1).equals("This"));
-		// insert text
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 0, "*** ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("This\n*** is a test\r"));
-		assertWithMessage(":9b:", content.getLineCount() == 3);
-		assertWithMessage(":9c:", content.getLine(0).equals("This"));
-		assertWithMessage(":9d:", content.getLine(1).equals("*** is a test"));
-		assertWithMessage(":9e:", content.getLine(2).equals(""));
-		content.setText("This\n");
-		content.replaceTextRange(5, 0, "line");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":10a:", newText.equals("This\nline"));
-		assertWithMessage(":10b:", content.getLineCount() == 2);
-		assertWithMessage(":10c:", content.getLine(0).equals("This"));
-		assertWithMessage(":10d:", content.getLine(1).equals("line"));
-		assertWithMessage(":10e:", content.getLineAtOffset(8) == 1);
-		assertWithMessage(":10f:", content.getLineAtOffset(9) == 1);
-		// insert at beginning
-		content.setText("This\n");
-		content.replaceTextRange(0, 0, "line\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":11a:", newText.equals("line\nThis\n"));
-		assertWithMessage(":11b:", content.getLineCount() == 3);
-		assertWithMessage(":11c:", content.getLine(0).equals("line"));
-		assertWithMessage(":11d:", content.getLine(1).equals("This"));
-		assertWithMessage(":11e:", content.getLineAtOffset(5) == 1);
-		content.setText("Line 1\r\nLine 2\r\nLine 3");
-		content.replaceTextRange(0, 0, "\r");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));
-		assertWithMessage(":12b:", content.getLineCount() == 4);
-		assertWithMessage(":12c:", content.getLine(0).equals(""));
-		assertWithMessage(":12d:", content.getLine(1).equals("Line 1"));
-		assertWithMessage(":12e:", content.getLine(2).equals("Line 2"));
-		assertWithMessage(":12f:", content.getLine(3).equals("Line 3"));
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(7, 0, "Line1a\nLine1b\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));
-		assertWithMessage(":13b:", content.getLineCount() == 5);
-		assertWithMessage(":13c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":13d:", content.getLine(1).equals("Line1a"));
-		assertWithMessage(":13e:", content.getLine(2).equals("Line1b"));
-		assertWithMessage(":13f:", content.getLine(3).equals("Line 2"));
-		assertWithMessage(":13g:", content.getLine(4).equals("Line 3"));
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(11, 0, "l1a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));
-		assertWithMessage(":14b:", content.getLineCount() == 3);
-		assertWithMessage(":14c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":14d:", content.getLine(1).equals("Linel1a 2"));
-		assertWithMessage(":14e:", content.getLine(2).equals("Line 3"));
-		content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");
-		content.replaceTextRange(19, 0, "very, very, ");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));
-		assertWithMessage(":15b:", content.getLineCount() == 3);
-		assertWithMessage(":15c:", content.getLine(0).equals("Line 1"));
-		assertWithMessage(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));
-		assertWithMessage(":15e:", content.getLine(2).equals("Line 3"));
-	}
-
-	public void test_Line_Conversion() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getLineCount() == 5);
-		assertWithMessage(":1b:", content.getLine(0).equals("This"));
-		assertWithMessage(":1c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":1d:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":1e:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":1f:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":1g:", content.getLine(2).equals("repeat"));
-		assertWithMessage(":1h:", content.getOffsetAtLine(2) == 15);
-		assertWithMessage(":1i:", content.getLine(3).equals("end"));
-		assertWithMessage(":1j:", content.getOffsetAtLine(3) == 22);
-		assertWithMessage(":1k:", content.getLine(4).equals(""));
-		assertWithMessage(":1l:", content.getOffsetAtLine(4) == 26);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getLineCount() == 2);
-		assertWithMessage(":2b:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":2c:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":2d:", content.getLineAtOffset(5) == 0);
-		content.setText("This\r\nis a test\r");
-		assertWithMessage(":3a:", content.getLineCount() == 3);
-		assertWithMessage(":3b:", content.getLine(1).equals("is a test"));
-		assertWithMessage(":3c:", content.getLineAtOffset(15) == 1);
-		content.setText("\r\n");
-		assertWithMessage(":4a:", content.getLineCount() == 2);
-		assertWithMessage(":4b:", content.getLine(0).equals(""));
-		assertWithMessage(":4c:", content.getLine(1).equals(""));
-		assertWithMessage(":4d:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":4e:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":4f:", content.getLineAtOffset(2) == 1);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":5a:", content.getLineCount() == 5);
-		assertWithMessage(":5b:", content.getLine(0).equals(""));
-		assertWithMessage(":5c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":5d:", content.getLine(1).equals(""));
-		assertWithMessage(":5e:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":5f:", content.getLine(2).equals(""));
-		assertWithMessage(":5g:", content.getOffsetAtLine(2) == 3);
-		assertWithMessage(":5h:", content.getLine(3).equals(""));
-		assertWithMessage(":5i:", content.getOffsetAtLine(3) == 4);
-		assertWithMessage(":5j:", content.getLine(4).equals(""));
-		assertWithMessage(":5k:", content.getOffsetAtLine(4) == 6);
-		content.setText("test\r\rtest2\r\r");
-		assertWithMessage(":6a:", content.getLineCount() == 5);
-		assertWithMessage(":6b:", content.getLine(0).equals("test"));
-		assertWithMessage(":6c:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":6d:", content.getLine(1).equals(""));
-		assertWithMessage(":6e:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":6f:", content.getLine(2).equals("test2"));
-		assertWithMessage(":6g:", content.getOffsetAtLine(2) == 6);
-		assertWithMessage(":6h:", content.getLine(3).equals(""));
-		assertWithMessage(":6i:", content.getOffsetAtLine(3) == 12);
-		assertWithMessage(":6j:", content.getLine(4).equals(""));
-		assertWithMessage(":6k:", content.getOffsetAtLine(4) == 13);
-	}
-
-	public void test_Line_To_Offset() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":1b:", content.getOffsetAtLine(1) == 5);
-		assertWithMessage(":1c:", content.getOffsetAtLine(2) == 15);
-		assertWithMessage(":1d:", content.getOffsetAtLine(3) == 22);
-		assertWithMessage(":1e:", content.getOffsetAtLine(4) == 26);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":2b:", content.getOffsetAtLine(1) == 6);
-		content.setText("\r\n");
-		assertWithMessage(":3a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":3b:", content.getOffsetAtLine(1) == 2);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":4a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":4b:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":4c:", content.getOffsetAtLine(2) == 3);
-		assertWithMessage(":4d:", content.getOffsetAtLine(3) == 4);
-		assertWithMessage(":4e:", content.getOffsetAtLine(4) == 6);
-		content.setText("\r\ntest\r\n");
-		assertWithMessage(":5a:", content.getOffsetAtLine(0) == 0);
-		assertWithMessage(":5b:", content.getOffsetAtLine(1) == 2);
-		assertWithMessage(":5c:", content.getOffsetAtLine(2) == 8);
-	}
-
-	public void test_Offset_To_Line() {
-		StyledTextContent content = getContentInstance();
-		content.setText("This\nis a test\rrepeat\nend\r");
-		assertWithMessage(":1a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":1b:", content.getLineAtOffset(3) == 0);
-		assertWithMessage(":1c:", content.getLineAtOffset(4) == 0);
-		assertWithMessage(":1d:", content.getLineAtOffset(25) == 3);
-		assertWithMessage(":1e:", content.getLineAtOffset(26) == 4);
-		content.setText("This\r\nis a test");
-		assertWithMessage(":2a:", content.getLineAtOffset(5) == 0);
-		assertWithMessage(":2b:", content.getLineAtOffset(6) == 1);
-		assertWithMessage(":2c:", content.getLineAtOffset(10) == 1);
-		content.setText("\r\n");
-		assertWithMessage(":3a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":3b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":3c:", content.getLineAtOffset(2) == 1);
-		content.setText("\r\n\n\r\r\n");
-		assertWithMessage(":4a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":4b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":4c:", content.getLineAtOffset(2) == 1);
-		assertWithMessage(":4d:", content.getLineAtOffset(3) == 2);
-		assertWithMessage(":4e:", content.getLineAtOffset(4) == 3);
-		assertWithMessage(":4f:", content.getLineAtOffset(5) == 3);
-		assertWithMessage(":4g:", content.getLineAtOffset(6) == 4);
-		content.setText("\r\n\r\n");
-		assertWithMessage(":5a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":5b:", content.getLineAtOffset(1) == 0);
-		assertWithMessage(":5c:", content.getLineAtOffset(2) == 1);
-		assertWithMessage(":5d:", content.getLineAtOffset(3) == 1);
-		assertWithMessage(":5e:", content.getLineAtOffset(4) == 2);
-		content.setText("\r\r\r\n\r\n");
-		assertWithMessage(":6a:", content.getLineAtOffset(0) == 0);
-		assertWithMessage(":6b:", content.getLineAtOffset(1) == 1);
-		assertWithMessage(":6c:", content.getLineAtOffset(2) == 2);
-		assertWithMessage(":6d:", content.getLineAtOffset(4) == 3);
-		content.setText("");
-		assertWithMessage(":7a:", content.getLineAtOffset(0) == 0);
-		content = getContentInstance();
-		assertWithMessage(":8a:", content.getLineAtOffset(0) == 0);
-	}
-
-	public void test_Replace() {
-		StyledTextContent content = getContentInstance();
-		String newText;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 4, "a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":1a:", newText.equals("This\na test\r"));
-		assertWithMessage(":1b:", content.getLineCount() == 3);
-		assertWithMessage(":1c:", content.getLine(0).equals("This"));
-		assertWithMessage(":1d:", content.getLine(1).equals("a test"));
-		assertWithMessage(":1e:", content.getLine(2).equals(""));
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 2, "was");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("This\nwas a test\r"));
-		assertWithMessage(":2b:", content.getLineCount() == 3);
-		assertWithMessage(":2c:", content.getLine(0).equals("This"));
-		assertWithMessage(":2d:", content.getLine(1).equals("was a test"));
-		assertWithMessage(":2e:", content.getLine(2).equals(""));
-		content.setText("This is a test\r");
-		content.replaceTextRange(5, 2, "was");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("This was a test\r"));
-		assertWithMessage(":3b:", content.getLineCount() == 2);
-		assertWithMessage(":3c:", content.getLine(0).equals("This was a test"));
-		assertWithMessage(":3d:", content.getLineAtOffset(15) == 0);
-		content.setText("Line 1\nLine 2\nLine 3");
-		content.replaceTextRange(0, 7, "La\nLb\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));
-		assertWithMessage(":4b:", content.getLine(0).equals("La"));
-		assertWithMessage(":4c:", content.getLine(1).equals("Lb"));
-		assertWithMessage(":4d:", content.getLine(2).equals("Line 2"));
-		assertWithMessage(":4e:", content.getLine(3).equals("Line 3"));
-		content.setText(getTestText());
-		newText = content.getTextRange(0, content.getCharCount());
-		int start = content.getOffsetAtLine(6);
-		int end = content.getOffsetAtLine(11);
-		content.replaceTextRange(start, end - start, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", content.getLineCount() == 12);
-		assertWithMessage(":5a:", content.getLine(5).equals(""));
-		assertWithMessage(":5a:", content.getLine(6).equals(""));
-		start = content.getOffsetAtLine(7);
-		content.replaceTextRange(start, content.getCharCount() - start, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", content.getLineCount() == 8);
-		assertWithMessage(":5a:", content.getLine(5).equals(""));
-		assertWithMessage(":5a:", content.getLine(6).equals(""));
-		assertWithMessage(":5a:", content.getLine(7).equals(""));
-	}
-
-	public void test_Special_Cases() {
-		String newText;
-		StyledTextContent content = getContentInstance();
-		assertWithMessage(":0a:", content.getLineCount() == 1);
-		assertWithMessage(":0b:", content.getOffsetAtLine(0) == 0);
-		content.setText("This is the input/output text component.");
-		content.replaceTextRange(0, 0, "\n");
-		assertWithMessage(":1a:", content.getLine(0).equals(""));
-		content.replaceTextRange(1, 0, "\n");
-		assertWithMessage(":1b:", content.getLine(0).equals(""));
-		content.replaceTextRange(2, 0, "\n");
-		assertWithMessage(":1c:", content.getLine(0).equals(""));
-		content.replaceTextRange(3, 0, "\n");
-		assertWithMessage(":1d:", content.getLine(0).equals(""));
-		content.replaceTextRange(4, 0, "\n");
-		assertWithMessage(":1e:", content.getLine(0).equals(""));
-		content.replaceTextRange(5, 0, "\n");
-		assertWithMessage(":1f:", content.getLine(0).equals(""));
-		content.replaceTextRange(6, 0, "\n");
-		assertWithMessage(":1g:", content.getLine(0).equals(""));
-		content.replaceTextRange(7, 0, "\n");
-		assertWithMessage(":1h:", content.getLine(0).equals(""));
-		content.setText("This is the input/output text component.");
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2a:", newText.equals("\nThis is the input/output text component."));
-		assertWithMessage(":2b:", content.getLine(0).equals(""));
-		assertWithMessage(":2c:", content.getLine(1).equals("This is the input/output text component."));
-		content.replaceTextRange(1, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":2d:", newText.equals("\n\nThis is the input/output text component."));
-		assertWithMessage(":2e:", content.getLine(0).equals(""));
-		assertWithMessage(":2f:", content.getLine(1).equals(""));
-		assertWithMessage(":2g:", content.getLine(2).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3a:", newText.equals("\n\n\nThis is the input/output text component."));
-		assertWithMessage(":3b:", content.getLine(0).equals(""));
-		assertWithMessage(":3c:", content.getLine(1).equals(""));
-		assertWithMessage(":3d:", content.getLine(2).equals(""));
-		assertWithMessage(":3e:", content.getLine(3).equals("This is the input/output text component."));
-		content.replaceTextRange(3, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));
-		assertWithMessage(":3g:", content.getLine(0).equals(""));
-		assertWithMessage(":3h:", content.getLine(1).equals(""));
-		assertWithMessage(":3i:", content.getLine(2).equals(""));
-		assertWithMessage(":3j:", content.getLine(3).equals(""));
-		assertWithMessage(":3k:", content.getLine(4).equals("This is the input/output text component."));
-		content.replaceTextRange(3, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4a:", newText.equals("\n\n\nThis is the input/output text component."));
-		assertWithMessage(":4b:", content.getLine(0).equals(""));
-		assertWithMessage(":4c:", content.getLine(1).equals(""));
-		assertWithMessage(":4d:", content.getLine(2).equals(""));
-		assertWithMessage(":4e:", content.getLine(3).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":4f:", newText.equals("\n\nThis is the input/output text component."));
-		assertWithMessage(":4g:", content.getLine(0).equals(""));
-		assertWithMessage(":4h:", content.getLine(1).equals(""));
-		assertWithMessage(":4i:", content.getLine(2).equals("This is the input/output text component."));
-		content.replaceTextRange(2, 0, "a");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5a:", newText.equals("\n\naThis is the input/output text component."));
-		assertWithMessage(":5b:", content.getLine(0).equals(""));
-		assertWithMessage(":5c:", content.getLine(1).equals(""));
-		assertWithMessage(":5d:", content.getLine(2).equals("aThis is the input/output text component."));
-		// delete only part of a delimiter
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(0, 3, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":5e:", newText.equals("\nL2\r\nL3\r\nL4\r\n"));
-		assertWithMessage(":5f:", content.getLineCount() == 5);
-		assertWithMessage(":5g:", content.getLine(0).equals(""));
-		assertWithMessage(":5h:", content.getLine(1).equals("L2"));
-		assertWithMessage(":5i:", content.getLine(2).equals("L3"));
-		assertWithMessage(":5j:", content.getLine(3).equals("L4"));
-		assertWithMessage(":5k:", content.getLine(4).equals(""));
-		// replace part of a delimiter
-		content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
-		content.replaceTextRange(3, 1, "test\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":6a:", newText.equals("L1\rtest\nL2\r\nL3\r\nL4\r\n"));
-		assertWithMessage(":6b:", content.getLineCount() == 6);
-		assertWithMessage(":6c:", content.getLine(0).equals("L1"));
-		assertWithMessage(":6d:", content.getLine(1).equals("test"));
-		assertWithMessage(":6e:", content.getLine(2).equals("L2"));
-		assertWithMessage(":6f:", content.getLine(3).equals("L3"));
-		assertWithMessage(":6g:", content.getLine(4).equals("L4"));
-		assertWithMessage(":6h:", content.getLine(5).equals(""));
-		content.setText("abc\r\ndef");
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7a:", newText.equals("ac\r\ndef"));
-		assertWithMessage(":7b:", content.getLineCount() == 2);
-		assertWithMessage(":7c:", content.getLine(0).equals("ac"));
-		assertWithMessage(":7d:", content.getLine(1).equals("def"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7e:", newText.equals("a\r\ndef"));
-		assertWithMessage(":7f:", content.getLineCount() == 2);
-		assertWithMessage(":7g:", content.getLine(0).equals("a"));
-		assertWithMessage(":7h:", content.getLine(1).equals("def"));
-		content.replaceTextRange(1, 2, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7i:", newText.equals("adef"));
-		assertWithMessage(":7j:", content.getLineCount() == 1);
-		assertWithMessage(":7k:", content.getLine(0).equals("adef"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7l:", newText.equals("aef"));
-		assertWithMessage(":7m:", content.getLineCount() == 1);
-		assertWithMessage(":7n:", content.getLine(0).equals("aef"));
-		content.replaceTextRange(1, 1, "");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":7o:", newText.equals("af"));
-		assertWithMessage(":7p:", content.getLineCount() == 1);
-		assertWithMessage(":7q:", content.getLine(0).equals("af"));
-		content.setText("abc");
-		content.replaceTextRange(0, 1, "1");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8a:", content.getLineCount() == 1);
-		assertWithMessage(":8b:", newText.equals("1bc"));
-		assertWithMessage(":8c:", content.getLine(0).equals("1bc"));
-		content.replaceTextRange(0, 0, "\n");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":8d:", newText.equals("\n1bc"));
-		assertWithMessage(":8e:", content.getLineCount() == 2);
-		assertWithMessage(":8f:", content.getLine(0).equals(""));
-		assertWithMessage(":8g:", content.getLine(1).equals("1bc"));
-		content = getContentInstance();
-		content.replaceTextRange(0, 0, "a");
-		content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
-		content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
-		newText = content.getTextRange(0, content.getCharCount());
-		assertWithMessage(":9a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
-		assertWithMessage(":9b:", content.getLineCount() == 6);
-		assertWithMessage(":9c:", content.getLine(0).equals("package test;"));
-		assertWithMessage(":9d:", content.getLine(1).equals("\t/*Line 1"));
-		assertWithMessage(":9e:", content.getLine(2).equals("\t * Line 2"));
-		assertWithMessage(":9f:", content.getLine(3).equals("\t */"));
-		assertWithMessage(":9g:", content.getLine(4).equals("public class SimpleClass {"));
-		assertWithMessage(":9h:", content.getLine(5).equals("}"));
-	}
-
-	public void test_Text_Changed_Event() {
-		StyledTextContent content = getContentInstance();
-		content.addTextChangeListener(this);
-		verify = 1;
-		content.setText("testing");
-		content.replaceTextRange(0, 0, "\n");
-		verify = 2;
-		content.setText("\n\n");
-		content.replaceTextRange(0, 2, "a");
-		verify = 3;
-		content.setText("a");
-		content.replaceTextRange(0, 1, "\n\n");
-		verify = 5;
-		content.setText("Line 1\r\nLine 2");
-		content.replaceTextRange(0, 0, "\r");
-		verify = 6;
-		content.setText("This\nis a test\nline 3\nline 4");
-		content.replaceTextRange(21, 7, "");
-		verify = 7;
-		content.setText("This\nis a test\r");
-		content.replaceTextRange(5, 9, "");
-		verify = 8;
-		content.setText("\nL1\r\nL2\r\n");
-		content.replaceTextRange(7, 2, "");
-		verify = 9;
-		content.setText("L1\r\n");
-		content.replaceTextRange(2, 2, "test");
-		verify = 0;
-		content.removeTextChangeListener(this);
-	}
-
-	public void textChanged(TextChangedEvent event) {
-	}
-
-	public void textChanging(TextChangingEvent event) {
-		switch (verify) {
-			case 1 :
-				{
-					assertWithMessage(":1a:", event.replaceLineCount == 0);
-					assertWithMessage(":1b:", event.newLineCount == 1);
-					break;
-				}
-			case 2 :
-				{
-					assertWithMessage(":2a:", event.replaceLineCount == 2);
-					assertWithMessage(":2b:", event.newLineCount == 0);
-					break;
-				}
-			case 3 :
-				{
-					assertWithMessage(":3a:", event.replaceLineCount == 0);
-					assertWithMessage(":3b:", event.newLineCount == 2);
-					break;
-				}
-			case 4 :
-				{
-					assertWithMessage(":4a:", event.replaceLineCount == 0);
-					assertWithMessage(":4b:", event.newLineCount == 1);
-					break;
-				}
-			case 5 :
-				{
-					assertWithMessage(":5a:", event.replaceLineCount == 0);
-					assertWithMessage(":5b:", event.newLineCount == 1);
-					break;
-				}
-			case 6 :
-				{
-					assertWithMessage(":6a:", event.replaceLineCount == 1);
-					assertWithMessage(":6b:", event.newLineCount == 0);
-					break;
-				}
-			case 8 :
-				{
-					assertWithMessage(":8a:", event.replaceLineCount == 1);
-					assertWithMessage(":8b:", event.newLineCount == 0);
-					break;
-				}
-			case 9 :
-				{
-					assertWithMessage(":9a:", event.replaceLineCount == 1);
-					assertWithMessage(":9b:", event.newLineCount == 0);
-					break;
-				}
-			case 10 :
-				{
-					assertWithMessage(":10a:", event.replaceLineCount == 0);
-					assertWithMessage(":10b:", event.newLineCount == 0);
-					break;
-				}
-			case 11 :
-				{
-					assertWithMessage(":11a:", event.replaceLineCount == 0);
-					assertWithMessage(":11b:", event.newLineCount == 0);
-					break;
-				}
-			case 12 :
-				{
-					assertWithMessage(":12a:", event.replaceLineCount == 0);
-					assertWithMessage(":12b:", event.newLineCount == 0);
-					break;
-				}
-			case 13 :
-				{
-					assertWithMessage(":13a:", event.replaceLineCount == 0);
-					assertWithMessage(":13b:", event.newLineCount == 0);
-					break;
-				}
-			case 14 :
-				{
-					assertWithMessage(":14a:", event.replaceLineCount == 0);
-					assertWithMessage(":14b:", event.newLineCount == 1);
-					break;
-				}
-			case 15 :
-				{
-					assertWithMessage(":15a:", event.replaceLineCount == 1);
-					assertWithMessage(":15b:", event.newLineCount == 2);
-					break;
-				}
-			case 16 :
-				{
-					assertWithMessage(":16a:", event.replaceLineCount == 0);
-					assertWithMessage(":16b:", event.newLineCount == 1);
-					break;
-				}
-			case 17 :
-				{
-					assertWithMessage(":17a:", event.replaceLineCount == 0);
-					assertWithMessage(":17b:", event.newLineCount == 2);
-					break;
-				}
-			case 18 :
-				{
-					assertWithMessage(":18a:", event.replaceLineCount == 0);
-					assertWithMessage(":18b:", event.newLineCount == 1);
-					break;
-				}
-			case 19 :
-				{
-					assertWithMessage(":19a:", event.replaceLineCount == 0);
-					assertWithMessage(":19b:", event.newLineCount == 4);
-					break;
-				}
-			case 20 :
-				{
-					assertWithMessage(":20a:", event.replaceLineCount == 0);
-					assertWithMessage(":20b:", event.newLineCount == 2);
-					break;
-				}
-		}
-	}
-
-	public void textSet(TextChangedEvent event) {
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
deleted file mode 100644
index 2876f483c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
+++ /dev/null
@@ -1,98 +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.jst.jsp.ui.tests.other;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here.
- * Creation date: (3/20/2001 6:19:58 PM)
- * @author: David Williams
- */
-public class StyledTextTest {
-	/**
-	 * StyledTextTest constructor comment.
-	 */
-	public StyledTextTest() {
-		super();
-	}
-
-	/**
-	 * Don't forget, the *swt*.dll will have to be copied to program directory for this to work.
-	 */
-	public static void main(String[] args) {
-
-		try {
-			Shell shell = new Shell();
-			GridLayout layout = new GridLayout();
-			shell.setLayout(layout);
-
-			Button button = new Button(shell, SWT.PUSH);
-			button.setText("Action");
-			button.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event e) {
-					System.out.println("button pushed");
-				}
-			});
-
-			StyledText text = new StyledText(shell, SWT.BORDER + SWT.H_SCROLL + SWT.V_SCROLL);
-			GridData data = new GridData(GridData.FILL_BOTH);
-			text.setLayoutData(data);
-
-			//
-			//		String fileName = System.getProperty("user.dir") + "\\" + "japanese_utf-16.txt";
-			//		String encoding = "UnicodeBig";
-
-			String fileName = System.getProperty("user.dir") + "\\" + "japanese_cp1252.txt";
-			String encoding = "Cp1252";
-			//sun.io.ByteToCharConverter.getDefault().toString();
-
-			System.out.println("Test file: " + fileName);
-			System.out.println("   Encoding: " + encoding);
-
-			InputStream in = new FileInputStream(fileName);
-			InputStreamReader inStream = new InputStreamReader(in, encoding);
-			//Reader inStream = new FileReader(fileName);
-			StringBuffer sb = new StringBuffer();
-			while (inStream.ready()) {
-				sb.append((char) inStream.read());
-			}
-			String inputString = sb.toString();
-			System.out.println("Length of input: " + inputString.length());
-			//
-			text.setText(inputString);
-
-			shell.setSize(400, 200);
-			shell.open();
-
-			Display display = shell.getDisplay();
-			while (shell != null && !shell.isDisposed()) {
-				if (!display.readAndDispatch())
-					display.sleep();
-			}
-		}
-		catch (Exception t) {
-			t.printStackTrace();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
deleted file mode 100644
index 55f0c9bbb..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1871 +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.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-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.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class UnitTests extends TestCase {
-
-	protected IStructuredDocument fModel;
-	protected IDOMModel tree;
-	protected int eventCase = 1;
-	protected boolean eventResult;
-
-	public static final int GENERIC_NODES_REPLACED_EVENT_CASE = 1001;
-	public static final int GENERIC_REGIONS_REPLACED_EVENT_CASE = 1002;
-	public static final int GENERIC_REGION_CHANGED_EVENT_CASE = 1003;
-	public static final int GENERIC_NEW_MODEL_EVENT_CASE = 1004;
-	public static final int GENERIC_NO_CHANGE_EVENT_CASE = 1005;
-
-	protected class StructuredDocumentListenerProxy implements IStructuredDocumentListener {
-		public void newModel(NewDocumentEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void noChange(NoChangeEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-
-		public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-			handleEvent(structuredDocumentEvent);
-		}
-	}
-
-	protected StructuredDocumentListenerProxy proxy = new StructuredDocumentListenerProxy();
-
-	/**
-	 * MinimizationTest constructor comment.
-	 */
-	public UnitTests(String name) {
-		super(name);
-	}
-
-	protected void handleEvent(StructuredDocumentEvent structuredDocumentEvent) {
-		eventResult = false;
-		switch (eventCase) {
-			case 1 :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 2 :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 3 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 4 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 5 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 6 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
-									if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
-										eventResult = true; // ok
-									}
-					}
-					break;
-				}
-			case 7 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-
-					break;
-				}
-			case 8 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								//if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
-								//if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 9 :
-			case 10 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
-									if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
-										eventResult = true; // ok
-					}
-					break;
-				}
-			case 11 :
-			case 12 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
-									if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
-										eventResult = true; // ok
-					}
-					break;
-				}
-			case 13 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size())
-							if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 14 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
-							if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
-								eventResult = true; // ok
-					}
-					break;
-				}
-			case 15 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						RegionChangedEvent regionChangedEvent = (RegionChangedEvent) structuredDocumentEvent;
-						IStructuredDocumentRegion documentRegion = ((RegionChangedEvent) structuredDocumentEvent).getStructuredDocumentRegion();
-						if ("b ".equals(documentRegion.getFullText(regionChangedEvent.getRegion()))) {
-							eventResult = true; // ok
-						}
-					}
-					break;
-				}
-			case 16 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (0 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 17 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 18 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
-							if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
-								eventResult = true; // ok
-							}
-						}
-					}
-					break;
-				}
-			case 19 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 20 :
-			case 21 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 22 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 23 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 24 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 25 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 26 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			// JSP5
-			case 27 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 28 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 29 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 30 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			// JSP6
-			case 31 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 32 :
-				{
-					// changed 2002, 9/12 to fit -- this is definitely a change
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						RegionsReplacedEvent regionsReplacedEvent = (RegionsReplacedEvent) structuredDocumentEvent;
-						if (1 == regionsReplacedEvent.getOldRegions().size()) {
-							ITextRegion region = regionsReplacedEvent.getOldRegions().get(0);
-							IStructuredDocumentRegion documentRegion = regionsReplacedEvent.getStructuredDocumentRegion();
-							String text = documentRegion.getText(region);
-							if ("<% aaa %>".equals(text)) {
-								eventResult = true; // ok
-							}
-
-						}
-					}
-					else if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						StructuredDocumentRegionsReplacedEvent nodesReplacedEvent = (StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent;
-						IStructuredDocumentRegionList regions = nodesReplacedEvent.getNewStructuredDocumentRegions();
-
-						if (1 == regions.getLength()) {
-							IStructuredDocumentRegion region = regions.item(0);
-							String text = region.getText();
-							//System.out.println(text);
-							if ("<c<% aaa ".equals(text)) {
-								eventResult = true;
-							}
-						}
-
-					}
-					break;
-				}
-			case 33 :
-				{
-					// changed 2002, 9/12 to fit
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						//					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 34 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			case 35 :
-				{
-					// chanced to RegionsReplaced 2002, 9/11 (attribute value to region container)
-					//					String startString = "<p><img src=\"file.gif\"><p>";
-					//					String changes = "<";
-					//					String expectedString = "<p><img src=\"file<.gif\"><p>";
-
-					//				if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 36 :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 37 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 38 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 39 :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case 40 :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			case GENERIC_NODES_REPLACED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_REGIONS_REPLACED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_REGION_CHANGED_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof RegionChangedEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_NEW_MODEL_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof NewDocumentEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-			case GENERIC_NO_CHANGE_EVENT_CASE :
-				{
-					if (structuredDocumentEvent instanceof NoChangeEvent) {
-						eventResult = true; // ok
-					}
-					break;
-				}
-
-			default :
-				{
-					if (structuredDocumentEvent instanceof NewDocumentEvent) {
-						eventResult = true; // ok
-					}
-				}
-		}
-	}
-
-	/**
-	 * Starts the application.
-	 * @param args an array of command-line arguments
-	 */
-	public static void main(java.lang.String[] args) {
-		if (args.length == 0) {
-			runAll();
-		}
-		else if (args.length == 1) {
-			String methodToRun = args[0].trim();
-			runOne(methodToRun);
-		}
-	}
-
-	protected static void runAll() {
-		junit.textui.TestRunner.run(suite());
-
-	}
-
-	public static void runOne(String methodName) {
-		TestSuite testSuite = new TestSuite();
-		TestCase test = new UnitTests(methodName);
-		testSuite.addTest(test);
-		junit.textui.TestRunner.run(testSuite);
-
-	}
-
-	/**
-	 * Set up an XML model
-	 */
-	protected void setUpXML() {
-
-		//  type = com.ibm.sed.model.IStructuredModel.XML;
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			fModel = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		//fModel = new com.ibm.sed.structuredDocument.impl.IStructuredDocument(new XMLSourceParser());
-
-		fModel.addDocumentChangedListener(proxy);
-
-		tree = new DOMModelImpl();
-
-		if (tree != null) {
-			fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
-			tree.setStructuredDocument(fModel);
-		}
-
-	}
-
-	/**
-	 * Set up a JSP model
-	 */
-	protected void setUpJSP() {
-
-		//type = com.ibm.sed.model.IStructuredModel.HTML;
-		IModelManager mm = StructuredModelManager.getModelManager();
-		try {
-			fModel = mm.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
-		}
-		catch (IOException e) {
-			// do nothing, since dummy
-		}
-		fModel = StructuredDocumentFactory.getNewStructuredDocumentInstance(new JSPSourceParser());
-
-		fModel.addDocumentChangedListener(proxy);
-
-		tree = new DOMModelImpl();
-
-		if (tree != null) {
-			fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
-			tree.setStructuredDocument(fModel);
-		}
-
-	}
-
-	/**
-	 */
-	public void simpleTest()  {
-
-		setUpJSP();
-		eventCase = 99;
-		String startString = "";
-		String changes = "<a></a>";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		//
-		fModel.setText(null, startString);
-
-		//
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void simpleTest2()  {
-
-		setUpXML();
-		eventCase = 99;
-		String startString = "";
-		String changes = "<a></a>";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void simpleTest3()  {
-
-		setUpXML();
-		eventCase = 99;
-		String startString = "<a></a>";
-		String changes = "";
-		String expectedString = "<a></a>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:16:02 PM)
-	 * @return junit.framework.Test
-	 */
-	protected static Test suite() {
-		return new TestSuite(UnitTests.class);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:28:59 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testDeleteBeginning()  {
-
-		setUpXML();
-		eventCase = 4;
-		String expectedString = "<GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 10, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:27:31 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testDeleteEnd()  {
-
-		setUpXML();
-		eventCase = 3;
-		String expectedString = "<ABC><DEF>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 10, 5, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 */
-	public void testEmbedded()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<p><img src=\"file.gif\"><p>";
-		String changes = "<";
-		String expectedString = "<p><img src=\"file<.gif\"><p>";
-		int startOfChanges = 17;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		eventCase = 35;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("part 1: text update", result);
-		assertTrue("part 1: event type", eventResult);
-
-		eventCase = 36;
-		startString = expectedString;
-		changes = "%";
-		expectedString = "<p><img src=\"file<%.gif\"><p>";
-		startOfChanges = 18;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 2: text update", result);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 37;
-		startString = expectedString;
-		changes = " ";
-		expectedString = "<p><img src=\"file<% .gif\"><p>";
-		startOfChanges = 19;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 3: text update", result);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 38;
-		startString = expectedString;
-		changes = "ab ";
-		expectedString = "<p><img src=\"file<% ab .gif\"><p>";
-		startOfChanges = 20;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 4: text update", result);
-		assertTrue("part 4: event type", eventResult);
-
-		eventCase = 39;
-		startString = expectedString;
-		changes = "%";
-		expectedString = "<p><img src=\"file<% ab %.gif\"><p>";
-		startOfChanges = 23;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 5: text update", result);
-		assertTrue("part 5: event type", eventResult);
-
-		eventCase = 40;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<p><img src=\"file<% ab %>.gif\"><p>";
-		startOfChanges = 24;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-
-		assertTrue("part 6: text update", result);
-		assertTrue("part 6: event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testEmbeddedJSP2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<a >c</a>";
-		String changes = "<%= b %>";
-		String expectedString = "<a <%= b %>>c</a>";
-		int startOfChanges = 3;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testDeepEmbeddedJSP()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<script><a   >c</a></script>";
-		String changes = "<%= b %>";
-		String expectedString = "<script><a <%= b %>  >c</a></script>";
-		int startOfChanges = 11;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		StructuredDocumentEvent event = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-		IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
-		String testText = testR.getText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %>  >"));
-		testText = testR.getFullText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %>  >"));
-
-		ITextRegionList regionList = testR.getRegions();
-
-		ITextRegion region = regionList.get(0);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<"));
-
-		region = regionList.get(1);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("a"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("a "));
-
-		region = regionList.get(2);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %>"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %>  "));
-
-		// ===	
-
-		ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
-		ITextRegionList eRegions = cRegion.getRegions();
-		ITextRegion eRegion = eRegions.get(0);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-
-		eRegion = eRegions.get(1);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b "));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b "));
-
-		eRegion = eRegions.get(2);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("%>"));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("%>"));
-
-		eRegion = eRegions.get(3);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(""));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("  "));
-
-		// ====
-
-		region = regionList.get(3);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals(">"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals(">"));
-
-	}
-
-	public void testDeepEmbeddedJSP2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<script><a   >c</a></script>";
-		String changes = "<%= b %";
-		String expectedString = "<script><a <%= b %  >c</a></script>";
-		int startOfChanges = 11;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		StructuredDocumentEvent event = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-		IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
-		String testText = testR.getText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %  >"));
-		testText = testR.getFullText();
-		assertTrue("text retrieve", testText.equals("<a <%= b %  >"));
-
-		ITextRegionList regionList = testR.getRegions();
-
-		ITextRegion region = regionList.get(0);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<"));
-
-		region = regionList.get(1);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("a"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("a "));
-
-		region = regionList.get(2);
-		testText = testR.getText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %  >"));
-		testText = testR.getFullText(region);
-		assertTrue("text retrieve", testText.equals("<%= b %  >"));
-
-		// ===	
-
-		ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
-		ITextRegionList eRegions = cRegion.getRegions();
-		ITextRegion eRegion = eRegions.get(0);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals("<%="));
-
-		eRegion = eRegions.get(1);
-		testText = cRegion.getText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b %  >"));
-		testText = cRegion.getFullText(eRegion);
-		assertTrue("text retrieve", testText.equals(" b %  >"));
-
-
-		// ====	
-	}
-
-	public void testDeepEmbeddedJSP3() {
-		// CMVC 245586
-		// this is a test to make sure ContextRegionContainer returns what we expect
-		setUpJSP();
-		String startString = "<html><head><script> <%! String testvar = \"testvar\"; %> var test = <%= testvar %> </script></head></html>";
-		String expectedText = "<%! String testvar = \"testvar\"; %>";
-		((XMLSourceParser) fModel.getParser()).addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false)); //$NON-NLS-1$
-		fModel.setText(null, startString);
-
-		IStructuredDocumentRegionList nodes = fModel.getRegionList();
-
-		IStructuredDocumentRegion scriptBlockRegion = fModel.getRegionAtCharacterOffset(21);
-		ITextRegionList blockRegions = scriptBlockRegion.getRegions();
-		ITextRegionContainer jspDecl = (ITextRegionContainer) blockRegions.get(1);
-		String fullText = jspDecl.getFullText();
-
-		//assertTrue("ContextRegionContainer.getFullText()", fullText.equals(expectedText));
-		assertEquals("ContextRegionContainer.getFullText() value incorrect: ", expectedText, fullText);
-	}
-
-	public void testJSP1()  {
-
-		//testEvent = 23;
-		//tags = "abcd<%= abc %>efgh";
-		//testStructuredDocumentReplacement(testEvent, tags, " ","abcd< %= abc %>efgh", 5, 0, com.ibm.sed.model.IStructuredModel.HTML);
-
-		setUpJSP();
-		eventCase = 23;
-		String startString = "abcd<%= abc %>efgh";
-		String expectedString = "abcd< %= abc %>efgh";
-		String changes = " ";
-		int startOfChanges = 5;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testJSP2()  {
-
-		//testEvent = 24;
-		//tags = "abcd<% abc %>efgh";
-		//testStructuredDocumentReplacement(testEvent, tags, " ","abcd< % abc %>efgh", 5, 0, com.ibm.sed.model.IStructuredModel.HTML);
-
-		setUpJSP();
-		eventCase = 24;
-		String startString = "abcd<% abc %>efgh";
-		String expectedString = "abcd< % abc %>efgh";
-		String changes = " ";
-		int startOfChanges = 5;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	public void testJSP3()  {
-
-		//testEvent = 25;
-		//tags = "<%= abc %>";
-		//testStructuredDocumentReplacement(testEvent, tags, " ","< %= abc %>", 1, 0, com.ibm.sed.model.IStructuredModel.HTML);
-
-		setUpJSP();
-		eventCase = 25;
-		String startString = "<%= abc %>";
-		String expectedString = "< %= abc %>";
-		String changes = " ";
-		int startOfChanges = 1;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	public void testJSP4()  {
-
-		//testEvent = 26;
-		//tags = "<% abc %>";
-		//testStructuredDocumentReplacement(testEvent, tags, " ","< % abc %>", 1, 0, com.ibm.sed.model.IStructuredModel.HTML);
-
-		setUpJSP();
-		eventCase = 26;
-		String startString = "<% abc %>";
-		String expectedString = "< % abc %>";
-		String changes = " ";
-		int startOfChanges = 1;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 Give a JSP scriptlet :
-	 <% aaa %>
-	 When an user types "<bb>" just before
-	 the JSP scriptlet :
-	 (1) When '<' is typed, regionsReplaced()
-	 is called for "<%".
-	 (2) When 'b' is typed, nodesReplaced()
-	 is called for "<<%" and " aaa ".
-	 (3) When 'b' is typed again, finally,
-	 nodesReplaced() is called for
-	 "<b<% aaa" and "%>".
-	 The end JSP IStructuredDocumentRegion should be
-	 reparsed at (1), but not wait until (3).
-	 
-	 */
-	public void testJSP5()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<% aaa %><p>";
-		String changes = "<";
-		String expectedString = "<<% aaa %><p>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		eventCase = 27;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-		assertTrue("part 1: text update", result);
-		assertTrue("part 1: event type", eventResult);
-
-		// step 2
-		// ? does assertTrue prevent rest from executing if 'false'?
-		// ans: yes
-		eventCase = 28;
-		startString = expectedString;
-		changes = "b";
-		expectedString = "<b<% aaa %><p>";
-		startOfChanges = 1;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 2: text update", result);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 29;
-		startString = expectedString;
-		changes = "b";
-		expectedString = "<bb<% aaa %><p>";
-		startOfChanges = 2;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 3: text update", result);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 30;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<bb><% aaa %><p>";
-		startOfChanges = 3;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 4: text update", result);
-		assertTrue("part 4: event type", eventResult);
-	}
-
-	/**
-	 Example 4)
-	 
-	 Given two JSP scriptlets :
-	 <% aaa %><% bbb %>
-	 When an user types "<cccc>" just before
-	 the JSP scriptlet, watch the IStructuredDocument events
-	 on each character typing.
-	 You will see the next JSP IStructuredDocumentRegion is reparsed
-	 (to be broken into other type of IStructuredDocumentRegion)
-	 one by one on each event.
-	 But it should be at once at the first event.
-	 Old Component: wsa.web.pageediting
-	 New Component: wsa.web.xmleditor
-	 
-	 
-	 */
-	public void testJSP6()  {
-		// caution ... we're re-using event checks from JSP5
-
-		setUpJSP();
-
-		eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
-		String startString = "<% aaa %><% bbb %>";
-		String changes = "<";
-		String expectedString = "<<% aaa %><% bbb %>";
-		int startOfChanges = 0;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-		eventCase = 31;
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-		assertTrue("part 1: text update", result);
-		assertTrue("part 1: event type", eventResult);
-
-		eventCase = 32;
-		startString = expectedString;
-		changes = "c";
-		expectedString = "<c<% aaa %><% bbb %>";
-		startOfChanges = 1;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 2: text update", result);
-		assertTrue("part 2: event type", eventResult);
-
-		eventCase = 33;
-		startString = expectedString;
-		changes = "c";
-		expectedString = "<cc<% aaa %><% bbb %>";
-		startOfChanges = 2;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 3: text update", result);
-		assertTrue("part 3: event type", eventResult);
-
-		eventCase = 34;
-		startString = expectedString;
-		changes = ">";
-		expectedString = "<cc><% aaa %><% bbb %>";
-		startOfChanges = 3;
-		lengthToReplace = 0;
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-
-		result = (expectedString.equals(resultString));
-		assertTrue("part 4: text update", result);
-		assertTrue("part 4: event type", eventResult);
-
-	}
-
-	/**
-	 * this test easily returns "ok" even with the no-space bug. Its mostly to
-	 * "hand examine" the structuredDocument created from the initial setText.
-	 */
-	public void testJSPDirective()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<%@include%>";
-		String changes = "T";
-		String expectedString = "<%@include%>T";
-		int startOfChanges = 12;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//  ?
-		//	assertTrue(result); // && eventResult);
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:53:08 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod10()  {
-
-		setUpXML();
-		eventCase = 10;
-		String expectedString = "<TD></TD>";
-
-		fModel.setText(null, "<TD></TD><TD></TD>");
-
-		fModel.replaceText(null, 9, 9, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 10:56:04 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod11()  {
-
-		setUpXML();
-		eventCase = 11;
-		String expectedString = "<XXX><TD></TD><XXX>";
-
-		fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
-		fModel.replaceText(null, 5, 9, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 10:59:39 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod12()  {
-
-		setUpXML();
-		eventCase = 12;
-		String expectedString = "<XXX><TD></TD><XXX>";
-
-		fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
-		fModel.replaceText(null, 14, 9, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:00:59 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod13()  {
-
-		setUpXML();
-		eventCase = 13;
-		String expectedString = "<ABC><JKL><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 5, 5, "<JKL>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:02:19 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod14()  {
-
-		setUpXML();
-		eventCase = 14;
-		String expectedString = "<a>\r\r  </a>";
-
-		fModel.setText(null, "<a>\r<b>\r  </a>");
-
-		fModel.replaceText(null, 4, 3, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:03:53 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod15()  {
-
-		setUpXML();
-		eventCase = 15;
-		String expectedString = "<a><b ></b></a>";
-
-		fModel.setText(null, "<a><b></b></a>");
-
-		fModel.replaceText(null, 5, 0, " ");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:05:27 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod16()  {
-
-		setUpXML();
-		eventCase = 16;
-		String expectedString = "<a><b z></b></a>";
-
-		fModel.setText(null, "<a><b ></b></a>");
-
-		fModel.replaceText(null, 6, 0, "z");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:06:33 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod17()  {
-
-		setUpXML();
-		eventCase = 17;
-		String expectedString = "<a><b z=\"t\"></b></a>";
-
-		fModel.setText(null, "<a><b z></b></a>");
-
-		fModel.replaceText(null, 6, 1, "z=\"t\"");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:09:17 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod18()  {
-
-		setUpXML();
-		eventCase = 18;
-		String expectedString = "<a><c z></b></a>";
-
-		fModel.setText(null, "<a><b z></b></a>");
-
-		fModel.replaceText(null, 4, 3, "c z");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:10:30 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod19()  {
-
-		eventCase = 19;
-		setUpJSP();
-		fModel.setText(null, "<BODY>\r<IMG src=\"<%=\r</BODY>\r");
-		String expectedString = "<BODY>\r<IMG src=\"<%=Q\r</BODY>\r";
-
-		fModel.replaceText(null, 20, 0, "Q");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:12:05 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod20()  {
-
-		setUpJSP();
-
-		eventCase = 20;
-		String expectedString = "<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
-		fModel.setText(null, "<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
-		fModel.replaceText(null, 28, 1, "\rBODY {\r\r}");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/2/2001 11:32:23 AM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod21()  {
-
-		setUpJSP();
-
-		eventCase = 21;
-		String expectedString = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r      <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
-		fModel.setText(null, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r      <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
-		fModel.replaceText(null, 343, 1, "\rBODY {\r\r}");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:45:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethod9()  {
-
-		setUpXML();
-		eventCase = 9;
-		String expectedString = "<TD></TD>";
-
-		fModel.setText(null, "<TD></TD><TD></TD>");
-
-		fModel.replaceText(null, 0, 9, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:45:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testMethodAttributeNameReplace1()  {
-
-		//testEvent = 22;
-		//tags = "<tagName abc=\"bsf\">";
-		//testStructuredDocumentReplacement(testEvent, tags, "abcde","<tagName abcde=\"bsf\">", 9, 3);
-
-		setUpXML();
-		eventCase = 22;
-		String startString = "<tagName abc=\"bsf\">";
-		String expectedString = "<tagName abcde=\"bsf\">";
-		String changes = "abcde";
-		int startOfChanges = 9;
-		int lengthToReplace = 3;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:35:41 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testModifyMiddle()  {
-
-		setUpXML();
-		eventCase = 5;
-		String expectedString = "<ABC><JKL><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 15, "<ABC><JKL><GHI>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:06:33 PM)
-	 */
-	public void testNoChange1()  {
-
-		setUpXML();
-		eventCase = 1;
-		String expectedString = "<ABC><DEF><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 10, 0, "");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:26:05 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testNoChange2()  {
-
-		setUpXML();
-		eventCase = 2;
-		String expectedString = "<ABC><DEF><GHI>";
-
-		fModel.setText(null, "<ABC><DEF><GHI>");
-
-		fModel.replaceText(null, 0, 15, "<ABC><DEF><GHI>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:38:25 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimilarStart()  {
-
-		setUpXML();
-		eventCase = 6;
-		String expectedString = "<P><B></B><B></B></P>";
-
-		fModel.setText(null, "<P><B></B></P>");
-
-		fModel.replaceText(null, 3, 0, "<B></B>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:43:29 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimilarStartEnd()  {
-
-		setUpXML();
-		eventCase = 8;
-		String expectedString = "<P><B><B></B></B></P>";
-
-		fModel.setText(null, "<P><B></B></P>");
-
-		fModel.replaceText(null, 6, 0, "<B></B>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/1/2001 6:41:46 PM)
-	 * @exception SourceEditingException The exception description.
-	 */
-	public void testSimiliarEnd()  {
-
-		setUpXML();
-		eventCase = 7;
-		String expectedString = "<P><B></B><P><P>";
-
-		fModel.setText(null, "<P><B></B><P>");
-
-		fModel.replaceText(null, 10, 0, "<P>");
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-	}
-
-	/**
-	 */
-	public void testTagReDetection()  {
-
-		setUpJSP();
-		// (nsd) 2003.12.10 - changed from NodesReplaced to RegionsReplaced since the start condition was changed
-		// from being 3 document regions to 4 since "script" is not 'nestable'
-		//eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		
-		// reverted 2004.04.05
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-//		eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-		String startString = "<p>test<<SCRIPT>";
-		String changes = "S";
-		String expectedString = "<p>test<S<SCRIPT>";
-		int startOfChanges = 8;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//  ?	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testTagReDetection2()  {
-
-		setUpJSP();
-		eventCase = GENERIC_REGION_CHANGED_EVENT_CASE;
-		String startString = "<p>test<<SCRIPT>";
-		String changes = "S";
-		String expectedString = "<p>test<<SCRIPTS>";
-		int startOfChanges = 15;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 */
-	public void testTagReDetection3()  {
-
-		setUpJSP();
-		eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<p>test<test>";
-		String changes = "%";
-		String expectedString = "<p>test<%test>";
-		int startOfChanges = 8;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		assertTrue("event type", eventResult);
-
-	}
-
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (fModel != null)
-			fModel.removeDocumentChangedListener(proxy);
-	}
-
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	public void testPageDirective()  {
-		boolean verbose = false;
-		setUpJSP();
-		eventCase = 999; //GENERIC_NODES_REPLACED_EVENT_CASE;
-		String startString = "<%@page lang=\"java\" <SCRIPT>var <% test %> String</SCRIPT>";
-		String changes = "s";
-		String expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
-		int startOfChanges = 18;
-		int lengthToReplace = 0;
-
-		fModel.setText(null, startString);
-
-		if (verbose) {
-			Debug.dump(fModel, true);
-		}
-
-		StructuredDocumentEvent structuredDocumentEvent = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		String resultString = fModel.getText();
-
-		boolean result = (expectedString.equals(resultString));
-
-		//	assertTrue(result); // && eventResult);
-		assertTrue("text update", result);
-		//assertTrue("event type", eventResult);
-
-		if (verbose) {
-			System.out.println();
-			System.out.println("structured document:");
-			IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
-			Debug.dump(document, true);
-		}
-
-		// now delete quote
-		changes = "";
-		expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
-		startOfChanges = 19;
-		lengthToReplace = 1;
-		fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
-		resultString = fModel.getText();
-		assertTrue("text update", result);
-
-		if (verbose) {
-			System.out.println();
-			System.out.println("structured document:");
-			IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
-			Debug.dump(document, true);
-		}
-
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
deleted file mode 100644
index c37651b4d..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
+++ /dev/null
@@ -1,202 +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.jst.jsp.ui.tests.pagedirective;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-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.INodeAdapterFactory;
-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.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Node;
-
-/**
- * @author davidw
- */
-public class TestPageDirective extends TestCase {
-
-	class MyEmbeddedFactory implements INodeAdapterFactory {
-
-		public INodeAdapter adapt(INodeNotifier object) {
-			return null;
-		}
-
-		public INodeAdapterFactory copy() {
-			return null;
-		}
-
-		public boolean isFactoryForType(Object type) {
-			return type instanceof MyAdaptedClass;
-		}
-
-		public void release() {
-			// noop
-		}
-	}
-	
-	class MyAdaptedClass {
-		// dummy class is key
-	}
-	
-	/**
-	 * Constructor for TestPageDirective.
-	 * @param name
-	 */
-	public TestPageDirective(String name) {
-		super(name);
-	}
-
-	public void testBasicPD() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-	}
-
-	public void testBasicChangedPD() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-		// change to javascript
-		model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be javascript", "javascript".equals(language));
-
-	}
-
-	public void testBasicChangedPDBack() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
-		String contentType = pageDirectiveAdapter.getContentType();
-		String language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-
-		// change to javascript
-		model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be javascript", "javascript".equals(language));
-
-		// change back to java
-		model.getStructuredDocument().replaceText(this, 43, 10, "java");
-
-		contentType = pageDirectiveAdapter.getContentType();
-		language = pageDirectiveAdapter.getLanguage();
-
-		assertTrue("contentType should be html", "text/html".equals(contentType));
-		assertTrue("language should be java", "java".equals(language));
-	}
-	
-	public void testSetEmbeddedType(){
-		IStructuredModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		EmbeddedTypeHandler embeddedXMLHandler = new EmbeddedXML();
-		pageDirectiveAdapter.setEmbeddedType(embeddedXMLHandler);
-		
-		EmbeddedTypeHandler handler = pageDirectiveAdapter.getEmbeddedType();
-		assertTrue("incorrect embedded handler", handler == embeddedXMLHandler);
-	}
-	
-	public void testAdapt() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		Node ownerNode = model.getDocument();
-		
-		ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) ownerNode, ModelQueryAdapter.class);
-		assertNotNull("could not adapt embedded adapter", embeddedAdapter);
-	}
-	
-	public void testAddEmbeddedFactory() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.addEmbeddedFactory(new MyEmbeddedFactory());
-	}
-	
-	public void testSetLanguage() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.setLanguage("text/xml");
-		assertTrue("set language failed", pageDirectiveAdapter.getLanguage().equals("text/xml"));
-	}
-	
-	public void testGetTarget() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		INodeNotifier notifier = pageDirectiveAdapter.getTarget();
-		assertNotNull("target is null", notifier);
-	}
-	
-	public void testRelease() {
-		IDOMModel model = createUnmanagedHTMLModel();
-		PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
-		pageDirectiveAdapter.release(MyAdaptedClass.class);
-	}
-	
-	private IDOMModel createUnmanagedHTMLModel() {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		assertTrue("model could not be created!", model != null);
-
-		// Now, assigning use a page directive, but leaving embedded type the same as default
-		model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-		return (IDOMModel)model;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/ChecksApprover.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/ChecksApprover.jsp
deleted file mode 100644
index 893feb03a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/ChecksApprover.jsp
+++ /dev/null
@@ -1,930 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
-	05/01/03 SP - Updated Code so that users can type single or double quotes whille entering comments
-	02/28/03 SP - Added an external file for ReasonCode , saving comments when they cancel and saving reasonCode
-	02/25/2003 JDE - Updated to retrieve loan check digit (Issue #170).
-	02/20/2003 JDE - Updated payeeName variable to retrieve PayeeName data member from the container.
-	02/05/2003 JDE - Updated String ClosingAgentName = closingAgentInfo.getAgent(); //Previous method: closingAgentInfo.getContactName();
-	02/05/2003 JDE - Updated setvalue JavaScript function per Shirley Smajd (Issue#65)
-	02/03/2003 JDE - Updated CheckAmount and AccountSUSPNumber fields.
-	01/31/2003 JDE - Updated for changed user requirements per Charles Lee request.
--->
-<%
-/****************************************************************************/
-/*                                                                          */
-/* Program name: rdtemplate.jsp                                             */
-/*                                                                          */
-/* Description: Template file of Rapid Deployment Wizard                    */
-/*                                                                          */
-/*                                                                          */
-/*  Statement:  Licensed Materials - Property of IBM                        */
-/*                                                                          */
-/*              MQSeries SupportPac WA83                                    */
-/*              (C) Copyright IBM Corp. 2000                                */
-/*                                                                          */
-/****************************************************************************/
-/*                                                                          */
-/* Function:                                                                */
-/*   This file is a Template of RDW(Rapid Deployment Wizard).               */
-/*                                                                          */
-/*   RDW will generate input fields between                                 */
-/*   '<!-- METADATA name="JspWizard" startspan -->' and                     */
-/*   '<!-- METADATA name="JspWizard" endspan -->'.                          */
-/*   Don't change these lines.                                              */
-/*                                                                          */
-/*   In this template, you must define accessor method for container        */
-/*   member. Default accessor are defined, such as getStringMember or       */
-/*   getDoubleMember. If you want to change these method, you must change   */
-/*   RapidDeployment.properties too.                                        */
-/*                                                                          */
-/****************************************************************************/
-/*                                                                          */
-/* Change history:                                                          */
-/*                                                                          */
-/* V1.0   15-December-2000  JWH  Initial release                            */
-/* V1.1   10-December-2001  JWH  Error page information is appended         */
-/*                                                                          */
-/*==========================================================================*/
-/* Module Name: rdtemplate.jsp                                              */
-/*==========================================================================*/
-%>
-<%@ page language="java" info="JspWizard" %>
-<%@ page errorPage="../forms/ViewError.jsp" %>
-<%@ page import="com.ibm.workflow.api.*" %>
-<%@ page import="com.ibm.workflow.api.ItemPackage.*" %>
-<%@ page import="com.ibm.workflow.servlet.client.*" %>
-<%@ page import="com.principal.residential.postclosing.utils.*" %>
-<%@ page import="com.principal.residential.postclosing.beans.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.lang.*" %>
-<%@ page import="java.io.*" %>
-<%@ include file="./includes/Header.jsp"%>
-<%@ include file="./includes/Comments.jsp"%>
-<%@ include file="./includes/GetCheckDigit.jsp"%>
-<%@ include file="./includes/ReasonCodeAndValue.jsp"%>
-
-<jsp:useBean id="context" scope="request" type="com.ibm.workflow.servlet.client.RequestContext" />
-<jsp:useBean id="now"  scope="request" class="java.util.Date" />
-
-<% 
-	ReadOnlyContainer inData=context.getContainer();
-	WorkItem workItem=context.getWorkItem();
-	request.setAttribute("context", context); 
-	request.getSession(true).setAttribute("context", context);	
-	
-	String CheckInWorkItem = context.getCommand("checkInWorkItem", workItem.persistentOid());
-	String CancelWorkItem = context.getCommand("cancelWorkItem", workItem.persistentOid());   
-
-	String PayTo = getStringMember(context, inData, "PayTo");
-	if(PayTo != null)
-	{
-		PayTo = PayTo.trim();
-	}
-	String PayeeName = getStringMember(context, inData, "PayeeName");
-	if(PayeeName != null)
-	{
-		PayeeName = PayeeName.trim();
-	}
-	String PayeeAddress = getStringMember(context, inData, "PayeeAddress");
-	if(PayeeAddress != null)
-	{
-		PayeeAddress = PayeeAddress.trim();
-	}
-	String bLastName = getStringMember(context, inData, "BorrowerLastName");
-	if(bLastName != null)
-	{
-		bLastName = bLastName.trim();
-	}
-	String bFirstName = getStringMember(context, inData, "BorrowerFirstName");
-	if(bFirstName != null)
-	{
-		bFirstName = bFirstName.trim();
-	}
-	String Borrower = bLastName + ", " + bFirstName;
-	String CheckRouting = getStringMember(context, inData, "CheckRouting");	
-	if(CheckRouting != null)
-	{
-		CheckRouting = CheckRouting.trim();
-	}
-	String CheckNeeded = getStringMember(context, inData, "CheckNeeded");
-	if(CheckNeeded != null)
-	{
-		CheckNeeded = CheckNeeded.trim();
-	}
-	String CheckTiming = getStringMember(context, inData, "CheckTiming");
-	if(CheckTiming != null)
-	{
-		CheckTiming = CheckTiming.trim();
-	}
-	String histOfCommFromIp = getStringMember(context, inData, "HistoryOfComments");
-	histOfCommFromIp = adjustComments(histOfCommFromIp); 	
-	String Comments = getStringMember(context, inData, "Comments");
-	Comments = adjustComments(Comments);   	
-	String LoanNumber = getStringMember(context, inData, "LoanNumber");
-	if(LoanNumber != null)
-	{
-		LoanNumber = LoanNumber.trim();
-	}
-	String WFCheckNumber = getStringMember(context, inData, "WFCheckNumber");
-	if(WFCheckNumber != null)
-	{
-		WFCheckNumber = WFCheckNumber.trim();
-	}
-	String blockCheckNumber = getStringMember(context, inData, "BlockCheckNumber");
-	if(blockCheckNumber != null)
-	{
-		blockCheckNumber = blockCheckNumber.trim();
-	}
-	String BranchOfficeCode = getStringMember(context, inData, "BranchOfficeCode");	
-	if(BranchOfficeCode != null)
-	{
-		BranchOfficeCode = BranchOfficeCode.trim();
-	}
-	String SatelliteOfficeCode = getStringMember(context, inData, "SatelliteOfficeCode");	
-	if(SatelliteOfficeCode != null)
-	{
-		SatelliteOfficeCode = SatelliteOfficeCode.trim();
-	}
-	String RepresentativeCode = getStringMember(context, inData, "RepresentatveCode");		
-	if(RepresentativeCode != null)
-	{
-		RepresentativeCode = RepresentativeCode.trim();
-	}	
-	String CheckRequestReason = getStringMember(context, inData, "CheckRequestReason");	
-	if(CheckRequestReason != null)
-	{
-		CheckRequestReason = CheckRequestReason.trim();
-	}
-	String UserIDOrig = getStringMember(context, inData, "UserID_Orig");
-	if(UserIDOrig != null)
-	{
-		UserIDOrig = UserIDOrig.trim();
-	}	
-	String UserID = context.getUserID();
-	String AccountSUSPNumber = getStringMember(context, inData, "AccountSUSPNumber");
-	if(AccountSUSPNumber != null)
-	{
-		AccountSUSPNumber = AccountSUSPNumber.trim();
-	}
-	String ActivityName = getStringMember(context, inData, "ActivityName");
-	if(ActivityName != null)
-	{
-		ActivityName = ActivityName.trim();
-	}
-	String CheckAmount = getStringMember(context, inData, "CheckAmount");
-	if(CheckAmount != null)
-	{
-		CheckAmount = CheckAmount.trim();
-	}
-	String reasonCode = getStringMember(context, inData, "ReasonCode");
-	
-	// LoanInfoBean
-	RMPCLoanDataBean loanData = new RMPCLoanDataBean();
-	RMPCLoanInfo loanInfo = new RMPCLoanInfo();
-	loanInfo = loanData.getCurrentLoanInfo(getLongMember(context, inData, "LoanNumber"));
-	String BorrowerAddress = loanInfo.getBorrowerAddress();	
-	String BorrowerFirstName = loanInfo.getBorrowerFirstName();
-	String BorrowerLastName = loanInfo.getBorrowerLastName();
-	
-	// Closing Agent Details	
-	ClosingAgentInfo closingAgentInfo = loanInfo.getClosingAgentInfo();
-	String ClosingAgentName = closingAgentInfo.getAgent(); //closingAgentInfo.getContactName();
-	String ClosingAgentAddress = closingAgentInfo.getAddress();
-	
-// HistoryOfChecks Info
-	String HCDt1 = getStringMember(context, inData, "HistoryOfChecks.Date1");
-	if(HCDt1 != null)
-	{
-		HCDt1 = HCDt1.trim();
-	}
-	String HCAmt1 = getStringMember(context, inData, "HistoryOfChecks.Amount1");
-	if(HCAmt1 != null)
-	{
-		HCAmt1 = HCAmt1.trim();
-	}
-	String HCPayee1 = getStringMember(context, inData, "HistoryOfChecks.PayeeName1");
-	if(HCPayee1 != null)
-	{
-		HCPayee1 = HCPayee1.trim();
-	}
-	String HCDt2 = getStringMember(context, inData, "HistoryOfChecks.Date2");
-	if(HCDt2 != null)
-	{
-		HCDt2 = HCDt2.trim();
-	}
-	String HCAmt2 = getStringMember(context, inData, "HistoryOfChecks.Amount2");
-	if(HCAmt2 != null)
-	{
-		HCAmt2 = HCAmt2.trim();
-	}
-	String HCPayee2 = getStringMember(context, inData, "HistoryOfChecks.PayeeName2");
-	if(HCPayee2 != null)
-	{
-		HCPayee2 = HCPayee2.trim();
-	}
-	String HCDt3 = getStringMember(context, inData, "HistoryOfChecks.Date3");
-	if(HCDt3 != null)
-	{
-		HCDt3 = HCDt3.trim();
-	}
-	String HCAmt3 = getStringMember(context, inData, "HistoryOfChecks.Amount3");
-	if(HCAmt3 != null)
-	{
-		HCAmt3 = HCAmt3.trim();
-	}
-	String HCPayee3 = getStringMember(context, inData, "HistoryOfChecks.PayeeName3");
-	if(HCPayee3 != null)
-	{
-		HCPayee3 = HCPayee3.trim();
-	}
-	String HCDt4 = getStringMember(context, inData, "HistoryOfChecks.Date4");
-	if(HCDt4 != null)
-	{
-		HCDt4 = HCDt4.trim();
-	}
-	String HCAmt4 = getStringMember(context, inData, "HistoryOfChecks.Amount4");
-	if(HCAmt4 != null)
-	{
-		HCAmt4 = HCAmt4.trim();
-	}
-	String HCPayee4 = getStringMember(context, inData, "HistoryOfChecks.PayeeName4");
-	if(HCPayee4 != null)
-	{
-		HCPayee4 = HCPayee4.trim();
-	}
-	String HCDt5 = getStringMember(context, inData, "HistoryOfChecks.Date5");
-	if(HCDt5 != null)
-	{
-		HCDt5 = HCDt5.trim();
-	}
-	String HCAmt5 = getStringMember(context, inData, "HistoryOfChecks.Amount5");
-	if(HCAmt5 != null)
-	{
-		HCAmt5 = HCAmt5.trim();
-	}
-	String HCPayee5 = getStringMember(context, inData, "HistoryOfChecks.PayeeName5");
-	if(HCPayee5 != null)
-	{
-		HCPayee5 = HCPayee5.trim();
-	}
-	
-	// 02/25/2003 JDE - Update to retrieve loan check digit (Issue #170)
-	String CheckDigit = getCheckDigit(LoanNumber);	
-%>
-
-<%!
-  public String getStringMember(RequestContext context, ReadOnlyContainer input, String name) {
-    String val = null;    
-    try {
-      val = context.getMemberValue(input, name, "");
-    }
-    catch (Exception e) {
-    }    
-    return val;
-  }
-
-  public double getDoubleMember(RequestContext context, ReadOnlyContainer input, String name) {
-    String val = null;
-    double rtn = 0.0;    
-    try {
-      val = context.getMemberValue(input, name, "0.0");
-      rtn = Double.parseDouble(val);
-    }
-    catch (Exception e) {
-    }    
-    return rtn;
-  }
-
-  public int getLongMember(RequestContext context, ReadOnlyContainer input, String name) {
-    String val = null;
-    int rtn = 0;    
-    try {
-      val = context.getMemberValue(input, name, "0");
-      rtn = Integer.parseInt(val);
-    }
-    catch (Exception e) {
-    }    
-    return rtn;
-  }    
-%>
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title></title>
-<script language="JavaScript" src="../programs/includes/includeJavaScript.js"></script>
-<SCRIPT language="JavaScript" src="../programs/includes/validateJSP.js"></SCRIPT>
-<script language="javascript">
-<!--
-var payTo = "<%=PayTo%>";
-var borrower = "<%=Borrower%>";
-var checkRouting = "<%=CheckRouting%>";
-var checkNeeded = "<%=CheckNeeded%>";
-var checkTiming = "<%=CheckTiming%>";
-var closingAgentName = "<%=ClosingAgentName%>";
-var closingAgentAddress = "<%=ClosingAgentAddress%>";
-var borrowerLastName = trim("<%=BorrowerLastName%>");
-var borrowerFirstName = trim("<%=BorrowerFirstName%>");
-// 02/20/2003 JDE - Update payeeName variable to pull the PayeeName member from the data container.
-// var payeeName = trim(borrowerFirstName) + " " + trim(borrowerLastName);
-var payeeName = "<%=PayeeName%>";
-var payeeAddress = "<%=PayeeAddress%>";
-var borrowerAddress = "<%=BorrowerAddress%>";
-// End 02/20/2003 Update
-var accountSUSPNumber = "<%=AccountSUSPNumber%>";
-var checkRequestReason = "<%=CheckRequestReason%>";
-var spacer = ", ";
-var br = "<BR>";
-var hcDt1 = "<%=HCDt1%>";
-var hcAmt1 = "<%=HCAmt1%>";
-var hcPayee1 = "<%=HCPayee1%>";
-var hcDt2 = "<%=HCDt2%>";
-var hcAmt2 = "<%=HCAmt2%>";
-var hcPayee2 = "<%=HCPayee2%>";
-var hcDt3 = "<%=HCDt3%>";
-var hcAmt3 = "<%=HCAmt3%>";
-var hcPayee3 = "<%=HCPayee3%>";
-var hcDt4 = "<%=HCDt4%>";
-var hcAmt4 = "<%=HCAmt4%>";
-var hcPayee4 = "<%=HCPayee4%>";
-var hcDt5 = "<%=HCDt5%>";
-var hcAmt5 = "<%=HCAmt5%>";
-var hcPayee5 = "<%=HCPayee5%>";
-var hcString = "";
-var curDt = "<%=now%>";
-var tab = "\t";
-var fieldName = "";
-var varName = "";
-var needCheck = "";
-var activity = "<%=ActivityName%>";
-var historyOfComments = '<%=histOfCommFromIp%>';
-var checkAmount = "<%=CheckAmount%>";
-var displayCheckAmt = formatCurrency("<%=CheckAmount%>");
-
-function pendForSelf(){	
-	preserveValues();	
-	document.forms[0].returnCode.value=1;	
-	document.forms[0].submit();	
-}		
-
-function showRadio(text) {
-	if (text == "One"){
-		if (payTo == "Borrower"){document.write('<INPUT name="PayTo" type="radio" value="Borrower" onClick="displayBorrowerInfo()" checked>');
-		}else{document.write('<INPUT name="PayTo" type="radio" value="Borrower" onClick="displayBorrowerInfo()">');}
-	} 		
-	if (text == "Two"){
-		if (payTo == "MICompany"){document.write('<INPUT name="PayTo" type="radio" value="MICompany" onClick="clearPayeeInfo()" checked>');
-		}else{document.write('<INPUT name="PayTo" type="radio" value="MICompany" onClick="clearPayeeInfo()" >');}
-	}
-	if (text == "Three"){
-		if (payTo == "Closing Agent"){document.write('<INPUT name="PayTo" type="radio" value="Closing Agent" onClick="displayClosingAgentInfo()" checked>');
-		}else{document.write('<INPUT name="PayTo" type="radio" value="Closing Agent" onClick="displayClosingAgentInfo()">');}
-	}	
-	if (text == "Four"){
-		if (payTo == "Broker"){document.write('<INPUT name="PayTo" type="radio" value="Broker" onClick="clearPayeeInfo()" checked >');
-		}else{document.write('<INPUT name="PayTo" type="radio" value="Broker" onClick="clearPayeeInfo()" >');}
-	}
-	if (text == "Five"){
-		if (payTo == "Other"){document.write('<INPUT name="PayTo" type="radio" value="Other" onClick="clearPayeeInfo()" checked >');
-		}else{document.write('<INPUT name="PayTo" type="radio" value="Other" onClick="clearPayeeInfo()" >');}
-	}
-	if (text == "Six"){
-		if (checkRouting == "Payee"){document.write('<INPUT name="CheckRouting" type="radio" value="Payee" checked >');
-		}else{document.write('<INPUT name="CheckRouting" type="radio" value="Payee" >');}
-	}
-	if (text == "Seven"){
-		if (checkRouting == "Requester"){document.write('<INPUT name="CheckRouting" type="radio" value="Requester" checked >');
-		}else{document.write('<INPUT name="CheckRouting" type="radio" value="Requester">');}
-	}			
-	if (text == "Eight"){				
-		if (checkTiming == "Normal"){document.write('<INPUT name="CheckTiming" type="radio" value="Normal" checked >');					
-		}else{document.write('<INPUT name="CheckTiming" type="radio" value="Normal">');}
-	}
-	if (text == "Nine"){
-		if (checkTiming == "Rush"){document.write('<INPUT name="CheckTiming" type="radio" value="Rush" checked >');
-		}else{document.write('<INPUT name="CheckTiming" type="radio" value="Rush" >');}
-	}	
-}
-	
-function setFieldValue(fieldName, varName) {					
-	switch (payTo) {
-	case "Borrower":			
-		document.write('<INPUT name=\"' + fieldName + '\" type="text" size="60" value=\"' + varName + '\">');		
-		break;
-	case "Closing Agent":
-		//if (fieldName == "PayeeName") {varName = closingAgentName;}
-		//if (fieldName == "PayeeAddress") {varName = closingAgentAddress;}		
-		document.write('<INPUT name=\"' + fieldName + '\" type="text" size="60" value=\"' + varName + '\">');
-		break;
-	default:				
-		if (varName != "") {
-			document.write('<INPUT name=\"' + fieldName + '\" type="text" size="60" value=\"' + varName + '\">');
-		} else {
-			document.write('<INPUT name=\"' + fieldName + '\" type="text" size="60">');
-		}		
-	}			
-}
-	
-function cancelRequest()	{
-	// Called by: Disapprove - button.	
-	var xxx = validateElements(document);
-	if (!xxx)
-	{
-		return false;
-	} else {
-		var val = getFieldValue("CheckAmount");
-		getFloatRetVal = getFloat(val);
-		if (getFloatRetVal != "NaN") 
-		{document.forms[0].CheckAmount.value = getFloatRetVal;}
-		else
-		{
-			alert("Check Amount : " + val + " is not a number; please re-enter.");
-			return false;
-		}
-		SaveCommentsToHistoricComments(checkCharacters());
-		document.forms[0].CancelCheck.value = "True";		
-		// 01/15/2003 JDE - Added per Charles Lee request
-		// 01/30/2003 JDE - Commented out per Charles Lee request: document.forms[0].Resubmission.value = "False";		
-		document.forms[0].returnCode.value = 0;
-		// End 01/15/2003 update
-		// 01/30/2003 JDE - Added per Charles Lee request		
-		document.forms[0].ReturnForCorrection.value = "True";
-		// End 01/30/2003 update
-		document.forms[0].submit();
-	}
-}	
-	
-
-function setCheckNeeded(param1) {					
-	needCheck = param1;
-	//alert('needCheck: '+needCheck+'\n'+'param1: '+param1);		
-}
-
-function getFieldValue(fieldName) {
-	var obj = document.getElementById(fieldName);
-	//alert(obj.value);
-	return obj.value;
-}
-
-function displayComments()
-	{	
-		temp = "<TEXTAREA name='commentText' rows='3' cols='68' wrap='virtual'>";
-		temp = temp + '<%=Comments%>';
-		temp = temp + "</TEXTAREA>";
-		document.write(temp);
-		temp = "";
-	}
-
-	
-function displayBorrowerInfo() {		
-	document.forms[0].PayeeName.value = trim(borrowerFirstName) + " " + trim(borrowerLastName); // payeeName;
-	document.forms[0].PayeeAddress.value = payeeAddress;
-}
-
-
-function displayClosingAgentInfo() {
-	document.forms[0].PayeeName.value = closingAgentName;
-	document.forms[0].PayeeAddress.value = closingAgentAddress;	
-}
-
-function clearPayeeInfo() {
-	document.forms[0].PayeeName.value = "";
-	document.forms[0].PayeeAddress.value = "";	
-}
-
-function showElements()	{						
-	for (var i=0; i <= document.document.forms[0].elements.length-1;i++) {
-		alert(document.document.forms[0].elements[i].name + "  " + "element[" + i + "]: " + document.document.forms[0].elements[i].value);			
-	}	
-}
-	
-function displayHistoryOfChecks() {
-	hcString = " ";
-	if (hcDt1 != "") {hcString = hcDt1+tab+hcAmt1+tab+hcPayee1;}
-	if (hcDt2 != "") {hcString += br+hcDt2+tab+hcAmt2+tab+hcPayee2;}
-	if (hcDt3 != "") {hcString += br+hcDt3+tab+hcAmt3+tab+hcPayee3;}
-	if (hcDt4 != "") {hcString += br+hcDt4+tab+hcAmt4+tab+hcPayee4;}
-	if (hcDt5 != "") {hcString += br+hcDt5+tab+hcAmt5+tab+hcPayee5;}		
-	document.write(hcString);
-}
-
-function preserveValues() {
-	document.forms[0].PayeeName.value = getFieldValue("PayeeName");
-	document.forms[0].PayeeAddress.value = getFieldValue("PayeeAddress");
-	document.forms[0].CheckAmount.value = getFieldValue("CheckAmount");
-	getFloatRetVal = getFloat(getFieldValue("CheckAmount"));
-	if (getFloatRetVal != "NaN") {document.forms[0].CheckAmount.value = getFloatRetVal;}
-	document.forms[0].AccountSUSPNumber.value = getFieldValue("AccountSUSPNumber");
-	document.forms[0].ReasonCode.value = getFieldValue("ReasonCode");
-	storeComments(checkCharacters());
-	SaveHistoricComments();
-}
-
-
-function storeComments(com)
-	{
-		ChecksApprover.Comments.value = com;	
-	}
-	
-function SaveCommentsToHistoricComments(com)
-	{
-		
-		ChecksApprover.HistoryOfComments.value = com + '<%=" "+histOfCommFromIp%>';
-		
-	}
-	
-function SaveHistoricComments()
-	{
-		
-		ChecksApprover.HistoryOfComments.value = '<%=" "+histOfCommFromIp%>';
-		
-	}
-
-function displayHistoryOfComments() {	
-	if (historyOfComments.length>0) {
-		document.write('<TEXTAREA name="HistOfComm" rows="3" cols="68" READONLY>'+historyOfComments+'</TEXTAREA>');
-	} else {
-		document.write('<TEXTAREA name="HistOfComm" rows="3" cols="68" READONLY></TEXTAREA>');
-	}	
-}
-
-function approve() {
-	// Called by: Approve - button
-	var xxx = validateElements(document);
-	if (!xxx)
-	{
-		return false;
-	} else
-	{
-		
-			
-		//setCheckDetails();		
-		// 01/30/2003 JDE - Commented code per Charles Lee request
-		// document.forms[0].Resubmission.value = "True";
-		// End 01/30/2003 update
-		var val = getFieldValue("CheckAmount");
-		getFloatRetVal = getFloat(val);
-		if (getFloatRetVal != "NaN") 
-		{document.forms[0].CheckAmount.value = getFloatRetVal;}
-		else
-		{
-			alert("Check Amount : " + val + " is not a number; please re-enter.");
-			return false;
-		}
-		SaveCommentsToHistoricComments(checkCharacters());
-		document.forms[0].returnCode.value = 0;
-		document.forms[0].action = document.forms[0].ApproveURL.value;
-		document.forms[0].submit();
-	}
-}
-
-function checkCharacters() {	
-	var checkReturnCarriage = new RegExp("\r", "g");
-	var checkTab = new RegExp("\t", "g");
-	var checkNewLine = new RegExp("\n", "g");
-    
-	checkComments = ChecksApprover.commentText.value.replace(checkReturnCarriage, "  ");
-	checkComments = checkComments.replace(checkTab, " ");
-	checkComments = checkComments.replace(checkNewLine, " ");
-	return checkComments;
-}
-
-function trim(value) {
-   var temp = value;
-   var obj = /^(\s*)([\W\w]*)(\b\s*$)/;
-   if (obj.test(temp)) { temp = temp.replace(obj, '$2'); }
-   var obj = / +/g;
-   temp = temp.replace(obj, " ");
-   if (temp == " ") { temp = ""; }
-   return temp;
-}
-
-function formatCurrency(num) {            
-   num = num.toString().replace(/\$|\,/g,'');
-   if(isNaN(num))
-      num = "0";
-      sign = (num == (num = Math.abs(num)));
-      num = Math.floor(num*100+0.50000000001);
-      cents = num%100;
-      num = Math.floor(num/100).toString();
-   if(cents<10)
-      cents = "0" + cents;
-   for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
-      num = num.substring(0,num.length-(4*i+3))+','+ num.substring(num.length-(4*i+3));
-
-   //alert(((sign)?'':'-') + '$' + num + '.' + cents);
-   return (((sign)?'':'-') + '$' + num + '.' + cents);
-}
-
-function getFloat(val) {	
-	var retVal = null;		
-	var floatValue = val.toString().replace("$","");
-	floatValue = floatValue.toString().replace(",","");	
-	if (isNaN(parseFloat(floatValue))) {
-		retVal = "NaN";
-	} else {
-		retVal = floatValue;
-	}
-	return retVal;
-}
-
--->
-</SCRIPT>
-
-<LINK rel="stylesheet" href="../Styles/workflow_styles.css" type="text/css">
-<STYLE type="text/css">
-<!--
-FORM {}
-BODY {background-color: white}
-TABLE {}
-FONT {background-color: silver}
--->
-</STYLE>
-</head>
-<body>
-<form method="post" name="ChecksApprover" action="<%=CheckInWorkItem%>">
-<TABLE cellpadding="1" cellspacing="1">
-	<TBODY>
-		<TR>
-			<TD width="600"><B><FONT size="4">Checks Approver</FONT></B></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<TABLE cellpadding="1">
-	<TBODY>
-		<TR>
-			<TD height="46" width="600">
-			<TABLE border="1" cellpadding="1" bgcolor="#d8d8d8">
-				<TBODY>
-					<TR>
-						<TD width="558"><B><U>The following information is required to
-						request a check:<BR>
-						<BR>
-						</U></B>						
-						<TABLE cellpadding="1" cellspacing="1" width="492">
-							<TBODY>
-								<TR><TD>
-								<A href="../programs/OtherDocs.jsp?loannumber=<%=LoanNumber%>" target="_blank">
-								All Other docs</A></TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Loan Number</B></TD>
-									<TD width="329"><U style="font-style: normal; font-weight: bold; font-size: 10pt">
-
-									<%=LoanNumber%>-<%=CheckDigit%>							
-											
-									</U></TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Borrower's name</B></TD>
-									<TD width="329"><U style="font-style: normal; font-weight: bold; font-size: 10pt">
-									<%=Borrower%></U></TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Branch office code</B></TD>
-									<TD width="329"><U style="font-style: normal; font-weight: bold; font-size: 10pt">
-									<%=BranchOfficeCode%></U></TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Satellite office code</B></TD>
-									<TD width="329"><U style="font-style: normal; font-weight: bold; font-size: 10pt">
-									<%=SatelliteOfficeCode%></U></TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Rep code</B></TD>
-									<TD width="329"><U style="font-style: normal; font-weight: bold; font-size: 10pt">
-									<%=RepresentativeCode%></U></TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						
-
-						<BR>
-						<B>Pay to:<BR>
-						</B>
-						<TABLE cellpadding="1" cellspacing="1" width="499">
-							<TBODY>
-								<TR>
-									<TD width="23"></TD>
-									<TD width="473"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("One"); 
-										--> 
-										</SCRIPT> Borrower</TD>
-								</TR>
-								<TR>
-									<TD width="23"></TD>
-									<TD width="473"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Two"); 
-										--> 
-										</SCRIPT> MI Company</TD>
-								</TR>
-								<TR>
-									<TD width="23"></TD>
-									<TD width="473"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Three"); 
-										--> 
-										</SCRIPT> Closing Agent</TD>
-								</TR>
-								<TR>
-									<TD width="23"></TD>
-									<TD width="473"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Four"); 
-										--> 
-										</SCRIPT> Broker</TD>
-								</TR>
-								<TR>
-									<TD width="23"></TD>
-									<TD width="473"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Five"); 
-										--> 
-										</SCRIPT> Other</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						<TABLE cellpadding="1" cellspacing="1" width="498">
-							<TBODY>
-								<TR>
-									<TD width="160"><B>Payee Name</B></TD>
-									<TD width="335">
-										<SCRIPT language="JavaScript">
-											<!--
-											setFieldValue("PayeeName",payeeName);
-											-->
-										</SCRIPT>
-									</TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Payee Address</B></TD>
-									<TD width="335">
-										<SCRIPT language="JavaScript">
-											<!--
-											setFieldValue("PayeeAddress",payeeAddress);
-											-->
-										</SCRIPT>
-									</TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Check amount</B></TD>
-									<TD width="335">
-										<SCRIPT language="JavaScript">
-											<!--
-											setFieldValue("CheckAmount", displayCheckAmt);
-											-->
-										</SCRIPT>
-										<!--<INPUT name="CheckAmount" type="text" onBlur="getFieldValue('CheckAmount',document.forms[0].CheckAmount.value)">-->
-									</TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>Account/SUSP number</B></TD>
-									<TD width="335">
-										<SCRIPT language="JavaScript">
-											<!--
-											setFieldValue("AccountSUSPNumber", accountSUSPNumber);
-											-->
-										</SCRIPT>
-									</TD>
-								</TR>
-								<TR>
-									<TD width="160" valign="top"><B>Check request reason:</B></TD>
-									<TD width="335"><select name="ReasonCode">
-										
-                                                                        <%
-										Hashtable ht = getReasonCodeAndTexts();
-										for (Enumeration e = ht.keys() ; e.hasMoreElements() ;) 
-										{
-											String code = (String) e.nextElement();
-											String text = (String) ht.get(code);%>
-											<option value="<%=code%>"<%
-											if(code.equals(reasonCode))
-												out.write(" selected");
-											%>><%=text%></option><%		
-										}
-									%></select>
-									</TD>
-								</TR>
-								<TR>
-									<BR>
-									<TD width="160" valing="top"></TD>
-									<TD width="395"><B>* A copy of the check must be obtained for our records</B></TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						<BR>
-						<TABLE width="556" cellspacing="1" cellpadding="1" id="checkrouting">
-							<TBODY>
-								<TR>
-									<TD width="160"><B>Check Routing:</B></TD>
-									<TD width="191"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Six"); 
-										--> 
-										</SCRIPT> Mail original to payee</TD>
-									<TD width="201"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Seven"); 
-										-->
-										</SCRIPT> Return to requestor</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-
-						<TABLE width="557" cellspacing="1" cellpadding="1"
-							id="checkrouting">
-							<TBODY>
-								<TR>
-									<TD width="160"><B>Check Timing:</B></TD>
-									<TD width="191"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Eight"); 
-										-->
-										</SCRIPT> Normal</TD>
-									<TD width="202"><SCRIPT language="JavaScript">
-										<!-- 
-											showRadio("Nine"); 
-										-->
-										</SCRIPT> Rush</TD>
-								</TR>
-								<TR>
-									<TD width="160"><B>User ID of Requestor:</B></TD>
-									<TD width="191"><%=UserIDOrig%></TD>
-									<TD width="202">(for Approver)</TD>
-								</TR>
-								
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					
-				</TBODY>
-			</TABLE>
-			<BR>
-			<B><U>History Of Comments:</U></B>
-			<BR>			
-			<SCRIPT language="JavaScript">
-			<!--
-				displayHistoryOfComments();
-			-->
-			</SCRIPT>			
-			<BR>			
-			<BR>
-			<B><U>Comments:</U></B>
-			<BR>
-			<script language="Javascript">
-            <!--
-				displayComments();
-			-->
-			</script>
-			<BR>
-			<B><U>History of checks requested for this loan within workflow:</U></B>
-			<TABLE width="95%" border="1" cellpadding="0" cellspacing="0">
-				<TBODY>
-					<TR>
-						<TD width="427"><SCRIPT language="JavaScript">
-							<!-- 
-							displayHistoryOfChecks(); 
-							-->
-							</SCRIPT>
-						</TD>
-					</TR>
-				</TBODY>
-			</TABLE>			
-		<TR>
-			<TD width="600"><BR>
-			<INPUT type="button" name="checkinWorkitem" value="Approve" onclick="approve()">&nbsp; 
-			<INPUT type="button" name="cancelWorkItem" value="Disapprove" onclick="cancelRequest()">&nbsp; 
-			<INPUT type="button" name="PendforSelf" value="Pend For Self" onclick="pendForSelf()"> &nbsp; 
-                        <!--<INPUT type="button" name="cancelWorkItem" value="Cancel" onClick="javascript:{location='<%=CancelWorkItem%>';}">&nbsp; -->
-			<INPUT type="button" name="Help" value="Help" onclick="helpMsg()">			
-		</TR>
-	</TBODY>
-</TABLE>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-<INPUT type="hidden" name="returnCode">
-<INPUT type="hidden" name="CancelCheck"> 
-<INPUT type="hidden" name="Comments"> 
-<INPUT type="hidden" name="AccountSUSPNumber">
-<INPUT type="hidden" name="HistoryOfComments">
-<INPUT type="hidden" name="ReasonCode">
-<INPUT type="hidden" name="ReturnForCorrection">
-
-<INPUT type="hidden" name="ActivityName" value='<%=ActivityName%>'>
-<INPUT type="hidden" name="WFCheckNumber" value='<%=WFCheckNumber%>'>
-<INPUT type="hidden" name="LoanNumber" value='<%=LoanNumber%>'>
-<INPUT type="hidden" name="UserID" value='<%=UserID%>'>
-<INPUT type="hidden" name="BlockCheckNumber" value="<%=blockCheckNumber%>"> 
-
-
-
-<input type="hidden" name="ApproveURL" value="<%=context.getCommand("x-approveCheckRequest", workItem.persistentOid())%>">
-</form>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/DefaultSubPerson0ResultsForm.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/DefaultSubPerson0ResultsForm.jsp
deleted file mode 100644
index 1feec7bba..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/DefaultSubPerson0ResultsForm.jsp
+++ /dev/null
@@ -1,604 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page 
-import="DefaultSubPerson0ViewBean" 
-contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" 
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE></TITLE>
-
-<!--Styles-->
-<STYLE type="text/css">
-<!--
-H1 {
-	text-align: center !IMPORTANT;
-}
-
-TH {
-	text-align: left !IMPORTANT;
-	vertical-align: top !IMPORTANT;
-}
-
-TD {
-	text-align: left !IMPORTANT;
-	vertical-align: top !IMPORTANT;
-}
-
-TH.result {
-	background-color: #999999 !IMPORTANT;
-}
-
-TD.result {
-	background-color: #cccccc;
-	vertical-align: top !IMPORTANT;
-}
--->
-</STYLE>
-
-
-</HEAD>
-<BODY>
-
-<jsp:useBean id="defaultSubPerson0Bean" scope="request"
-	class="DefaultSubPerson0ViewBean" type="DefaultSubPerson0ViewBean" />
-<%
-// Instantiate the bean properties
-if (defaultSubPerson0Bean.getAddress() == null)
-	defaultSubPerson0Bean.setAddress(new webtools.bvt.Address());
-%>
-<jsp:setProperty name="defaultSubPerson0Bean" property="company"
-	value='<%=new java.lang.String(request.getParameter("company"))%>' />
-<jsp:setProperty name="defaultSubPerson0Bean" property="name"
-	value='<%=new java.lang.String(request.getParameter("name"))%>' />
-<% 
-// Initialize the bean properties from the request parameters
-defaultSubPerson0Bean.getAddress().setCity(new java.lang.String(request.getParameter("setCity_city")));
-defaultSubPerson0Bean.getAddress().setZip(Integer.valueOf(request.getParameter("setZip_zip")).intValue());
-defaultSubPerson0Bean.getAddress().setState(new java.lang.String(request.getParameter("setState_state")));
-defaultSubPerson0Bean.getAddress().setStreetNumber(Integer.valueOf(request.getParameter("setStreetNumber_streetNumber")).intValue());
-defaultSubPerson0Bean.getAddress().setStreet(new java.lang.String(request.getParameter("setStreet_street")));
-defaultSubPerson0Bean.getAddress();
-
-%>
-<jsp:setProperty name="defaultSubPerson0Bean" property="age"
-	value='<%=Integer.valueOf(request.getParameter("age")).intValue()%>' />
-
-<!--Banner-->
-<H1></H1>
-
-<BR>
-<BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TH>company</TH>
-			<TD><%=defaultSubPerson0Bean.getCompany()%></TD>
-		</TR>
-		<TR>
-			<TH>name</TH>
-			<TD><%=defaultSubPerson0Bean.getName()%></TD>
-		</TR>
-		<TR>
-			<TH>friends</TH>
-			<TD>
-			<TABLE>
-				<TBODY>
-					<TR>
-						<TH class="result">name</TH>
-						<TH class="result">friends</TH>
-						<TH class="result">address</TH>
-						<TH class="result">age</TH>
-						<TH class="result">class</TH>
-					</TR>
-					<%
-	if (defaultSubPerson0Bean.getFriends()!= null) {
-		for (int i0=0; i0<defaultSubPerson0Bean.getFriends().length; i0++) {
-%>
-					<TR>
-						<TD class="result">
-						<TABLE>
-							<TBODY>
-
-								<TR>
-									<TD><INPUT name='name' type='text'
-										value='<%=defaultSubPerson0Bean.getFriends()[i1].getName()%>'>
-									</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						</TD>
-						<TD class="result">
-						<TABLE>
-							<TBODY>
-
-								<TR>
-									<TH class="result">friends</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getFriends()[i1].getFriends()!= null) {
-		for (int i2=0; i2<defaultSubPerson0Bean.getFriends()[i1].getFriends().length; i2++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='friends' type='text'
-										value='<%=defaultSubPerson0Bean.getFriends()[i1].getFriends()[i2]== null ? "NULL" : defaultSubPerson0Bean.getFriends()[i1].getFriends()[i2].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-							</TBODY>
-						</TABLE>
-						</TD>
-						<TD class="result">
-						<TABLE>
-							<TBODY>
-
-								<TR>
-									<TD><INPUT name='address' type='text'
-										value='<%=defaultSubPerson0Bean.getFriends()[i1].getAddress()== null ? "NULL" : defaultSubPerson0Bean.getFriends()[i1].getAddress().toString()%>'>
-									</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						</TD>
-						<TD class="result">
-						<TABLE>
-							<TBODY>
-
-								<TR>
-									<TD><INPUT name='age' type='text'
-										value='<%=defaultSubPerson0Bean.getFriends()[i1].getAge()%>'>
-									</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						</TD>
-						<TD class="result">
-						<TABLE>
-							<TBODY>
-
-								<TR>
-									<TD><INPUT name='class' type='text'
-										value='<%=defaultSubPerson0Bean.getFriends()[i1].getClass()== null ? "NULL" : defaultSubPerson0Bean.getFriends()[i1].getClass().toString()%>'>
-									</TD>
-								</TR>
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<%
-		}
-	}
-%>
-					<!-- end of outer table -->
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<TR>
-			<TH>address</TH>
-			<TD>
-			<TABLE>
-				<TBODY>
-					<TR>
-						<TH>city</TH>
-						<TD><INPUT name='city' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getCity()%>'></TD>
-					</TR>
-					<TR>
-						<TH>zip</TH>
-						<TD><INPUT name='zip' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getZip()%>'></TD>
-					</TR>
-					<TR>
-						<TH>state</TH>
-						<TD><INPUT name='state' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getState()%>'></TD>
-					</TR>
-					<TR>
-						<TH>streetNumber</TH>
-						<TD><INPUT name='streetNumber' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getStreetNumber()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>street</TH>
-						<TD><INPUT name='street' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getStreet()%>'></TD>
-					</TR>
-					<TR>
-						<TH>class</TH>
-						<TD><INPUT name='class' type='text'
-							value='<%=defaultSubPerson0Bean.getAddress().getClass()== null ? "NULL" : defaultSubPerson0Bean.getAddress().getClass().toString()%>'>
-						</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<TR>
-			<TH>age</TH>
-			<TD><%=defaultSubPerson0Bean.getAge()%></TD>
-		</TR>
-		<TR>
-			<TH>class</TH>
-			<TD>
-			<TABLE>
-				<TBODY>
-					<TR>
-						<TH>package</TH>
-						<TD><INPUT name='package' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getPackage()== null ? "NULL" : defaultSubPerson0Bean.getClass().getPackage().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>name</TH>
-						<TD><INPUT name='name' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getName()%>'></TD>
-					</TR>
-					<TR>
-						<TH>declaredClasses</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">declaredClasses</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getDeclaredClasses()!= null) {
-		for (int i3=0; i3<defaultSubPerson0Bean.getClass().getDeclaredClasses().length; i3++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='declaredClasses' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getDeclaredClasses()[i3]== null ? "NULL" : defaultSubPerson0Bean.getClass().getDeclaredClasses()[i3].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>classes</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">classes</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getClasses()!= null) {
-		for (int i4=0; i4<defaultSubPerson0Bean.getClass().getClasses().length; i4++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='classes' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getClasses()[i4]== null ? "NULL" : defaultSubPerson0Bean.getClass().getClasses()[i4].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>methods</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">methods</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getMethods()!= null) {
-		for (int i5=0; i5<defaultSubPerson0Bean.getClass().getMethods().length; i5++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='methods' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getMethods()[i5]== null ? "NULL" : defaultSubPerson0Bean.getClass().getMethods()[i5].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>declaringClass</TH>
-						<TD><INPUT name='declaringClass' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getDeclaringClass()== null ? "NULL" : defaultSubPerson0Bean.getClass().getDeclaringClass().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>declaredFields</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">declaredFields</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getDeclaredFields()!= null) {
-		for (int i6=0; i6<defaultSubPerson0Bean.getClass().getDeclaredFields().length; i6++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='declaredFields' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getDeclaredFields()[i6]== null ? "NULL" : defaultSubPerson0Bean.getClass().getDeclaredFields()[i6].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>signers</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">signers</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getSigners()!= null) {
-		for (int i7=0; i7<defaultSubPerson0Bean.getClass().getSigners().length; i7++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='signers' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getSigners()[i7]== null ? "NULL" : defaultSubPerson0Bean.getClass().getSigners()[i7].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>interfaces</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">interfaces</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getInterfaces()!= null) {
-		for (int i8=0; i8<defaultSubPerson0Bean.getClass().getInterfaces().length; i8++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='interfaces' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getInterfaces()[i8]== null ? "NULL" : defaultSubPerson0Bean.getClass().getInterfaces()[i8].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>interface</TH>
-						<TD><INPUT name='interface' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().isInterface()%>'></TD>
-					</TR>
-					<TR>
-						<TH>constructors</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">constructors</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getConstructors()!= null) {
-		for (int i9=0; i9<defaultSubPerson0Bean.getClass().getConstructors().length; i9++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='constructors' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getConstructors()[i9]== null ? "NULL" : defaultSubPerson0Bean.getClass().getConstructors()[i9].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>superclass</TH>
-						<TD><INPUT name='superclass' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getSuperclass()== null ? "NULL" : defaultSubPerson0Bean.getClass().getSuperclass().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>componentType</TH>
-						<TD><INPUT name='componentType' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getComponentType()== null ? "NULL" : defaultSubPerson0Bean.getClass().getComponentType().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>array</TH>
-						<TD><INPUT name='array' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().isArray()%>'></TD>
-					</TR>
-					<TR>
-						<TH>protectionDomain</TH>
-						<TD><INPUT name='protectionDomain' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getProtectionDomain()== null ? "NULL" : defaultSubPerson0Bean.getClass().getProtectionDomain().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>fields</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">fields</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getFields()!= null) {
-		for (int i10=0; i10<defaultSubPerson0Bean.getClass().getFields().length; i10++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='fields' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getFields()[i10]== null ? "NULL" : defaultSubPerson0Bean.getClass().getFields()[i10].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>classLoader</TH>
-						<TD><INPUT name='classLoader' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getClassLoader()== null ? "NULL" : defaultSubPerson0Bean.getClass().getClassLoader().toString()%>'>
-						</TD>
-					</TR>
-					<TR>
-						<TH>primitive</TH>
-						<TD><INPUT name='primitive' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().isPrimitive()%>'></TD>
-					</TR>
-					<TR>
-						<TH>declaredConstructors</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">declaredConstructors</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getDeclaredConstructors()!= null) {
-		for (int i11=0; i11<defaultSubPerson0Bean.getClass().getDeclaredConstructors().length; i11++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='declaredConstructors'
-										type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getDeclaredConstructors()[i11]== null ? "NULL" : defaultSubPerson0Bean.getClass().getDeclaredConstructors()[i11].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>modifiers</TH>
-						<TD><INPUT name='modifiers' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getModifiers()%>'></TD>
-					</TR>
-					<TR>
-						<TH>declaredMethods</TH>
-						<TD>
-						<TABLE>
-							<TBODY>
-								<TR>
-									<TH class="result">declaredMethods</TH>
-								</TR>
-								<%
-	if (defaultSubPerson0Bean.getClass().getDeclaredMethods()!= null) {
-		for (int i12=0; i12<defaultSubPerson0Bean.getClass().getDeclaredMethods().length; i12++) {
-%>
-								<TR>
-									<TD class="result"><INPUT name='declaredMethods' type='text'
-										value='<%=defaultSubPerson0Bean.getClass().getDeclaredMethods()[i12]== null ? "NULL" : defaultSubPerson0Bean.getClass().getDeclaredMethods()[i12].toString()%>'>
-									</TD>
-								</TR>
-								<%
-		}
-	}
-%>
-								<!-- end of outer table -->
-							</TBODY>
-						</TABLE>
-						</TD>
-					</TR>
-					<TR>
-						<TH>class</TH>
-						<TD><INPUT name='class' type='text'
-							value='<%=defaultSubPerson0Bean.getClass().getClass()== null ? "NULL" : defaultSubPerson0Bean.getClass().getClass().toString()%>'>
-						</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<%
-defaultSubPerson0Bean.wait();
-%>
-		<%
-defaultSubPerson0Bean.wait(Long.valueOf(request.getParameter("wait_long_int__timeout")).longValue(), Integer.valueOf(request.getParameter("wait_long_int__nanos")).intValue());
-%>
-		<%
-defaultSubPerson0Bean.wait(Long.valueOf(request.getParameter("wait_long__timeout")).longValue());
-%>
-		<%
-defaultSubPerson0Bean.notifyAll();
-%>
-		<%
-defaultSubPerson0Bean.notify();
-%>
-		<%
-java.lang.String methodResult5120670 = defaultSubPerson0Bean.toString();
-%>
-		<TR>
-			<TH>toString</TH>
-			<TD><%=methodResult5120670%></TD>
-		</TR>
-		<%
-boolean methodResult29548899 = defaultSubPerson0Bean.equals(new java.lang.Object(request.getParameter("equals_java_lang_Object__obj")));
-%>
-		<TR>
-			<TH>equals</TH>
-			<TD><%=methodResult29548899%></TD>
-		</TR>
-		<%
-int methodResult11251596 = defaultSubPerson0Bean.hashCode();
-%>
-		<TR>
-			<TH>hashCode</TH>
-			<TD><%=methodResult11251596%></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/config.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/config.jsp
deleted file mode 100644
index ee6a0b7c4..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/parsing/testfiles/config.jsp
+++ /dev/null
@@ -1,440 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- Copyright (C) 2000-2003 by The Web Services-Interoperability Organization (WS-I) and Certain of its Members. All Rights Reserved.
-
- Copyright (C) 2000-2003 International Business Machines Corporation
-
- License Information
-
- Use of this  WS-I Material is governed by the WS-I Sample Application License at http://www.ws-i.org/licenses/sample_license.htm.  
- By downloading these files, you agree to the terms of this license.
--->
-<HTML>
-<HEAD>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ page language="java" contentType="text/html; charset=WINDOWS-1252" 
-    pageEncoding="WINDOWS-1252" %>
-<%@ page import="shopper.Role" %>
-<%@ page import="Configurator.org.ws_i.www.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="javax.servlet.jsp.JspException" %>
-<%@ page import="javax.xml.rpc.ServiceException" %>
-<%@ page import="java.net.ConnectException" %>
-
-<%@ page errorPage="error.jsp" %>
-
-<META http-equiv="Content-Type" content="text/html; charset=WINDOWS-1252">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>Configure WS-I Showcase</TITLE>
-<TABLE border="0">
-   <TBODY>
-     <TR>
-       <TD height="43" width="112">
-         <IMG width="109" height="79" src="clip_image001.gif"
-           v:shapes="_x0000_i1025">
-       </TD>
-       <TD height="43" width="638">
-         <H1 align="center"><FONT COLOR="6074B0">WS-I Sample Application Showcase</FONT></H1>
-       </TD>
-     </TR>
-   </TBODY>
-</TABLE>
-</HEAD>
-<BODY>
-<HR>
-<FONT size="5" color="#6074B0" face="Arial Black">Configuration</FONT>
-<P>
-<FONT face="Arial">Choose an implementation for each role.  Then Place New Order.</FONT>
-<P>
-<jsp:useBean id="client" class="shopper.Shopper" type="shopper.Shopper"
-   scope="session"></jsp:useBean>
-<jsp:setProperty name="client" property="custName" param="custName" />
-<jsp:setProperty name="client" property="custNumber" param="custNumber" />
-<jsp:setProperty name="client" property="custAddress" param="custAddress" />
-<%
-    /*
-     * generateNewDemoID will be set to true once the proper order
-     * has been placed in the orderstatus.jsp.
-     */
-    String aUUID = (new java.rmi.server.UID()).toString();	// ALWAYS GEN UUID WHEN RETURN TO THIS PAGE
-    client.setCustDemoID(aUUID);
-    if (client.generateNewDemoID) {
-        client.generateNewDemoID = false;
-    }
-
-    try {
-        ConfiguratorPortType port = null;
-        String selectedConfigurator = request.getParameter("selectedConfigurator");
-        if ( selectedConfigurator != null) {                
-            /*
-             * We are here as we are in WSDK Version.
-             * Need to check the previous Configurator selection. If it's been changed then
-             * we need to clear all the Endpoints
-             */ 
-            if (client.previousConfigurator.compareTo(selectedConfigurator) != 0) {
-                for (int i = Role.LoggingFacility; i < Role.totalRoles; i += Role.nextRole) {
-                    client.allEndPoints[i].clear();
-                    client.custSpecifiedEndPoints[i] = null;
-                }
-            }
-            client.previousConfigurator = selectedConfigurator;
-
-            if (selectedConfigurator.compareTo("useLocalConfigurator") == 0) {
-                port = client.config.getConfigurator(new java.net.URL("http://localhost:9080/Configurator/services/Configurator"));
-            } else if (selectedConfigurator.compareTo("useExternalConfigurator") == 0) {
-                  port = client.config.getConfigurator(new java.net.URL("http://wsi.alphaworks.ibm.com:80/Configurator/services/Configurator"));
-            } else if (selectedConfigurator.compareTo("useLocalEndPointsOnly") == 0) {
-                port = null;
-            } else {
-                /*
-                 * We should never reach here
-                 */
-                 Exception ex = new Exception("Unexpected selection for Configurator service");
-                 throw ex;
-            }
-        } else {
-            port = client.config.getConfigurator(new java.net.URL("http://wsi.alphaworks.ibm.com/Configurator/services/Configurator"));
-        }    
-
-        if (port != null) {
-            ConfigOptionsType ret = port.getConfigurationOptions(false);
-            ConfigOptionType[] configOption = ret.getConfigOption();
-            /*
-             * Fill up the Endpoints details, i.e EndPoint name and it's URL in
-             * the TreeMaps
-             */
-            for (int i = 0; i < configOption.length; i++) {
-                if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals( Configurator.org.ws_i.www.ConfigurationEndpointRole._LoggingFacility)) {
-                   client.allEndPoints[Role.LoggingFacility].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._Retailer)) {
-                   client.allEndPoints[Role.Retailer].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._WarehouseA)) {
-                   client.allEndPoints[Role.WarehouseA].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._WarehouseB)) {
-                   client.allEndPoints[Role.WarehouseB].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._WarehouseC)) {
-                   client.allEndPoints[Role.WarehouseC].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._ManufacturerA)) {
-                   client.allEndPoints[Role.ManufacturerA].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._ManufacturerB)) {
-                   client.allEndPoints[Role.ManufacturerB].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } else if (configOption[i].getConfigurationEndpoint().getRole().getValue().equals(Configurator.org.ws_i.www.ConfigurationEndpointRole._ManufacturerC)) {
-                   client.allEndPoints[Role.ManufacturerC].put(configOption[i].getName(), configOption[i].getConfigurationEndpoint().toString());
-                } 
-            }
-        } else {
-            client.allEndPoints[Role.LoggingFacility].put("Local LoggingFacility Implementation", "http://localhost:9080/LoggingFacility/services/LoggingFacility");
-            client.allEndPoints[Role.Retailer].put("Local Retailer Implementation", "http://localhost:9080/Retailer/services/Retailer");
-            client.allEndPoints[Role.WarehouseA].put("Local WarehouseA Implementation", "http://localhost:9080/Warehouse/services/Warehouse");
-            client.allEndPoints[Role.WarehouseB].put("Local WarehouseB Implementation", "http://localhost:9080/Warehouse/services/WarehouseB");
-            client.allEndPoints[Role.WarehouseC].put("Local WarehouseC Implementation", "http://localhost:9080/Warehouse/services/WarehouseC");
-            client.allEndPoints[Role.ManufacturerA].put("Local ManufacturerA Implementation", "http://localhost:9080/Manufacturer/services/Manufacturer");
-            client.allEndPoints[Role.ManufacturerB].put("Local ManufacturerB Implementation", "http://localhost:9080/Manufacturer/services/ManufacturerB");
-            client.allEndPoints[Role.ManufacturerC].put("Local ManufacturerC Implementation", "http://localhost:9080/Manufacturer/services/ManufacturerC");
-        }
-    } catch (Exception ex) {
-    	if ( ex instanceof ConfiguratorFailedFault ) {
-            %>
-                <FONT size="4" color="#6074B0" face="Arial Black">Problem invoking Configurator Service: <%= ((ConfiguratorFailedFault)ex).getConfigError() %>.</FONT>    
-            <%
-    	}
-        if ( ex instanceof ServiceException) {
-            %>
-                <FONT size="4" color="#6074B0" face="Arial Black">Problem invoking Configurator Service.</FONT>    
-            <%
-            throw ex;
-        } else { 
-            throw ex;
-        }
-    }
-        
-    
-%>
-
-<FORM action="order.jsp" method="post">
-<CENTER>
-<TABLE border="0" width="548" height="364">
-   <TBODY>
-      <TR align="left" bgcolor="#6074B0">
-         <TD><FONT color="#ffffff"><b>Role</b></FONT></TD>
-         <TD width="301"><FONT color="#ffffff"><b>Endpoint</b></FONT></TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Retailer</b></P></TD>
-         <TD width="301"><SELECT tabindex="1" name="Retailer"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.Retailer].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.Retailer].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.Retailer] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.Retailer] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.Retailer].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-			</SELECT>
-			</TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Warehouse A (America)</b></P></TD>
-         <TD width="301"><SELECT tabindex="2" name="WarehouseA"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.WarehouseA].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.WarehouseA].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-
-                       if (((client.custSpecifiedEndPoints[Role.WarehouseA] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.WarehouseA] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.WarehouseA].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Warehouse B (Europe)</b></P></TD>
-         <TD width="301"><SELECT tabindex="3" name="WarehouseB"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.WarehouseB].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.WarehouseB].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.WarehouseB] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.WarehouseB] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.WarehouseB].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Warehouse C (Asia Pacific)</b></P></TD>
-         <TD width="301"><SELECT tabindex="4" name="WarehouseC"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.WarehouseC].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.WarehouseC].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-           
-                       if (((client.custSpecifiedEndPoints[Role.WarehouseC] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.WarehouseC] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.WarehouseC].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Manufacturer (Brand A)</b></P></TD>
-         <TD width="301"><SELECT tabindex="5" name="ManufacturerA"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.ManufacturerA].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.ManufacturerA].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.ManufacturerA] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.ManufacturerA] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.ManufacturerA].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Manufacturer (Brand B)</b></P></TD>
-         <TD width="301"><SELECT tabindex="6" name="ManufacturerB"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.ManufacturerB].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.ManufacturerB].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.ManufacturerB] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.ManufacturerB] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.ManufacturerB].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Manufacturer (Brand C)</b></P></TD>
-         <TD width="301"><SELECT tabindex="7" name="ManufacturerC"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.ManufacturerC].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.ManufacturerC].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.ManufacturerC] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.ManufacturerC] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.ManufacturerC].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%              
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%       
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-      <TR align="left" bgcolor="#99CCFF">
-         <TD><P><b>Logging Facility</b></P></TD>
-         <TD width="301"><SELECT tabindex="8" name="LoggingFacility"
-            style="width: 300px">
-            <%
-               {
-                   Set s = client.allEndPoints[Role.LoggingFacility].keySet();
-                   Iterator keys = s.iterator();
-                   while (keys.hasNext()) {
-                       String serviceName = (String) keys.next();
-                       String serviceEndPoint = (String) client.allEndPoints[Role.LoggingFacility].get(serviceName);
-                       /*
-                        * Highlight the IBM endpoint , if it is the first time, else
-                        * highlight the previous selection
-                        */
-                       if (((client.custSpecifiedEndPoints[Role.LoggingFacility] == null) && (serviceName.toUpperCase().indexOf("IBM") != -1))
-                           ||((client.custSpecifiedEndPoints[Role.LoggingFacility] != null) && (serviceEndPoint.compareTo(client.custSpecifiedEndPoints[Role.LoggingFacility].toString()) == 0))) {
-            %>
-            <OPTION Selected><%= serviceName %></OPTION>
-            <%
-                       } else {
-            %>
-               <OPTION><%= serviceName %></OPTION>
-            <%
-                       }
-                   }
-               }
-            %>
-            </SELECT>
-         </TD>
-      </TR>
-   </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0">
-   <TBODY>
-      <TR>
-         <TD align="center"><INPUT type="image" src="NewOrderButton.jpg"></TD>
-      </TR>
-   </TBODY>
-</TABLE>
-<FONT face="Arial"> <IMG border="0" src="PlaceOrder.jpg" width="526"
-	height="160"> </FONT>
-<CENTER>
-</FORM>
-
-<TABLE border="0" width="100%">
-   <TBODY>
-      <TR>
-         <TD align="right">
-			<FONT face="Arial"> <IMG border="0" src="pbw.gif"> </FONT>
-         </TD>
-      </TR>
-   </TBODY>
-</TABLE>
-</BODY>
-
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
deleted file mode 100644
index 4f8f3b24f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ /dev/null
@@ -1,291 +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.jst.jsp.ui.tests.partitioning;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.text.DecimalFormat;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jst.jsp.core.internal.provisional.text.IJSPPartitionTypes;
-import org.eclipse.wst.css.core.internal.provisional.text.ICSSPartitionTypes;
-import org.eclipse.wst.html.core.internal.provisional.text.IHTMLPartitionTypes;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
-
-public class TestStructuredPartitionerJSP extends TestCase {
-
-	private boolean DEBUG_PRINT_RESULT = false;
-	protected ITypedRegion[] partitions = null;
-
-	private boolean useFormatter = true;
-	protected DecimalFormat formatter;
-
-	public TestStructuredPartitionerJSP(String name) {
-		super(name);
-		if (DEBUG_PRINT_RESULT && useFormatter)
-			formatter = new DecimalFormat();
-	}
-	
-	public void testJSP1() throws IOException, BadLocationException { // DW 05/01/2003 I modified this test, after creating test6, 
-		// and changing partioner to pick up end *> as part of page directive
-		// partition (for highlighting to work right).
-		int expectedPartitions = 8;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example01.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitionTypes.JSP_DIRECTIVE, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_DIRECTIVE, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT});
-	}
-
-	public void testJSP2() throws IOException, BadLocationException {
-		int expectedPartitions = 11;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example02.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.HTML_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT,});
-	}
-
-	public void testJSP3() throws IOException, BadLocationException {
-		int expectedPartitions = 5;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example03.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.SCRIPT, IHTMLPartitionTypes.HTML_DEFAULT, ICSSPartitionTypes.STYLE, IHTMLPartitionTypes.HTML_DEFAULT,});
-	}
-
-	public void testJSP4() throws IOException, BadLocationException {
-		int expectedPartitions = 8;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example04.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, "org.eclipse.wst.html.SCRIPT.language.MYLANGUAGE", IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT});
-	}
-
-	public void testJSP5() throws IOException, BadLocationException {
-		int expectedPartitions = 17;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example05.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.SCRIPT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT});
-	}
-
-	public void testJSP6() throws IOException, BadLocationException {
-		int expectedPartitions = 1;
-		int nPartitions = doComputePartitioningTest("testfiles/jsp/example06.jsp");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IJSPPartitionTypes.JSP_DIRECTIVE,});
-	}
-
-	public void testPerfJSP() throws IOException, BadLocationException {
-		//int expectedPartitions = 6;
-		int nPartitions = doTimedComputePartitioningTest("testfiles/jsp/company300k.jsp");
-		//assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		//checkSeams();
-		//verifyPartitionTypes(partitions, new String[]{IXMLPartitions.ST_XML_PI, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_DECLARATION, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_COMMENT, IXMLPartitions.ST_DEFAULT_XML});
-	}
-
-	public void testEmpty() throws IOException, BadLocationException {
-		int expectedPartitions = 1;
-		int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
-	}
-
-	/**
-	 * Ensure that the current list of partitions are all adjacent to one another
-	 */
-	protected void checkSeams() {
-		if (partitions == null)
-			return;
-		int offset = 0;
-		for (int i = 0; i < partitions.length; i++) {
-			assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
-			offset = partitions[i].getOffset() + partitions[i].getLength();
-		}
-	}
-
-	/**
-	 * Compute the partitions for the given filename using the default partitioner
-	 * for that file type.
-	 * 
-	 * @param filename
-	 * @return int
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		if (inStream == null)
-			inStream = new StringBufferInputStream("");
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (DEBUG_PRINT_RESULT && useFormatter) {
-			double baseTen = Math.log(10);
-			formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
-			formatter.setGroupingUsed(false);
-		}
-
-		partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			for (int i = 0; i < partitions.length; i++) {
-				try {
-					contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
-				}
-				catch (BadLocationException e) {
-					contents = "*error*";
-				}
-				if (useFormatter)
-					System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
-				else
-					System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
-			}
-		}
-		checkSeams();
-		model.releaseFromEdit();
-		inStream.close();
-
-		if (partitions == null)
-			return -1;
-		return partitions.length;
-	}
-
-	/**
-	 * Compute the partitions for the given filename using the default partitioner
-	 * for that file type.
-	 * 
-	 * @param filename
-	 * @return int
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-	
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		if (inStream == null)
-			inStream = new StringBufferInputStream("");
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-	
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (DEBUG_PRINT_RESULT && useFormatter) {
-			double baseTen = Math.log(10);
-			formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
-			formatter.setGroupingUsed(false);
-		}
-		long startTime = System.currentTimeMillis();
-		partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
-		long endTime = System.currentTimeMillis();
-		if (DEBUG_PRINT_RESULT) {
-			
-			String contents = null;
-	
-			System.out.println("\nfilename: " + filename);
-			System.out.println("Time to compute " + partitions.length + ": " + (endTime-startTime) + " (msecs)");
-			for (int i = 0; i < partitions.length; i++) {
-				try {
-					contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
-				}
-				catch (BadLocationException e) {
-					contents = "*error*";
-				}
-				if (useFormatter)
-					System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
-				else
-					System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
-			}
-		}
-		checkSeams();
-		model.releaseFromEdit();
-		inStream.close();
-	
-		if (partitions == null)
-			return -1;
-		return partitions.length;
-	}
-
-	/**
-	 * Retrieves the single partition at the given offset for the given file, using the
-	 * default partitioner for that file type.  This test allows for verifying the zero-length
-	 * partitioning behavior.
-	 * 
-	 * @param filename
-	 * @param offset
-	 * @return ITypedRegion
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-		partitions = null;
-		ITypedRegion partition = structuredDocument.getPartition(offset);
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			try {
-				contents = structuredDocument.get(partition.getOffset(), partition.getLength());
-			}
-			catch (BadLocationException e) {
-				contents = "*error*";
-			}
-			System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
-		}
-		model.releaseFromEdit();
-		inStream.close();
-
-		return partition;
-	}
-
-	/**
-	 * Verifies that the given partitions are of the given partition types
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
-		for (int i = 0; i < expectedTypes.length; i++)
-			assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
-	}
-
-	/**
-	 * Verifies that the given partitions begin at the given offsets
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
-		for (int i = 0; i < offsets.length; i++) {
-			assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
-			if (i > 0) {
-				assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
deleted file mode 100644
index cadf5e7fe..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
+++ /dev/null
@@ -1,8099 +0,0 @@
-<?xml version="1.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>
-		<title>The Ultimate A Company</title>
-	</head>
-	<body>
-		<p>
-			<img src="../banner.gif" height="51" width="659" alt="" />
-		</p>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<table width="84%">
-			<tbody>
-				<tr>
-					<td rowspan="2">
-						<h2>
-							<img src="../leftpanel.jpg" height="498" width="124" alt="" />
-						</h2>
-					</td>
-					<td colspan="2">
-						<h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
-						<h4>
-							Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
-							<b>A</b>
-							'rt.&nbsp;
-						</h4>
-						<h3>Don't settle for ordinary. You deserve only the best.</h3>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Products
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							What's New
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Order Online
-						</h3>
-						<h3>
-							<img src="../bullet.gif" height="30" width="38" alt="" />
-							Support
-						</h3>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">
-						For problems and suggestions related to this web site, write to Webmaster:
-						<a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<p>
-			<img src="../footer.gif" height="25" width="659" alt="" />
-		</p>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
deleted file mode 100644
index cc7c54d9e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example01.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html" %>
-<jsp:directive.page contentType=text/html" />
-<HTML id="<% java code "string" section %>">
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
deleted file mode 100644
index a6d0ec915..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example02.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-       <p>
-       <% testing "123" test test;
-       // test
-       one two three
-       %>
-       <!-- 78 -->
-       <table id = "<% test %>" attrib=junk>
-       </BODY>
-       </HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
deleted file mode 100644
index 8ffd3101b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example03.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<SCRIPT>
-java script section
-</SCRIPT>
-<STYLE>
-   style section
-   </STYLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
deleted file mode 100644
index 6808704a3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example04.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<script language="MyLanguage"><%= "A" %>      
- </SCRIPT>
-<%-- --%>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
deleted file mode 100644
index a6151d3a9..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example05.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<formatting>
-<script type="text/javascript">
-//	Copyright 2000,2001 by www.example.com
-  document.URL ="a";
-</script>
-
-<% String a = "a"; %>
-<%-- test comment --%>
-<%= 
-
-"   aaaaa "
-
-%>
-<%! %>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
deleted file mode 100644
index 85173f4d2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/example06.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@page language="javascript" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.java
deleted file mode 100644
index c4e35a5b6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/registry/AdapterFactoryRegistryTest.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.jst.jsp.ui.tests.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * @author pavery
- */
-public class AdapterFactoryRegistryTest extends TestCase {
-
-	private final String CLASSNAME_HTML_FACTORY = "org.eclipse.wst.html.ui.internal.registry.AdapterFactoryProviderForHTML";
-	private final String CLASSNAME_DTD_FACTORY = "org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD";
-	private final String CLASSNAME_JSP_FACTORY = "org.eclipse.jst.jsp.ui.internal.registry.AdapterFactoryProviderForJSP";
-	private final String CLASSNAME_CSS_FACTORY = "org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS";
-	private final String CLASSNAME_XML_FACTORY = "org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML";
-
-
-	public void testCreate() {
-		AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
-		assertNotNull(instance);
-	}
-
-	public void testGetAllFactories() {
-		AdapterFactoryRegistry instance = AdapterFactoryRegistryImpl.getInstance();
-		Iterator it = instance.getAdapterFactories();
-		Object provider = null;
-
-		// all providers expected classnames added here
-		List known = new ArrayList();
-		known.add(CLASSNAME_HTML_FACTORY);
-		known.add(CLASSNAME_DTD_FACTORY);
-		known.add(CLASSNAME_JSP_FACTORY);
-		known.add(CLASSNAME_CSS_FACTORY);
-		known.add(CLASSNAME_XML_FACTORY);
-
-		while (it.hasNext()) {
-			provider = it.next();
-			known.remove(provider.getClass().getName());
-			// System.out.println(provider.getClass().getName());
-		}
-
-		// should have encountered all expected adater factories.
-		assertTrue(known.isEmpty());
-	}
-
-	public void testGetFactoriesXML() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_XML_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForXML.ContentTypeID_XML, CLASSNAME_HTML_FACTORY);
-	}
-
-	public void testGetFactoriesHTML() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_JSP_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForJSP.ContentTypeID_JSP, CLASSNAME_XML_FACTORY);
-	}
-
-	public void testGetFactoriesJSP() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_HTML_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForHTML.ContentTypeID_HTML, CLASSNAME_DTD_FACTORY);
-	}
-
-	public void testGetFactoriesDTD() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_DTD_FACTORY);
-
-		getFactoriesForContentType(known, "org.eclipse.wst.dtd.core.dtdsource", CLASSNAME_HTML_FACTORY);
-	}
-
-	public void testGetFactoriesCSS() {
-
-		List known = new ArrayList();
-		known.add(CLASSNAME_CSS_FACTORY);
-
-		getFactoriesForContentType(known, ContentTypeIdForCSS.ContentTypeID_CSS, CLASSNAME_JSP_FACTORY);
-	}
-
-	/**
-	 * Compare to a expected list of AdapterFactoryProviders (may be smaller
-	 * than the actual list) for a given contentTypeId. At minimum these
-	 * expected providers must be found to pass.
-	 * 
-	 * @param expected
-	 * @param contentTypeId
-	 */
-	private void getFactoriesForContentType(List expected, String contentTypeId, String notExpectedClassname) {
-
-		AdapterFactoryRegistryImpl instance = (AdapterFactoryRegistryImpl) AdapterFactoryRegistryImpl.getInstance();
-		Iterator it = instance.getAdapterFactories(contentTypeId);
-		Object provider = null;
-		while (it.hasNext()) {
-			provider = it.next();
-			expected.remove(provider.getClass().getName());
-
-			// System.out.println("encountered provider: " +
-			// provider.getClass().getName());
-			assertTrue("!provider: " + notExpectedClassname + " shouldn't be in the list!", !notExpectedClassname.equals(provider.getClass().getName()));
-		}
-		// we should have at least found the expected factory (or factories)
-		assertTrue("extra providers: " + expected, expected.isEmpty());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
deleted file mode 100644
index 00d92ae97..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
+++ /dev/null
@@ -1,252 +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.jst.jsp.ui.tests.search;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-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.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchDocument;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchScope;
-import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport;
-import org.eclipse.jst.jsp.ui.internal.java.search.BasicJSPSearchRequestor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-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.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * Tests for JSPSearchSupport
- * @author pavery
- */
-public class JSPSearchTests extends TestCase implements IJavaSearchConstants {
-
-	/**
-	 * to accept search matches
-	 * addCheckMatch(...) for matches you expect, run search support, checkValid() to see if all expected got hit
-	 */
-	class TestJspSearchRequestor extends BasicJSPSearchRequestor {
-
-		private List matches = null;
-
-		public TestJspSearchRequestor() {
-			this.matches = new ArrayList();
-		}
-
-		// called by search framework
-		protected void addSearchMatch(IStructuredDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-			this.matches.remove(new TestSearchMatch(jspFile.getName(), jspStart, jspEnd));
-		}
-
-		public void beginReporting() {
-			// do nothing since we have no UI, don't access ISearchResultView
-		}
-
-		public void endReporting() {
-			// do nothing since we have no UI, don't access ISearchResultView
-		}
-
-		public void addCheckMatch(String filename, int jspStart, int jspEnd) {
-			this.matches.add(new TestSearchMatch(filename, jspStart, jspEnd));
-		}
-
-		public boolean checkValid() {
-			return this.matches.isEmpty();
-		}
-
-		public void clear() {
-			this.matches.clear();
-		}
-	}
-
-	/**
-	 * to validate search matches (checkMatch matches a search hit)
-	 */
-	class TestSearchMatch {
-
-		public String filename = null;
-		public int jspStart = -1;
-		public int jspEnd = -1;
-
-		public TestSearchMatch(String filename, int jspStart, int jspEnd) {
-			this.filename = filename;
-			this.jspStart = jspStart;
-			this.jspEnd = jspEnd;
-		}
-
-		public boolean equals(Object obj) {
-			if (!(obj instanceof TestSearchMatch))
-				return false;
-
-			TestSearchMatch possible = (TestSearchMatch) obj;
-			return this.filename.equalsIgnoreCase(possible.filename) && this.jspStart == possible.jspStart && this.jspEnd == possible.jspEnd;
-		}
-	}
-
-	private ProjectUnzipUtility projUtil = null;
-	private JSPSearchSupport searchSupport = null;
-	private boolean isSetup = false;
-
-	public JSPSearchTests() {
-		super("JSP Search Tests");
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.isSetup) {
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-
-	private void doSetup() throws Exception {
-
-		this.projUtil = new ProjectUnzipUtility();
-
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "jspsearch_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		this.projUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
-		this.projUtil.initJavaProject("judo");
-
-		//JSPSearchSupport.getInstance().indexWorkspaceAndWait();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		// do nothing
-	}
-
-	public void testIndexWorkspace() {
-		JSPSearchSupport support = JSPSearchSupport.getInstance();
-		SearchDocument doc = JSPSearchSupport.getInstance().getSearchDocument("/judo/searchTestJSP.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP.java'", doc);
-
-		doc = support.getSearchDocument("/judo/searchTestJSP2.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP2.java'", doc);
-
-		doc = support.getSearchDocument("/judo/searchTestJSP3.java");
-		assertNotNull("couldn't retrieve:'/judo/searchTestJSP3.java'", doc);
-	}
-
-	public void testSearchField() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
-		JSPSearchSupport.getInstance().search("searchForThis", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: searchForThis", requestor.checkValid());
-	}
-
-	public void testSearchMethod() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 143, 158);
-		requestor.addCheckMatch("searchTestJSP.jsp", 298, 315);
-		JSPSearchSupport.getInstance().search("searchForMethod", new JSPSearchScope(), METHOD, ALL_OCCURRENCES, SearchPattern.R_EXACT_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: searchForMethod", requestor.checkValid());
-	}
-
-	public void testSearchPatternMatch() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP.jsp", 93, 106);
-		requestor.addCheckMatch("searchTestJSP2.jsp", 116, 129);
-		requestor.addCheckMatch("searchTestJSP2.jsp", 152, 165);
-		JSPSearchSupport.getInstance().search("search*", new JSPSearchScope(), FIELD, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: search*", requestor.checkValid());
-	}
-
-	public void testSearchProjectClasses() {
-
-		TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-		requestor.addCheckMatch("searchTestJSP3.jsp", 148, 157);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 170, 179);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 263, 273);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 299, 309);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 408, 417);
-		requestor.addCheckMatch("searchTestJSP3.jsp", 430, 439);
-		JSPSearchSupport.getInstance().search("Jellybean*", new JSPSearchScope(), TYPE, ALL_OCCURRENCES, SearchPattern.R_PATTERN_MATCH, true, requestor);
-		assertTrue("did not find all expected matches: search*", requestor.checkValid());
-	}
-
-	public void testSearchLocalVariable() {
-
-		IDOMModel xmlModel = null;
-		try {
-			IPath jspTestFilePath = new Path("judo/SEARCH/searchTestJSP3.jsp");
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
-			xmlModel = (IDOMModel) getStructuredModelForRead(file);
-			setupAdapterFactory(xmlModel);
-
-			IDOMDocument doc = xmlModel.getDocument();
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) doc.getAdapterFor(IJSPTranslation.class);
-			JSPTranslation translation = adapter.getJSPTranslation();
-			IJavaElement element = translation.getElementsFromJspRange(377, 384)[0];
-
-			TestJspSearchRequestor requestor = new TestJspSearchRequestor();
-			requestor.addCheckMatch("searchTestJSP3.jsp", 377, 384);
-			JSPSearchSupport.getInstance().search(element, new JSPSearchScope(), requestor);
-			assertTrue("did not find all expected matches: search*", requestor.checkValid());
-		}
-		finally {
-			if (xmlModel != null)
-				xmlModel.releaseFromRead();
-		}
-	}
-
-	private IStructuredModel getStructuredModelForRead(IFile file) {
-
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			return modelManager.getModelForRead(file);
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file:" + file);
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * add the factory for JSPTranslationAdapter here
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-
-		JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-		sm.getFactoryRegistry().addFactory(factory);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
deleted file mode 100644
index 8e270ff76..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/CommonXML.java
+++ /dev/null
@@ -1,86 +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.jst.jsp.ui.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.w3c.dom.Document;
-
-/**
- */
-public class CommonXML {
-
-	public synchronized static DocumentBuilder getDocumentBuilder() {
-		DocumentBuilder result = null;
-		try {
-			result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
-		DocumentBuilder result = null;
-		try {
-			DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
-			instance.setValidating(validating);
-			result = instance.newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public static void serialize(Document document, OutputStream ostream) throws IOException {
-		Source domSource = new DOMSource(document);
-		try {
-			Transformer serializer = TransformerFactory.newInstance().newTransformer();
-			try {
-				serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-				serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-				serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
-			}
-			catch (IllegalArgumentException e) {
-				// unsupported properties
-			}
-			serializer.transform(domSource, new StreamResult(ostream));
-		}
-		catch (TransformerConfigurationException e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerFactoryConfigurationError e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
deleted file mode 100644
index ebdb18d40..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.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.jst.jsp.ui.tests.util;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
-	/**
-	 * Constructor for AllTests.
-	 * @param name
-	 */
-	private static String now = null;
-
-
-	public static String now() {
-		// just calculate once, so whole run as same timestamp
-		if (DateUtil.now == null) {
-			DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-			Calendar calendar = Calendar.getInstance();
-			Date today = calendar.getTime();
-			DateUtil.now = format.format(today);
-		}
-		return DateUtil.now;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
deleted file mode 100644
index ddff073d2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
+++ /dev/null
@@ -1,165 +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.jst.jsp.ui.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
-	public static String fLineSeparator = System.getProperty("line.separator");
-	public static String fPathSeparator = System.getProperty("path.separator");
-	public static String fFileSeparator = System.getProperty("file.separator");
-	public static String JSP_EDITOR_TESTS_PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests";
-
-	static File previousResultsDirectory = null;
-	static private String logSubDirectoryPath;
-
-	private static boolean notTriedYet = true;
-
-	public static class DirFilenameFilter implements FilenameFilter {
-		String startOfAcceptableNames;
-
-		public DirFilenameFilter(String startOfDirName) {
-			startOfAcceptableNames = startOfDirName;
-		}
-
-		/**
-		 * @see java.io.FileFilter#accept(File)
-		 */
-		public boolean accept(File pathname, String filename) {
-			// we'll just assume if it starts with right key, it is a directory ... for now
-			return filename.startsWith(startOfAcceptableNames);
-		}
-
-	}
-
-	public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
-		if (previousResultsDirectory == null && notTriedYet) {
-			Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
-			URL url = bundle.getEntry("/");
-			//String installPath = url.getPath();
-			// add known file so URL method below can be used
-			// (doesn't seem to work for directory?)
-			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = Platform.asLocalURL(totalURL);
-			String finalFile = finalurl.getFile();
-			File file = new File(finalFile);
-			String finalPath = file.getParent();
-			File pluginHomeDir = new File(finalPath);
-			FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
-			File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
-			// assume first in list is newest, then start looking with the 
-			// second item ... just to avoid "null" case checking
-			if (allDirs.length > 0) {
-				File currentNewest = allDirs[0];
-				for (int i = 1; i < allDirs.length; i++) {
-					File current = allDirs[i];
-					// NOTE: we go by modified date, not by the actual time stamp in name.
-					// This should work for all normal cases, but may not if someone does some
-					// "funny" copying, or updating from repository.
-					if (current.lastModified() > currentNewest.lastModified()) {
-						currentNewest = current;
-					}
-				}
-				previousResultsDirectory = currentNewest;
-			}
-			notTriedYet = false;
-		}
-		return previousResultsDirectory;
-	}
-
-	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
-		Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
-		URL url = bundle.getEntry("/");
-		URL localURL = Platform.asLocalURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename;
-		URL totalURL = new URL(url, totalPath);
-		//URL finalurl = Platform.asLocalURL(totalURL);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		String finalPath = file.getParent();
-		File dir = new File(finalPath);
-		if (!dir.exists()) {
-			// a little safety net, be sure the previous newest directory
-			// is initialized, just in case no one else has done so
-			if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
-				FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
-			}
-			// now its "safe" to make the new one
-			dir.mkdirs();
-		}
-		return file;
-	}
-
-	/**
-	 * Just a general utility method
-	 * @param filename
-	 * @return String
-	 */
-	public static String getExtension(String filename) {
-		String extension = null;
-		int dotPostion = filename.lastIndexOf('.');
-		if (dotPostion > -1) {
-			extension = filename.substring(dotPostion + 1);
-		}
-		else {
-			extension = new String();
-		}
-		return extension;
-	}
-
-	/**
-	 * General purpose utility method to ensure the log
-	 * directory exists, and returns the name. 
-	 */
-	public static String getLogDirectory() {
-		if (logSubDirectoryPath == null) {
-			String mainDirectory = "/logs";
-			File dir = new File(mainDirectory);
-			ensureExists(dir);
-			String subDirectory = TimestampUtil.timestamp();
-			logSubDirectoryPath = mainDirectory + "/" + subDirectory;
-			File subdir = new File(logSubDirectoryPath);
-			ensureExists(subdir);
-		}
-		return logSubDirectoryPath;
-	}
-
-	public static void ensureExists(File dir) {
-		if (!dir.exists()) {
-			dir.mkdirs();
-		}
-	}
-
-	public static String getPerformanceOutputLogName() {
-		String result = null;
-		String directoryName = FileUtil.getLogDirectory();
-		String extension = ".out";
-		String baseName = "sedTests";
-		long now = System.currentTimeMillis();
-		String nowStr = String.valueOf(now);
-		result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
-		return result;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 5a4b81b7f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,391 +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.jst.jsp.ui.tests.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.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.jdt.core.JavaCore;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- * 
- * @author pavery
- */
-public class ProjectUnzipUtility {
-	class WorkspaceProgressMonitor implements IProgressMonitor {
-		private boolean finished = false;
-
-		public void beginTask(String name, int totalWork) {
-			// noop
-		}
-
-		public void done() {
-			finished = true;
-		}
-
-		public boolean isFinished() {
-			return finished;
-		}
-
-		public void internalWorked(double work) {
-			// noop
-		}
-
-		public boolean isCanceled() {
-			return finished;
-		}
-
-		public void setCanceled(boolean value) {
-			if (value == true)
-				finished = true;
-		}
-
-		public void setTaskName(String name) {
-			// noop
-		}
-
-		public void subTask(String name) {
-			// noop
-		}
-
-		public void worked(int work) {
-			// noop
-		}
-	}
-
-	class MyOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String pathString) {
-			return ALL;
-		}
-	}
-
-	public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
-	private List fCreatedProjects = null;
-
-	public ProjectUnzipUtility() {
-		// for deletion later
-		fCreatedProjects = new ArrayList();
-	}
-
-	/**
-	 * @param fileToImport
-	 *            the file you wish to import
-	 * @param folderPath
-	 *            the container path within the workspace
-	 */
-	public void importFile(File fileToImport, String folderPath) {
-		WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
-		try {
-			if (fileToImport.exists()) {
-				IPath containerPath = new Path(folderPath);
-				IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
-				IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
-				File[] filesToImport = {fileToImport};
-				ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
-				importOp.setCreateContainerStructure(false);
-				importOp.setOverwriteResources(true);
-				importOp.run(importProgress);
-			}
-			else {
-				System.out.println("handle source doesn't exist");
-			}
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-		}
-		finally {
-			importProgress.done();
-		}
-	}
-
-	/**
-	 * the following is logic from
-	 * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
-	 */
-	// specify buffer size for extraction
-	static final int BUFFER = 2048;
-
-	public void unzipAndImport(File inFile, String destinationDirectory) {
-		try {
-			// Specify file to decompress
-			// (nsd) redundant?
-			// String inFileName = inFile.getAbsolutePath();
-			// //"c:/example.zip";
-			// File sourceZipFile = new File(inFileName);
-			File sourceZipFile = inFile;
-
-			// Specify destination where file will be unzipped
-			// String destinationDirectory =
-			// "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
-			File unzipDestinationDirectory = new File(destinationDirectory);
-			// Open Zip file for reading
-			ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
-			IProject currentProject = null;
-			try {
-				// Create an enumeration of the entries in the zip file
-				Enumeration zipFileEntries = zipFile.entries();
-				String projectFolderName = null;
-
-				// Process each entry
-				while (zipFileEntries.hasMoreElements()) {
-					// grab a zip file entry
-					ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
-					String currentEntry = entry.getName();
-					// System.out.println("Extracting: " + entry);
-					File destFile = new File(unzipDestinationDirectory, currentEntry);
-					// grab file's parent directory structure
-					File destinationParent = destFile.getParentFile();
-					// create the parent directory structure if needed
-					destinationParent.mkdirs();
-					// extract file if not a directory
-					if (!entry.isDirectory()) {
-						BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
-						int currentByte;
-						// establish buffer for writing file
-						byte data[] = new byte[BUFFER];
-						// write the current file to disk
-						FileOutputStream fos = new FileOutputStream(destFile);
-						BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
-						try {
-							// read and write until last byte is encountered
-							while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
-								dest.write(data, 0, currentByte);
-							}
-						}
-						finally {
-							dest.flush();
-							dest.close();
-							is.close();
-							fos.close();
-						}
-						if (projectFolderName != null)
-							importFile(destFile, projectFolderName);
-					}
-					else {
-						// need handle to the main project folder to create
-						// containerPath
-						if (projectFolderName == null) {
-							projectFolderName = destFile.getName();
-							fCreatedProjects.add(projectFolderName);
-
-							currentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
-						}
-					}
-				}
-			}
-			finally {
-				zipFile.close();
-			}
-
-			// fixes workspace metadata for the project
-			// for clean startup next run
-			if (currentProject != null) {
-				try {
-					Path projectLocation = new Path(Platform.getLocation().toOSString());
-					createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
-				}
-				catch (CoreException cex) {
-					cex.printStackTrace();
-				}
-			}
-		}
-		catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void refreshWorkspace() throws CoreException {
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IProject[] projects = wsRoot.getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
-	}
-
-	/**
-	 * Delete projects created (unzipped and imported) by this utility
-	 * 
-	 * @throws Exception
-	 */
-	public void deleteProjects() throws Exception {
-		final IProject[] projects = getCreatedProjects();
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				for (int i = 0; i < projects.length; i++) {
-					projects[i].clearHistory(null);
-					projects[i].close(null);
-					projects[i].delete(true, true, null);
-				}
-				refreshWorkspace();
-			}
-		};
-		WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(progress);
-		// saves the new workspace metadata
-		ResourcesPlugin.getWorkspace().save(true, null);
-	}
-
-	public void deleteProject(String projectName) throws Exception {
-		final String name = projectName;
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		final IProject proj = wsRoot.getProject(name);
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				// IWorkspaceRoot wsRoot =
-				// ResourcesPlugin.getWorkspace().getRoot();
-				// IProject proj = wsRoot.getProject(name);
-				if (proj != null && proj.exists()) {
-					proj.clearHistory(null);
-					// proj.close(null);
-					proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-					try {
-						proj.delete(true, true, null);
-					}
-					catch (Exception e) {
-						// just try again (not sure why they are not being
-						// deleted)
-						proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-						proj.delete(true, true, null);
-					}
-					// proj = null;
-				}
-				refreshWorkspace();
-			}
-		};
-		WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(progress);
-		// saves the new workspace metadata
-		ResourcesPlugin.getWorkspace().save(true, null);
-	}
-
-	/**
-	 * @return IProjects that were unzipped and imported into the workspace by
-	 *         this utility
-	 */
-	public IProject[] getCreatedProjects() {
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
-		IProject[] projects = new IProject[projectNames.length];
-		for (int i = 0; i < projectNames.length; i++) {
-			projects[i] = wsRoot.getProject(projectNames[i]);
-		}
-		return projects;
-	}
-
-	public void initJavaProject(String projName) throws CoreException {
-		Platform.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), new NullProgressMonitor());
-		// resynch
-		refreshWorkspace();
-		// change prereqs to get this functionality back in
-		IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-		boolean setNatures = false;
-		if (!proj.exists()) {
-			setNatures = true;
-			proj.create(new NullProgressMonitor());
-		}
-		if (!proj.isOpen()) {
-			proj.open(null);
-		}
-		// need to add java nature, or else project won't "exist()" in the
-		// java
-		// element sense
-		IProjectDescription desc = proj.getDescription();
-		List natures = new ArrayList(Arrays.asList(desc.getNatureIds()));
-		if (!natures.contains(JavaCore.NATURE_ID))
-			natures.add(JavaCore.NATURE_ID);
-		desc.setNatureIds((String[]) natures.toArray(new String[0]));
-		proj.setDescription(desc, new NullProgressMonitor());
-		Platform.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
-	}
-
-	private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new WorkspaceProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try {
-			if (!project.exists()) {
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath)) {
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen()) {
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
-		final IProject proj = fProject;
-		WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
-			protected void execute(IProgressMonitor monitor) throws CoreException {
-				// IWorkspaceRoot wsRoot =
-				// ResourcesPlugin.getWorkspace().getRoot();
-				// IProject proj = wsRoot.getProject(name);
-				if (proj != null && proj.exists()) {
-					proj.clearHistory(null);
-					// proj.close(null);
-					proj.refreshLocal(IResource.DEPTH_INFINITE, null);
-					proj.delete(true, true, null);
-					// proj = null;
-				}
-				refreshWorkspace();
-			}
-		};
-		// WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
-		deleteOp.run(null);
-		// saves the new workspace metadata
-		// ResourcesPlugin.getWorkspace().save(true, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
deleted file mode 100644
index 1e171f278..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.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.jst.jsp.ui.tests.util;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
-	private static Date timestamp = null;
-	private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
-	//	private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
-	private static String nowShort = null;
-
-	public static String timestamp() {
-
-		if (TimestampUtil.nowShort == null) {
-			TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
-		}
-		return TimestampUtil.nowShort;
-	}
-
-	protected static Date ensureTimestamp() {
-		// just calculate 'timestamp' once per class loading, 
-		// so this 'timestamp' remains the same during 
-		// entire run. 
-		if (TimestampUtil.timestamp == null) {
-			Calendar calendar = Calendar.getInstance();
-			TimestampUtil.timestamp = calendar.getTime();
-		}
-		return TimestampUtil.timestamp;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
deleted file mode 100644
index a3f107ad8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,49 +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.jst.jsp.ui.tests.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
-	private boolean finished = false;
-
-	public void beginTask(String name, int totalWork) {
-	}
-
-	public void done() {
-		finished = true;
-	}
-
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void internalWorked(double work) {
-	}
-
-	public boolean isCanceled() {
-		return finished;
-	}
-
-	public void setCanceled(boolean value) {
-		if (value == true)
-			finished = true;
-	}
-
-	public void setTaskName(String name) {
-	}
-
-	public void subTask(String name) {
-	}
-
-	public void worked(int work) {
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
deleted file mode 100644
index c331568bd..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/TestViewerConfigurationJSP.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package org.eclipse.jst.jsp.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jst.jsp.core.internal.provisional.text.IJSPPartitionTypes;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.internal.provisional.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.html.core.internal.provisional.text.IHTMLPartitionTypes;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.IHighlighter;
-import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationJSP extends TestCase {
-    
-	private StructuredTextViewer fViewer = null;
-	private StructuredTextViewerConfigurationJSP fConfig = null;
-	private IPreferenceStore fPreferenceStore = null;
-	private boolean fDisplayExists = true;
-	private boolean isSetup = false;
-	
-    public TestViewerConfigurationJSP() {
-        super("TestViewerConfigurationJSP");
-    }
-    protected void setUp() throws Exception {
-		
-    	super.setUp();
-		if(!this.isSetup){
-			setUpPreferences();
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-    }
-	
-    private void setUpPreferences() {
-		fPreferenceStore = JSPUIPlugin.getDefault().getPreferenceStore();
-		fPreferenceStore.setValue(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, true);
-	}
-	
-	private void setUpViewerConfiguration() {
-
-		if (Display.getCurrent() != null) {
-			
-			Shell shell = null;
-			Composite parent = null;
-			
-			if(PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			}
-			else {	
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-			
-			// dummy viewer
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationJSP(fPreferenceStore);
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "TestViewerConfigurationJSP tests cannot run because there is no DISPLAY available");
-		}
-	}
-    
-	public void testGetAutoEditStrategies() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IJSPPartitionTypes.JSP_DEFAULT);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-	
-	public void testGetConfiguredContentTypes() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-	
-	public void testGetContentAssistant() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-	
-	public void testGetCorrectionAssistant() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentAssistant ca = fConfig.getCorrectionAssistant(fViewer);
-		assertNull("there is now a correction assistant?", ca);
-	}
-	
-	public void testGetContentFormatter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-		assertNotNull("there is no content formatter", cf);
-	}
-	
-	public void testGetDoubleClickStrategy() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if(strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-	
-	public void testGetHighlighter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IHighlighter highlighter = fConfig.getHighlighter(fViewer);
-		assertNotNull("Highlighter is null", highlighter);
-	}
-	
-	public void testGetInformationPresenter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-		assertNotNull("InformationPresenter is null", presenter);
-	}
-	
-    public void testGetAnnotationHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
-		assertNotNull("AnnotationHover is null", hover);
-    }
-	
-	public void testUnconfigure() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		fConfig.unConfigure(fViewer);
-		// need a good test here to make sure thing are really unconfigured
-		
-		// need to re-set up since it's likely
-		// more tests are called after this one
-		setUpViewerConfiguration();
-	}
-	
-	public void testGetReconciler() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler is null", r);
-	}
-	
-	public void testGetHyperlinkDetectors() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-		assertNotNull(detectors);
-		assertTrue("there are no hyperlink detectors", detectors.length > 1);
-	}
-	
-	public void testGetTextHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-
-		String[] hoverPartitions = new String[]{IHTMLPartitionTypes.HTML_DEFAULT,
-													IHTMLPartitionTypes.SCRIPT,
-													IJSPPartitionTypes.JSP_DEFAULT,
-													IJSPPartitionTypes.JSP_DIRECTIVE,
-													IJSPPartitionTypes.JSP_CONTENT_JAVA,
-													IXMLPartitions.XML_DEFAULT};
-		
-		for (int i = 0; i < hoverPartitions.length; i++) {
-			ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
-			assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
-		}
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
deleted file mode 100644
index 1deaf7d59..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
+++ /dev/null
@@ -1,440 +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.jst.jsp.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.ui.internal.provisional.StructuredTextViewerConfigurationJSP;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentoutline.StructuredTextEditorContentOutlinePage;
-import org.eclipse.wst.sse.ui.internal.provisional.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.w3c.dom.Attr;
-
-public class ViewerTestJSP extends ViewPart {
-	private final String SSE_EDITOR_FONT = "com.ibm.sse.editor.textfont";
-	private final String DEFAULT_VIEWER_CONTENTS = "<%@ page contentType=\"text/html; charset=ISO-8859-1\" %>\n";
-
-	private StructuredTextViewer fSourceViewer = null;
-	private StructuredTextViewerConfiguration fConfig = null;
-	private IContentOutlinePage fContentOutlinePage = null;
-	private INodeSelectionListener fHighlightRangeListener = null;
-	
-	/**
-	 * Sets the viewer's highlighting text range to the text range indicated by the
-	 * selected Nodes.
-	 */
-	protected class NodeRangeSelectionListener implements INodeSelectionListener {
-		public void nodeSelectionChanged(NodeSelectionChangedEvent event) {
-			if (!event.getSelectedNodes().isEmpty()) {
-				IndexedRegion startNode = (IndexedRegion) event.getSelectedNodes().get(0);
-				IndexedRegion endNode = (IndexedRegion) event.getSelectedNodes().get(event.getSelectedNodes().size() - 1);
-
-				if (startNode instanceof Attr)
-					startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-				if (endNode instanceof Attr)
-					endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-				int start = startNode.getStartOffset();
-				int end = endNode.getEndOffset();
-
-				fSourceViewer.resetVisibleRegion();
-				fSourceViewer.setVisibleRegion(start, end - start);
-				fSourceViewer.setSelectedRange(start, 0);
-			}
-			else {
-				fSourceViewer.resetVisibleRegion();
-			}
-		}
-	}
-
-	protected class NumberInputDialog extends Dialog {
-		public NumberInputDialog(Shell shell) {
-			super(shell);
-		}
-
-		public Text start;
-		int startValue;
-		public Text length;
-		int lengthValue;
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite container = new Composite(composite, SWT.NULL);
-			container.setLayoutData(new GridData(GridData.FILL_BOTH));
-			container.setLayout(new GridLayout(2, true));
-			setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
-			Label label = new Label(container, SWT.NULL);
-			label.setText("Start");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			label = new Label(container, SWT.NULL);
-			label.setText("Length");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			start = new Text(container, SWT.BORDER);
-			startValue = fSourceViewer.getVisibleRegion().getOffset();
-			start.setText("" + startValue);
-			start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			length = new Text(container, SWT.BORDER);
-			lengthValue = fSourceViewer.getVisibleRegion().getLength();
-			length.setText("" + lengthValue);
-			length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-//			start.addModifyListener(new ModifyListener() {
-//				public void modifyText(ModifyEvent e) {
-//					if (e.widget == start) {
-//						try {
-//							startValue = Integer.decode(start.getText()).intValue();
-//						}
-//						catch (NumberFormatException e2) {
-//							startValue = 0;
-//						}
-//					}
-//				}
-//			});
-//			length.addModifyListener(new ModifyListener() {
-//				public void modifyText(ModifyEvent e) {
-//					if (e.widget == length) {
-//						try {
-//							lengthValue = Integer.decode(length.getText()).intValue();
-//						}
-//						catch (NumberFormatException e2) {
-//							lengthValue = 0;
-//						}
-//					}
-//				}
-//			});
-
-			return composite;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			try {
-				startValue = Integer.decode(start.getText()).intValue();
-			} catch (NumberFormatException e2) {
-				startValue = 0;
-			}
-			try {
-				lengthValue = Integer.decode(length.getText()).intValue();
-			} catch (NumberFormatException e2) {
-				lengthValue = 0;
-			}
-			super.okPressed();
-		}
-	}
-
-	protected void addActions(IContributionManager mgr) {
-		if (mgr != null) {
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "New JSP";
-				}
-
-				public void run() {
-					super.run();
-					BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-						public void run() {
-							setupViewerForNew();
-							fSourceViewer.setEditable(true);
-						}
-					});
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility";
-				}
-
-				public void run() {
-					super.run();
-					NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
-					int proceed = dlg.open();
-					if (proceed == Window.CANCEL)
-						return;
-					fSourceViewer.resetVisibleRegion();
-					fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All";
-				}
-
-				public void run() {
-					super.run();
-					fSourceViewer.resetVisibleRegion();
-				}
-			});
-			mgr.add(new Separator());
-			// no longer able to set input to NULL
-			//			mgr.add(new Action() {
-			//				public String getText() {
-			//					return getToolTipText();
-			//				}
-			//
-			//				public String getToolTipText() {
-			//					return "Set Input to NULL";
-			//				}
-			//				public void run() {
-			//					super.run();
-			//					viewer.setInput(null);
-			//				}
-			//			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input from Active Editor";
-				}
-
-				public void run() {
-					super.run();
-					ITextEditor textEditor = getActiveEditor();
-					if (textEditor != null) {
-						setupViewerForEditor(textEditor);
-						fSourceViewer.setEditable(true);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(true);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection As ReadOnly";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(false);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Stop Following Selection";
-				}
-
-				public void run() {
-					super.run();
-					stopFollowSelection();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
-		addActions(mgr);
-
-		// create source viewer & its content type-specific viewer configuration
-		fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		fConfig = new StructuredTextViewerConfigurationJSP();
-		
-		// set up the viewer with a document & viewer config
-		setupViewerForNew();
-		
-		setupViewerPreferences();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		stopFollowSelection();
-		fSourceViewer.unconfigure();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
-			fSourceViewer.getControl().setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-	}
-	
-	/**
-	 * Set up source viewer with any additional preferences it should have
-	 * Ex: font, tab width
-	 */
-	private void setupViewerPreferences() {
-		fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
-	}
-	
-	/**
-	 * Set up source viewer with a new document & configure it
-	 */
-	private void setupViewerForNew() {
-		stopFollowSelection();	// if was following selection, stop
-		
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		doc.set(DEFAULT_VIEWER_CONTENTS);
-		
-		fSourceViewer.setDocument(doc);
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(fConfig);
-	}
-	
-	/**
-	 * Returns the current active text editor if possible
-	 * @return ITextEditor
-	 */
-	private ITextEditor getActiveEditor() {
-		ITextEditor editor = null;
-		IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart instanceof ITextEditor)
-			editor = (ITextEditor) editorPart;
-		if (editor == null && editorPart != null)
-			editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-		return editor;
-	}
-	
-	/**
-	 * Sets up the viewer with the same document/input as the given editor
-	 * @param ITextEditor editor - the editor to use *cannot to be null*
-	 */
-	private void setupViewerForEditor(ITextEditor editor) {
-		stopFollowSelection();	// if was following selection, stop
-		IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-		fSourceViewer.setDocument(doc);
-		
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(new StructuredTextViewerConfigurationJSP());
-	}
-	
-	/**
-	 * Hooks up the viewer to follow the selection made in the active editor
-	 */
-	private void followSelection () {
-		ITextEditor editor = getActiveEditor();
-		if (editor != null) {
-			setupViewerForEditor(editor);
-			if (fHighlightRangeListener == null)
-				fHighlightRangeListener = new NodeRangeSelectionListener();
-	
-			fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
-			if (fContentOutlinePage != null && fContentOutlinePage instanceof StructuredTextEditorContentOutlinePage) {
-				((StructuredTextEditorContentOutlinePage) fContentOutlinePage).getViewerSelectionManager().addNodeSelectionListener(fHighlightRangeListener);
-	
-				if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
-					fSourceViewer.resetVisibleRegion();
-	
-					Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
-					IndexedRegion startNode = (IndexedRegion) nodes[0];
-					IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-	
-					if (startNode instanceof Attr)
-						startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-					if (endNode instanceof Attr)
-						endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-	
-					int start = startNode.getStartOffset();
-					int end = endNode.getEndOffset();
-					
-					fSourceViewer.setVisibleRegion(start, end - start);
-					fSourceViewer.setSelectedRange(start, 0);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Cease following the selection made in the editor
-	 */
-	private void stopFollowSelection() {
-		if (fContentOutlinePage != null && fContentOutlinePage instanceof StructuredTextEditorContentOutlinePage) {
-			((StructuredTextEditorContentOutlinePage) fContentOutlinePage).getViewerSelectionManager().removeNodeSelectionListener(fHighlightRangeListener);
-			fSourceViewer.resetVisibleRegion();
-			fContentOutlinePage = null;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/test.xml b/tests/org.eclipse.jst.jsp.ui.tests/test.xml
deleted file mode 100644
index b7c8aed28..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/test.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-    <!--<property name="eclipse-home" value="${basedir}\..\.."/>-->
-    
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.jst.jsp.ui.tests" />
-    <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsp.ui.tests.*xml"/>
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<delete dir="${workspace}" quiet="true"/>
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${workspace}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.jst.jsp.ui.tests.JSPUITestSuite" />
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-	  <!--<delete dir="${workspace}" quiet="true"/>-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.jst.jsp.ui.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-<!--		<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip b/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
deleted file mode 100644
index 0698460c5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles.zip
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
deleted file mode 100644
index 394526f13..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-1/wml_1_1.dtd
+++ /dev/null
@@ -1,353 +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/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
deleted file mode 100644
index df2103a79..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-      This DTD is identified by the PUBLIC identifier:
-     	"-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >  
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
-	"success		%URI;		#IMPLIED
-	 failure		%URI;		#IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
-	maxspace		%Number;	#REQUIRED 
-	base			%URI;		#IMPLIED
-	eventid			CDATA		#IMPLIED
-	channelid		CDATA		#REQUIRED 
-	useraccessible 		%Boolean;	"false"
-	%ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
-	href      	%URI;	   	#REQUIRED
-	lastmod		%Number;	#IMPLIED
-	etag		NMTOKEN		#IMPLIED
-	md5		NMTOKEN		#IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
deleted file mode 100644
index 67ed0d24a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/pap_1.0.dtd
+++ /dev/null
@@ -1,219 +0,0 @@
-<!--
-Push Access Protocol (PAP) v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
-
-PAP is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 1.0//EN"
-             "http://www.wapforum.org/DTD/pap_1.0.dtd">
-   <pap>
-      ...
-   </pap>
-
-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 % Datetime "CDATA">     <!-- ISO date and time -->
-<!ENTITY % State  "(rejected | pending 
-                  | delivered | undeliverable 
-                  | expired | aborted 
-                  | timeout | cancelled | unknown)">        
-                                 <!-- PPG Message State -->
-
-
-<!ELEMENT pap                    ( push-message
-                                 | push-response
-                                 | cancel-message
-                                 | cancel-response
-                                 | resultnotification-message
-                                 | resultnotification-response
-                                 | statusquery-message
-                                 | statusquery-response
-                                 | ccq-message
-                                 | ccq-response 
-                                 | badmessage-response) >
-<!ATTLIST pap
-          product-name           CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message    -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
-          push-id                    CDATA             #REQUIRED
-          deliver-before-timestamp   %Datetime;        #IMPLIED
-          deliver-after-timestamp    %Datetime;        #IMPLIED
-          source-reference           CDATA             #IMPLIED
-          ppg-notify-requested-to    CDATA             #IMPLIED 
-          progress-notes-requested   ( true | false )  "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
-          address-value          CDATA             #REQUIRED 
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
-          priority               ( high | medium | low )        "medium"
-          delivery-method        ( confirmed | preferconfirmed 
-                                 | unconfirmed | notspecified ) "notspecified"
-          network                CDATA                          #IMPLIED
-          network-required       ( true | false )               "false"
-          bearer                 CDATA                          #IMPLIED
-          bearer-required        ( true | false )               "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          reply-time             %Datetime;        #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
-          stage                  CDATA             #REQUIRED
-          note                   CDATA             #IMPLIED
-          time                   %Datetime;        #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation           -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation    -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          received-time          %Datetime;        #IMPLIED
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
-          push-id                CDATA             #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation      -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation    -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
-          query-id               CDATA             #IMPLIED
-          app-id                 CDATA             #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
-          query-id               CDATA             #IMPLIED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message    -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
-	code			CDATA	#REQUIRED
-	desc			CDATA	#IMPLIED
-	bad-message-fragment	CDATA	#IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd
deleted file mode 100644
index e3e97c54f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SI is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
-                "http://www.wapforum.org/DTD/si.dtd">
-   <si>
-   ...
-   </si>
-
-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 % Datetime "CDATA">             <!-- ISO date and time -->
-<!ENTITY % URI      "CDATA">             <!-- URI designating a 
-                                              hypertext node    -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
-  href	        %URI;                                      #IMPLIED
-  si-id	        CDATA                                      #IMPLIED
-  created	%Datetime;	                           #IMPLIED
-  si-expires	%Datetime;	                           #IMPLIED
-  action	(signal-none|signal-low|
-                 signal-medium|signal-high|delete)  "signal-medium" 
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
-  class	        NMTOKEN                                   #REQUIRED 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd
deleted file mode 100644
index f87311c49..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SL is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
-                "http://www.wapforum.org/DTD/sl.dtd">
-   <sl>
-   ...
-   </sl>
-
-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 % URI "CDATA">                <!-- URI designating a 
-                                            hypertext node    -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
-  href          %URI;                                   #REQUIRED
-  action        (execute-low|execute-high|cache)    "execute-low" 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd
deleted file mode 100644
index 1b8a49b50..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wml13.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-WML is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.3//EN"
-   "http://www.wapforum.org/DTD/wml13.dtd">
-   <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 % ContentType "%vdata;">   <!-- media type. May contain variable
-                                         references -->
-<!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 | pre)*)>
-<!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;   "false"
-  content          CDATA       #REQUIRED
-  scheme           CDATA       #IMPLIED
-  %coreattrs;
->
-<!--================ Tasks ================-->
-<!ENTITY % cache-control "(no-cache)" >
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
-  href             %HREF;          #REQUIRED
-  sendreferer      %boolean;       "false"
-  method           (post|get)      "get"
-  enctype          %ContentType;   "application/x-www-form-urlencoded"
-  cache-control    %cache-control; #IMPLIED
-  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;       #IMPLIED
-  size             %number;        #IMPLIED
-  maxlength        %number;        #IMPLIED
-  tabindex         %number;        #IMPLIED
-  title            %vdata;         #IMPLIED
-  accesskey        %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
-  accesskey        %vdata;     #IMPLIED
-  xml:lang         NMTOKEN     #IMPLIED
-  %coreattrs;
->
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
-  href             %HREF;      #REQUIRED
-  title            %vdata;     #IMPLIED
-  accesskey        %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
-  %coreattrs;
->
-<!ELEMENT pre (#PCDATA | a | anchor | do | u | br | i | b | em | strong |
-               input | select )*>
-<!ATTLIST pre
-  xml:space        CDATA       #FIXED    "preserve"
-  %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) -->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd
deleted file mode 100644
index 060f7df16..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2-1/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
-	xml:lang		NMTOKEN	#IMPLIED
-	%coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd
deleted file mode 100644
index df2103a79..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-      This DTD is identified by the PUBLIC identifier:
-     	"-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >  
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
-	"success		%URI;		#IMPLIED
-	 failure		%URI;		#IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
-	maxspace		%Number;	#REQUIRED 
-	base			%URI;		#IMPLIED
-	eventid			CDATA		#IMPLIED
-	channelid		CDATA		#REQUIRED 
-	useraccessible 		%Boolean;	"false"
-	%ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
-	href      	%URI;	   	#REQUIRED
-	lastmod		%Number;	#IMPLIED
-	etag		NMTOKEN		#IMPLIED
-	md5		NMTOKEN		#IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd
deleted file mode 100644
index 67ed0d24a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/pap_1.0.dtd
+++ /dev/null
@@ -1,219 +0,0 @@
-<!--
-Push Access Protocol (PAP) v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
-
-PAP is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 1.0//EN"
-             "http://www.wapforum.org/DTD/pap_1.0.dtd">
-   <pap>
-      ...
-   </pap>
-
-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 % Datetime "CDATA">     <!-- ISO date and time -->
-<!ENTITY % State  "(rejected | pending 
-                  | delivered | undeliverable 
-                  | expired | aborted 
-                  | timeout | cancelled | unknown)">        
-                                 <!-- PPG Message State -->
-
-
-<!ELEMENT pap                    ( push-message
-                                 | push-response
-                                 | cancel-message
-                                 | cancel-response
-                                 | resultnotification-message
-                                 | resultnotification-response
-                                 | statusquery-message
-                                 | statusquery-response
-                                 | ccq-message
-                                 | ccq-response 
-                                 | badmessage-response) >
-<!ATTLIST pap
-          product-name           CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message    -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
-          push-id                    CDATA             #REQUIRED
-          deliver-before-timestamp   %Datetime;        #IMPLIED
-          deliver-after-timestamp    %Datetime;        #IMPLIED
-          source-reference           CDATA             #IMPLIED
-          ppg-notify-requested-to    CDATA             #IMPLIED 
-          progress-notes-requested   ( true | false )  "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
-          address-value          CDATA             #REQUIRED 
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
-          priority               ( high | medium | low )        "medium"
-          delivery-method        ( confirmed | preferconfirmed 
-                                 | unconfirmed | notspecified ) "notspecified"
-          network                CDATA                          #IMPLIED
-          network-required       ( true | false )               "false"
-          bearer                 CDATA                          #IMPLIED
-          bearer-required        ( true | false )               "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          reply-time             %Datetime;        #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
-          stage                  CDATA             #REQUIRED
-          note                   CDATA             #IMPLIED
-          time                   %Datetime;        #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation           -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation    -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          received-time          %Datetime;        #IMPLIED
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
-          push-id                CDATA             #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation      -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation    -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
-          query-id               CDATA             #IMPLIED
-          app-id                 CDATA             #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
-          query-id               CDATA             #IMPLIED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message    -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
-	code			CDATA	#REQUIRED
-	desc			CDATA	#IMPLIED
-	bad-message-fragment	CDATA	#IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
--->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd
deleted file mode 100644
index e3e97c54f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SI is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
-                "http://www.wapforum.org/DTD/si.dtd">
-   <si>
-   ...
-   </si>
-
-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 % Datetime "CDATA">             <!-- ISO date and time -->
-<!ENTITY % URI      "CDATA">             <!-- URI designating a 
-                                              hypertext node    -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
-  href	        %URI;                                      #IMPLIED
-  si-id	        CDATA                                      #IMPLIED
-  created	%Datetime;	                           #IMPLIED
-  si-expires	%Datetime;	                           #IMPLIED
-  action	(signal-none|signal-low|
-                 signal-medium|signal-high|delete)  "signal-medium" 
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
-  class	        NMTOKEN                                   #REQUIRED 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd
deleted file mode 100644
index f87311c49..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SL is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
-                "http://www.wapforum.org/DTD/sl.dtd">
-   <sl>
-   ...
-   </sl>
-
-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 % URI "CDATA">                <!-- URI designating a 
-                                            hypertext node    -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
-  href          %URI;                                   #REQUIRED
-  action        (execute-low|execute-high|cache)    "execute-low" 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd
deleted file mode 100644
index 0d03c62b2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wml12.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-WML is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
-   "http://www.wapforum.org/DTD/wml12.dtd">
-   <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 % ContentType "%vdata;">   <!-- media type. May contain variable
-                                         references -->
-<!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 | pre)*)>
-<!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;   "false"
-  content          CDATA       #REQUIRED
-  scheme           CDATA       #IMPLIED
-  %coreattrs;
->
-<!--================ Tasks ================-->
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
-  href             %HREF;          #REQUIRED
-  sendreferer      %boolean;       "false"
-  method           (post|get)      "get"
-  enctype          %ContentType;   "application/x-www-form-urlencoded"
-  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
-  accesskey        %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
-  accesskey        %vdata;     #IMPLIED
-  xml:lang         NMTOKEN     #IMPLIED
-  %coreattrs;
->
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
-  href             %HREF;      #REQUIRED
-  title            %vdata;     #IMPLIED
-  accesskey        %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
-  %coreattrs;
->
-<!ELEMENT pre (#PCDATA | a | br | i | b | em | strong | input | select )*>
-<!ATTLIST pre
-  xml:space        CDATA       #FIXED    "preserve"
-  %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) -->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd
deleted file mode 100644
index 060f7df16..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-1-2/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
-	xml:lang		NMTOKEN	#IMPLIED
-	%coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd
deleted file mode 100644
index df2103a79..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/channel12.dtd
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-      This DTD is identified by the PUBLIC identifier:
-     	"-//WAPFORUM//DTD CHANNEL 1.2//EN"
--->
-
-<!ENTITY % Boolean "( true | false )">
-
-<!-- a Uniform Resource Identifier -->
-<!ENTITY % URI "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number "CDATA" >  
-
-<!-- Channel Events -->
-<!ENTITY % ChannelEvent.attribs
-	"success		%URI;		#IMPLIED
-	 failure		%URI;		#IMPLIED"
->
-
-<!ELEMENT channel (title , abstract? , resource* ) >
-<!ATTLIST channel
-	maxspace		%Number;	#REQUIRED 
-	base			%URI;		#IMPLIED
-	eventid			CDATA		#IMPLIED
-	channelid		CDATA		#REQUIRED 
-	useraccessible 		%Boolean;	"false"
-	%ChannelEvent.attribs;
->
-
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT abstract (#PCDATA)>
-
-<!ELEMENT resource EMPTY>
-<!ATTLIST resource
-	href      	%URI;	   	#REQUIRED
-	lastmod		%Number;	#IMPLIED
-	etag		NMTOKEN		#IMPLIED
-	md5		NMTOKEN		#IMPLIED
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd
deleted file mode 100644
index 9f6e8fd50..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/pap_2.0.dtd
+++ /dev/null
@@ -1,223 +0,0 @@
-<!--
-Push Access Protocol (PAP) v2.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
-
-PAP is an XML language. Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE pap PUBLIC "-//WAPFORUM//DTD PAP 2.0//EN"
-             "http://www.wapforum.org/DTD/pap_2.0.dtd"
-             [<?wap-pap-ver supported-versions="2.0,1.*"?>]>
-   <pap>
-      ...
-   </pap>
-
-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 % Datetime "CDATA">     <!-- ISO date and time -->
-<!ENTITY % State  "(rejected | pending 
-                  | delivered | undeliverable 
-                  | expired | aborted 
-                  | timeout | cancelled | unknown)">        
-                                 <!-- PPG Message State -->
-
-
-<!ELEMENT pap                    ( push-message
-                                 | push-response
-                                 | cancel-message
-                                 | cancel-response
-                                 | resultnotification-message
-                                 | resultnotification-response
-                                 | statusquery-message
-                                 | statusquery-response
-                                 | ccq-message
-                                 | ccq-response 
-                                 | badmessage-response) >
-<!ATTLIST pap
-          product-name           CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of push submission message    -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT push-message ( address+, quality-of-service? ) >
-<!ATTLIST push-message
-          push-id                    CDATA             #REQUIRED
-          replace-push-id            CDATA             #IMPLIED
-          replace-method             ( pending-only 
-                                     | all )           "all"
-          deliver-before-timestamp   %Datetime;        #IMPLIED
-          deliver-after-timestamp    %Datetime;        #IMPLIED
-          source-reference           CDATA             #IMPLIED
-          ppg-notify-requested-to    CDATA             #IMPLIED 
-          progress-notes-requested   ( true | false )  "false"
->
-
-<!ELEMENT address EMPTY >
-<!ATTLIST address
-          address-value          CDATA             #REQUIRED 
->
-
-<!ELEMENT quality-of-service EMPTY >
-<!ATTLIST quality-of-service
-          priority               ( high | medium | low )        "medium"
-          delivery-method        ( confirmed | preferconfirmed 
-                                 | unconfirmed | notspecified ) "notspecified"
-          network                CDATA                          #IMPLIED
-          network-required       ( true | false )               "false"
-          bearer                 CDATA                          #IMPLIED
-          bearer-required        ( true | false )               "false"
->
-
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT push-response ( progress-note*, response-result ) >
-<!ATTLIST push-response
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          reply-time             %Datetime;        #IMPLIED
->
-
-<!ELEMENT progress-note EMPTY >
-<!ATTLIST progress-note
-          stage                  CDATA             #REQUIRED
-          note                   CDATA             #IMPLIED
-          time                   %Datetime;        #IMPLIED
->
-
-<!ELEMENT response-result EMPTY >
-<!ATTLIST response-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of cancel operation           -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT cancel-message ( address* ) >
-<!ATTLIST cancel-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT cancel-response ( cancel-result+ ) >
-<!ATTLIST cancel-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT cancel-result ( address* ) >
-<!ATTLIST cancel-result
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of notify result operation    -->
-<!-- ========================================= -->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT resultnotification-message ( address, quality-of-service? ) >
-<!ATTLIST resultnotification-message
-          push-id                CDATA             #REQUIRED
-          sender-address         CDATA             #IMPLIED
-          sender-name            CDATA             #IMPLIED
-          received-time          %Datetime;        #IMPLIED
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT resultnotification-response ( address ) >
-<!ATTLIST resultnotification-response
-          push-id                CDATA             #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ========================================= -->
-<!-- Declaration of statusquery operation      -->
-<!-- ========================================= -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT statusquery-message ( address* ) >
-<!ATTLIST statusquery-message
-          push-id                CDATA             #REQUIRED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT statusquery-response ( statusquery-result+ ) >
-<!ATTLIST statusquery-response
-          push-id                CDATA             #REQUIRED
->
-
-<!ELEMENT statusquery-result ( address*, quality-of-service? ) >
-<!ATTLIST statusquery-result
-          event-time             %Datetime;        #IMPLIED
-          message-state          %State;           #REQUIRED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-
-
-<!-- ============================================== -->
-<!-- Declaration of capabilities query operation    -->
-<!-- ============================================== -->
-
-<!--this message goes from the Push Initiator to the push proxy gateway-->
-
-<!ELEMENT ccq-message ( address ) >
-<!ATTLIST ccq-message
-          query-id               CDATA             #IMPLIED
-          app-id                 CDATA             #IMPLIED
->
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT ccq-response ( address ) >
-<!ATTLIST ccq-response
-          query-id               CDATA             #IMPLIED
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
->
-<!-- ============================================== -->
-<!-- Declaration of bad message response message    -->
-<!-- ============================================== -->
-
-
-<!--this message goes from the push proxy gateway to the Push Initiator-->
-
-<!ELEMENT badmessage-response EMPTY >
-<!ATTLIST badmessage-response
-          code                   CDATA             #REQUIRED
-          desc                   CDATA             #IMPLIED
-          bad-message-fragment   CDATA             #IMPLIED
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd
deleted file mode 100644
index bbc046f6c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/prov.dtd
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Client Provisioning v1.0 Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
-
-Connectivity Document Type Definition
-Connectivity is an XML language. Typical Usage:
-
-   <?xml version="1.0"?>
-   <!DOCTYPE wap-provisioningdoc PUBLIC "-//WAPFORUM//DTD PROV 1.0//EN"
-             "http://www.wapforum.org/DTD/prov.dtd">
-            
-<wap-provisioningdoc>
-...
-</wap-provisioningdoc>
-
-
-Terms and conditions of use are available from the Wireless 
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ELEMENT wap-provisioningdoc (characteristic+)>
-<!ATTLIST wap-provisioningdoc
-  version   CDATA #IMPLIED
->
-
-<!ELEMENT characteristic (parm*, characteristic*)>
-<!ATTLIST characteristic
-  type CDATA #REQUIRED
- 
->
-
-<!ELEMENT parm EMPTY>
-<!ATTLIST parm
-  name  CDATA #REQUIRED
-  value CDATA #IMPLIED
->
-
-
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998-2001.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd
deleted file mode 100644
index e3e97c54f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/si.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Service Indication (SI) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SI is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE si PUBLIC "-//WAPFORUM//DTD SI 1.0//EN"
-                "http://www.wapforum.org/DTD/si.dtd">
-   <si>
-   ...
-   </si>
-
-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 % Datetime "CDATA">             <!-- ISO date and time -->
-<!ENTITY % URI      "CDATA">             <!-- URI designating a 
-                                              hypertext node    -->
-
-
-<!--====================== The SI Element ======================-->
-<!ELEMENT si (indication,info?)>
-
-
-<!--================== The indication Element ==================-->
-<!ELEMENT indication (#PCDATA)>
-<!ATTLIST indication
-  href	        %URI;                                      #IMPLIED
-  si-id	        CDATA                                      #IMPLIED
-  created	%Datetime;	                           #IMPLIED
-  si-expires	%Datetime;	                           #IMPLIED
-  action	(signal-none|signal-low|
-                 signal-medium|signal-high|delete)  "signal-medium" 
->
-
-
-<!--===================== The INFO Element =====================-->
-<!ELEMENT info (item+)>
-
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item
-  class	        NMTOKEN                                   #REQUIRED 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd
deleted file mode 100644
index f87311c49..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Service Loading (SL) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-SL is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE sl PUBLIC "-//WAPFORUM//DTD SL 1.0//EN"
-                "http://www.wapforum.org/DTD/sl.dtd">
-   <sl>
-   ...
-   </sl>
-
-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 % URI "CDATA">                <!-- URI designating a 
-                                            hypertext node    -->
-
-<!--===================== The SL Element =====================-->
-<!ELEMENT sl EMPTY>
-<!ATTLIST sl
-  href          %URI;                                   #REQUIRED
-  action        (execute-low|execute-high|cache)    "execute-low" 
->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod
deleted file mode 100644
index 924ad2e09..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod
+++ /dev/null
@@ -1,103 +0,0 @@
-<!-- WML Deprecated Module  .................................... -->
-<!-- file: wml-deprecated-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
-       SYSTEM "wml-deprecated-1.mod"
-
-	This module contains deprecated elements and attributes.
-	
-		Attributes: WML mode, XHTML align, XHTML vspace, XHTML hspace
-		
-		Elements: u, b, big, i, small 
-		
--->
-<!-- 
-	p 
-	
-	*WML mode
-	*XHTML align
-	
-	Replacement: Use CSS style sheets 
--->
-<!ATTLIST %p.qname;
-	%att.mode.qname; (wrap | nowrap) #IMPLIED
-	align (left | right | center) "left"
->
-<!-- 
-	table 
-	
-	*WML align 
-	
-	Note: The WML align attribute is not the same as the XHTML attribute with the same name.
--->
-<!ATTLIST %table.qname;
-	%att.align.qname; CDATA #IMPLIED
->
-<!-- 
-	img 
-	
-	*XHTML vspace, hspace, align
-	
-	Replacement: Use CSS style sheets 
--->
-<!ATTLIST img
-	vspace CDATA "0"
-	hspace CDATA "0"
-	align (top | middle | bottom) "bottom"
->
-<!-- 
-	Inline Presentation 
-	
-	*XHTML  b, big, i, small	
-	
-	Replacement: Use CSS style sheets 
--->
-<!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"
-		"xhtml-inlpres-1.mod">
-%xhtml-inlpres.mod;
-<!-- 
-	u
-
-	This element is not available in the XHTML inline presentation module.
-	It was deprecated already in HTML 4.0.
-	
-	Replacement: Use CSS style sheets 
--->
-<!ENTITY % u.content "( #PCDATA | %Inline.mix; )*">
-<!ENTITY % u.qname "u">
-<!ELEMENT %u.qname; %u.content;>
-<!ATTLIST %u.qname;
-	%Common.attrib; 
->
-<!-- 
-	meta 
-	
-	*WML forua attribute
--->
-<!ATTLIST %meta.qname;
-	%att.forua.qname; %Boolean.datatype; "true"
->
-<!--
-	html
-	
-	*WML use-xml-fragment attribute
--->
-<!ATTLIST %html.qname;
-	%att.usexmlfragment.qname; 	%Boolean.datatype; "true"
->
-
-
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod
deleted file mode 100644
index d061af699..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- WML Modular Framework ...................................................... -->
-<!-- file: wml-framework-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
-       SYSTEM "http://www.wapforum.org/dtd/wml-framework-1.mod"
-       
-       This is an extension of the XHTML Modular Framework module. In addition to the 
-       required XHTML entities it includes:
-       
-       		*WML datatypes
-       		*WML namespace qualified names
-       		*WML document model       
--->
-<!-- 
-	XHTML notations
--->
-<!ENTITY % xhtml-notations.mod PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod">
-%xhtml-notations.mod;
-<!-- 
-	WML datatypes
--->
-<!ENTITY % Boolean.datatype "(true|false)">
-<!-- 
-	XHTML datatypes
--->
-<!ENTITY % xhtml-datatypes.mod PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod">
-%xhtml-datatypes.mod;
-<!-- 
-	WML qualified names
--->
-<!ENTITY % wml-qname.mod PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
-       "http://www.wapforum.org/DTD/wml-qname-1.mod">
-%wml-qname.mod;
-<!-- 
-	XHTML qualified names
--->
-<!ENTITY % xhtml-qname.mod PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod">
-%xhtml-qname.mod;
-<!--
-	XHTML global attributes
--->
-<!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-inlstyle.mod;
-<!ENTITY % XHTML.bidi "IGNORE">
-<!ENTITY % xhtml-attribs.mod PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod">
-%xhtml-attribs.mod;
-<!-- 
-	XHTML character entities
--->
-<!ENTITY % xhtml-charent.mod PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod">
-%xhtml-charent.mod;
-<!-- 
-	WML document model
--->
-<!ENTITY % wml-model.mod PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
-       "http://www.wapforum.org/DTD/wml20-model-1.mod">
-%wml-model.mod;
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod
deleted file mode 100644
index 9ef5a55e5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- WML Qualified Names Module  ......................................... -->
-<!-- file: wml-qname-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-	PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
-       SYSTEM "wml-qname-1.mod"
-
-	This module declares WML names with the WML namespace prefix.	
-
--->
-<!--
-	The WML namespace name
--->
-<!ENTITY % WML.xmlns "http://www.wapforum.org/2001/wml">
-<!--
-	WML namespace prefix
-	
-	On WML elements WML is declared as the default namespace. 
-	Namespace prefix is used only for WML attributes on XHTML elements.
--->
-<!ENTITY % WML.prefix "wml">
-<!--
-	Parameter entity with the WML namespace prefix plus the ":". 
-	The actual prefix, WML.prefix, is declared in the WML DTD driver. 
--->
-<!ENTITY % WML.pfx "%WML.prefix;:">
-<!--
-	Attribute used to declare the WML namespace with the WML prefix.
--->
-<!ENTITY % WML.xmlns.extra.attrib "xmlns:%WML.prefix;	 %URI.datatype; 		#FIXED 	'%WML.xmlns;'">
-<!--
-	All WML qualified names. 
-	
-	Note that element names are not prefixed. Only attribute names are.
--->
-<!ENTITY % card.qname "%WML.pfx;card">
-<!ENTITY % do.qname "%WML.pfx;do">
-<!ENTITY % access.qname "%WML.pfx;access">
-<!ENTITY % go.qname "%WML.pfx;go">
-<!ENTITY % prev.qname "%WML.pfx;prev">
-<!ENTITY % refresh.qname "%WML.pfx;refresh">
-<!ENTITY % noop.qname "%WML.pfx;noop">
-<!ENTITY % onevent.qname "%WML.pfx;onevent">
-<!ENTITY % postfield.qname "%WML.pfx;postfield">
-<!ENTITY % setvar.qname "%WML.pfx;setvar">
-<!ENTITY % getvar.qname "%WML.pfx;getvar">
-<!ENTITY % timer.qname "%WML.pfx;timer">
-<!ENTITY % widget.qname "%WML.pfx;widget">
-<!ENTITY % anchor.qname "%WML.pfx;anchor">
-<!ENTITY % att.forua.qname "%WML.pfx;forua">
-<!ENTITY % att.value.qname "%WML.pfx;value">
-<!ENTITY % att.iname.qname "%WML.pfx;iname">
-<!ENTITY % att.name.qname "%WML.pfx;name">
-<!ENTITY % att.ivalue.qname "%WML.pfx;ivalue">
-<!ENTITY % att.format.qname "%WML.pfx;format">
-<!ENTITY % att.emptyok.qname "%WML.pfx;emptyok">
-<!ENTITY % att.localsrc.qname "%WML.pfx;localsrc">
-<!ENTITY % att.columns.qname "%WML.pfx;columns">
-<!ENTITY % att.align.qname "%WML.pfx;align">
-<!ENTITY % att.mode.qname "%WML.pfx;mode">
-<!ENTITY % att.onenterforward.qname "%WML.pfx;onenterforward">
-<!ENTITY % att.onenterbackward.qname "%WML.pfx;onenterbackward">
-<!ENTITY % att.ontimer.qname "%WML.pfx;ontimer">
-<!ENTITY % att.onpick.qname "%WML.pfx;onpick">
-<!ENTITY % att.newcontext.qname "%WML.pfx;newcontext">
-<!ENTITY % att.usexmlfragment.qname "%WML.pfx;use-xml-fragments">
-<!ENTITY % att.type.qname "%WML.pfx;type">
-<!--
-	The u element is not declared in XHTML, because it has beed removed from the language. 
-	So it must be declared here. It is, however, deprecated in WML. 
--->
-<!ENTITY % u.qname "u">
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod
deleted file mode 100644
index d48591163..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod
+++ /dev/null
@@ -1,248 +0,0 @@
-<!-- WML 2.0 Special Module  .................................... -->
-<!-- file: wml-special-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
-       SYSTEM "wml-special-1.mod"
-
-	This module contains declarations of the following WML elements. 
-	
-		card, do, onevent, access, go, prev,
-		refresh, noop,  postfield, setvar, getvar
-		timer, anchor
-		
-	It also contains WML extensions of XHTML elements. 
--->
-<!-- ============================================ -->
-<!-- 
-	WML Global attributes
--->
-<!-- ============================================ -->
-<!-- 
-	WML Event attributes
-	
-	These are used on the XHTML body and html elements.
-	The same attributes are also available on the WML card element, but
-	without namespace prefix.
--->
-<!ENTITY % WML.event.attrib "%att.onenterforward.qname; CDATA	#IMPLIED
- %att.onenterbackward.qname; CDATA	#IMPLIED
- %att.ontimer.qname; CDATA	#IMPLIED">
-<!-- ============================================ -->
-<!-- 
-	WML Elements
--->
-<!-- ============================================ -->
-<!-- 
-	Cards 
-	
-	Use same content model as the HTML body element
--->
-<!ELEMENT %card.qname; %CardBody.mix;>
-<!ATTLIST %card.qname;
-	%Common.attrib; 
-	newcontext %Boolean.datatype; "false"
-	onenterforward CDATA #IMPLIED
-	onenterbackward CDATA #IMPLIED
-	ontimer CDATA #IMPLIED
->
-<!-- 
-	Do 
--->
-<!ELEMENT %do.qname; (%Tasks.class;)>
-<!ATTLIST %do.qname;
-	%Common.attrib; 
-  	type             CDATA       #REQUIRED
-  	label             CDATA       #IMPLIED
->
-<!-- 
-	Onevent 
--->
-<!ELEMENT %onevent.qname; %Tasks.class;>
-<!ATTLIST %onevent.qname;
-	%Core.attrib; 
-	type CDATA #REQUIRED
->
-<!-- 
-	Access 
--->
-<!ELEMENT %access.qname; EMPTY>
-<!ATTLIST %access.qname;
-	%Core.attrib; 
-	domain CDATA #IMPLIED
-	path CDATA #IMPLIED
->
-<!-- 
-	Go 
--->
-<!ENTITY % cache-control '(no-cache)'>
-<!ELEMENT %go.qname; (%postfield.qname; | %setvar.qname;)*>
-<!ATTLIST %go.qname;
-	%Core.attrib; 
-	href %URI.datatype; #REQUIRED
-	sendreferer %Boolean.datatype; "false"
-	type %ContentType.datatype; #IMPLIED
-	method (post | get) "get"
-	enctype %ContentType.datatype; "application/x-www-form-urlencoded"
-	accept-charset CDATA #IMPLIED
-	cache-control %cache-control; #IMPLIED
->
-<!-- 
-	Prev 
--->
-<!ELEMENT %prev.qname; (%setvar.qname;)*>
-<!ATTLIST %prev.qname;
-	%Core.attrib; 
->
-<!-- 
-	Refresh 
--->
-<!ELEMENT %refresh.qname; (%setvar.qname;)*>
-<!ATTLIST %refresh.qname;
-	%Core.attrib; 
->
-<!-- 
-	Noop 
--->
-<!ELEMENT %noop.qname; EMPTY>
-<!ATTLIST %noop.qname;
-	%Core.attrib; 
->
-<!-- 
-	Postfield 
--->
-<!ELEMENT %postfield.qname; EMPTY>
-<!ATTLIST %postfield.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	value CDATA #REQUIRED
->
-<!-- 
-	Setvar 
--->
-<!ELEMENT %setvar.qname; EMPTY>
-<!ATTLIST %setvar.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	value CDATA #REQUIRED
->
-<!-- 
-	Getvar
--->
-<!ELEMENT %getvar.qname; EMPTY>
-<!ATTLIST %getvar.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	conversion (escape | noesc | unesc) "noesc"
->
-<!-- 
-	Timer  
--->
-<!ELEMENT %timer.qname; EMPTY>
-<!ATTLIST %timer.qname;
-	%Core.attrib; 
-	name NMTOKEN #IMPLIED
-	value CDATA #REQUIRED
->
-<!-- 
-	Anchor 
-	
-	Same content model as HTML a element, but extended with WML tasks.
--->
-<!ELEMENT %anchor.qname; (#PCDATA | %InlNoAnchor.mix; | %Tasks-nonoop.class;)*>
-<!ATTLIST %anchor.qname;
-	%Common.attrib; 
-	accesskey CDATA #IMPLIED
->
-<!-- ============================================ -->
-<!-- 
-	WML extensions of XHTML elements
--->
-<!-- ============================================ -->
-<!-- 
-	select 
-	
-	*WML iname, ivalue, value, and name attributes
-	*XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %select.qname;
-	%att.iname.qname; NMTOKEN #IMPLIED
-	%att.value.qname; CDATA #IMPLIED
-	%att.ivalue.qname; CDATA #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	input 
-	
-	*WML format, emptyok, and name attributes
-	*XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %input.qname;
-	%att.format.qname; CDATA #IMPLIED
-	%att.emptyok.qname; %Boolean.datatype; #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	textarea
-	
-	*WML format, emptyok, and name attributes
-	*XHTML tabindex attribute (not in Basic Forms module)
--->
-<!ATTLIST %textarea.qname;
-	%att.format.qname; CDATA #IMPLIED
-	%att.emptyok.qname; %Boolean.datatype; #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	option
-	
-	*WML onpick attribute
--->
-<!ATTLIST %option.qname;
-	%att.onpick.qname; CDATA #IMPLIED
->
-<!-- 
-	img 
-
-	*WML localsrc attribute
--->
-<!ATTLIST img
-	%att.localsrc.qname; CDATA #IMPLIED
-	%att.type.qname; %ContentType.datatype; #IMPLIED
->
-<!-- 
-	table 
-	
-	*WML columns attribute
-	
--->
-<!ATTLIST %table.qname;
-	%att.columns.qname; %Number.datatype; #IMPLIED
->
-<!-- 
-	body 
-	
-	*WML newcontext 
-	*WML event attributes
--->
-<!ATTLIST %body.qname;
-	%att.newcontext.qname; %Boolean.datatype; "false"
-	%WML.event.attrib; 
->
-<!-- 
-	html 
-	
-	*Declaration of WML namespace with prefix	
-	*WML event attributes
--->
-<!ATTLIST %html.qname;
-	%WML.xmlns.extra.attrib; 
-	%WML.event.attrib; 
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd
deleted file mode 100644
index 40570a558..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd
+++ /dev/null
@@ -1,3609 +0,0 @@
-<!-- WML 2.0 DTD  ...................................................... -->
-<!-- file: wml20.dtd -->
-<!-- 
-    @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 WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
-         "-//WAPFORUM//DTD WML 2.0//EN"
-                   	          
-     For example, if you are using WML 2.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 WML 2.0//EN"
-                               "http://www.wapforum.org/dtd/wml20.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-                   xmlns:wml="http://www.wapforum.org/2001/wml">
-         ...
-         </html>
-
--->
-<!-- ============================================ -->
-<!--
-		Version, XML Namespaces, and profile information 
--->
-<!-- ============================================ -->
-<!--
-	Value of XHTML version attribute 
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!-- 
-	Value of XHTML profile attribute
-	
-	Reserved for future use with document profiles 
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
-		Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-framework-1.mod">
-<!-- WML Modular Framework ...................................................... -->
-<!-- file: wml-framework-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
-       SYSTEM "http://www.wapforum.org/dtd/wml-framework-1.mod"
-       
-       This is an extension of the XHTML Modular Framework module. In addition to the 
-       required XHTML entities it includes:
-       
-       		*WML datatypes
-       		*WML namespace qualified names
-       		*WML document model       
--->
-<!-- 
-	XHTML notations
--->
-<!ENTITY % xhtml-notations.mod PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 
-	WML datatypes
--->
-<!ENTITY % Boolean.datatype "(true|false)">
-<!-- 
-	XHTML datatypes
--->
-<!ENTITY % xhtml-datatypes.mod PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 
-	WML qualified names
--->
-<!ENTITY % wml-qname.mod PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
-       "http://www.wapforum.org/DTD/wml-qname-1.mod">
-<!-- WML Qualified Names Module  ......................................... -->
-<!-- file: wml-qname-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-	PUBLIC "-//WAPFORUM//ENTITIES WML Qualified Names 1.0//EN"
-       SYSTEM "wml-qname-1.mod"
-
-	This module declares WML names with the WML namespace prefix.	
-
--->
-<!--
-	The WML namespace name
--->
-<!ENTITY % WML.xmlns "http://www.wapforum.org/2001/wml">
-<!--
-	WML namespace prefix
-	
-	On WML elements WML is declared as the default namespace. 
-	Namespace prefix is used only for WML attributes on XHTML elements.
--->
-<!ENTITY % WML.prefix "wml">
-<!--
-	Parameter entity with the WML namespace prefix plus the ":". 
-	The actual prefix, WML.prefix, is declared in the WML DTD driver. 
--->
-<!ENTITY % WML.pfx "%WML.prefix;:">
-<!--
-	Attribute used to declare the WML namespace with the WML prefix.
--->
-<!ENTITY % WML.xmlns.extra.attrib "xmlns:%WML.prefix;	 %URI.datatype; 		#FIXED 	'%WML.xmlns;'">
-<!--
-	All WML qualified names. 
-	
-	Note that element names are not prefixed. Only attribute names are.
--->
-<!ENTITY % card.qname "%WML.pfx;card">
-<!ENTITY % do.qname "%WML.pfx;do">
-<!ENTITY % access.qname "%WML.pfx;access">
-<!ENTITY % go.qname "%WML.pfx;go">
-<!ENTITY % prev.qname "%WML.pfx;prev">
-<!ENTITY % refresh.qname "%WML.pfx;refresh">
-<!ENTITY % noop.qname "%WML.pfx;noop">
-<!ENTITY % onevent.qname "%WML.pfx;onevent">
-<!ENTITY % postfield.qname "%WML.pfx;postfield">
-<!ENTITY % setvar.qname "%WML.pfx;setvar">
-<!ENTITY % getvar.qname "%WML.pfx;getvar">
-<!ENTITY % timer.qname "%WML.pfx;timer">
-<!ENTITY % widget.qname "%WML.pfx;widget">
-<!ENTITY % anchor.qname "%WML.pfx;anchor">
-<!ENTITY % att.forua.qname "%WML.pfx;forua">
-<!ENTITY % att.value.qname "%WML.pfx;value">
-<!ENTITY % att.iname.qname "%WML.pfx;iname">
-<!ENTITY % att.name.qname "%WML.pfx;name">
-<!ENTITY % att.ivalue.qname "%WML.pfx;ivalue">
-<!ENTITY % att.format.qname "%WML.pfx;format">
-<!ENTITY % att.emptyok.qname "%WML.pfx;emptyok">
-<!ENTITY % att.localsrc.qname "%WML.pfx;localsrc">
-<!ENTITY % att.columns.qname "%WML.pfx;columns">
-<!ENTITY % att.align.qname "%WML.pfx;align">
-<!ENTITY % att.mode.qname "%WML.pfx;mode">
-<!ENTITY % att.onenterforward.qname "%WML.pfx;onenterforward">
-<!ENTITY % att.onenterbackward.qname "%WML.pfx;onenterbackward">
-<!ENTITY % att.ontimer.qname "%WML.pfx;ontimer">
-<!ENTITY % att.onpick.qname "%WML.pfx;onpick">
-<!ENTITY % att.newcontext.qname "%WML.pfx;newcontext">
-<!ENTITY % att.usexmlfragment.qname "%WML.pfx;use-xml-fragments">
-<!ENTITY % att.type.qname "%WML.pfx;type">
-<!--
-	The u element is not declared in XHTML, because it has beed removed from the language. 
-	So it must be declared here. It is, however, deprecated in WML. 
--->
-<!ENTITY % u.qname "u">
-
-<!-- 
-	XHTML qualified names
--->
-<!ENTITY % xhtml-qname.mod PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!--
-	XHTML global attributes
--->
-<!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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!ENTITY % XHTML.bidi "IGNORE">
-<!ENTITY % xhtml-attribs.mod PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 
-	XHTML character entities
--->
-<!ENTITY % xhtml-charent.mod PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 
-	WML document model
--->
-<!ENTITY % wml-model.mod PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
-       "http://www.wapforum.org/DTD/wml20-model-1.mod">
-<!-- WML 2.0 Document Model Module  .................................... -->
-<!-- file: wml20-model-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
-       SYSTEM "http://www.wapforum.org/dtd/wml20-model-1.mod"
-      
-     This module describes the groupings of elements that make up
-     common content models for WML and XHTML elements.
-
-     Three basic content models are declared:
-
-         %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).
-     
-        	     
--->
-<!-- 
-	Optional Elements in head  
--->
-<!ENTITY % HeadOpts.mix "( %meta.qname; 
-		| %link.qname; 
-		| %style.qname; 
-		| %object.qname; 
-		| %access.qname;)*">
-<!-- 
-	Task elements
-
-	Used for the WML do and onevent elements
--->
-<!ENTITY % Tasks.class "(%go.qname; 
-		| %prev.qname; 
-		| %noop.qname; 
-		| %refresh.qname;)">
-<!-- 
-	Tasks without noop element
-
-	Used for the WML anchor
--->
-<!ENTITY % Tasks-nonoop.class "%go.qname; 
-		| %prev.qname; 
-		| %refresh.qname;">
-<!--
-	Do element
--->
-<!ENTITY % Do.class "%do.qname;">
-<!-- 
-	Miscellaneous Elements  
-	
-	This is not used for anything right now. 
--->
-<!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;
-	| %u.qname;">
-<!ENTITY % I18n.class "">
-<!ENTITY % Anchor.class "| %a.qname; 
-	| %anchor.qname; | %do.qname;">
-<!ENTITY % InlSpecial.class "| %img.qname; 
-	 | %object.qname; 
-	| %getvar.qname;">
-<!ENTITY % InlForm.class "| %input.qname; 
-	 | %select.qname; 
-	 | %textarea.qname;
-         | %label.qname;">
-<!ENTITY % Inline.extra "">
-<!ENTITY % Inline.class "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;">
-<!ENTITY % InlNoAnchor.class "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.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 % Block.mix "%Heading.class;
-      | %List.class;
-      | %Block.class;     
-      | %Do.class;
-      %Misc.class;">
-<!ENTITY % BlkNoForm.mix "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname;
-      %Block.extra;
-      %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;">
-<!-- 	
-	Template level elements 
--->
-<!ENTITY % Template.mix "( %onevent.qname;)*">
-<!-- 
-	Content model of the WML card and XHTML body elements
--->
-<!ENTITY % CardBody.mix "(%onevent.qname;*, %timer.qname;?,  ( %Block.mix; )+)">
-<!-- end of wml20-model-1.mod -->
-
-
-<!-- ============================================ -->
-<!--
-		XHTML modules 
--->
-<!-- ============================================ -->
-<!-- Text Module  ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
-      | %InlStruct.class; | %i.qname; | %b.qname; 
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; 
-	| %getvar.qname;
-	| %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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.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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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  ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
-	%Common.attrib; 	
-	label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
-	%Common.attrib; 
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
-      | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- ============================================ -->
-<!--
-		WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-special-1.mod">
-<!-- WML 2.0 Special Module  .................................... -->
-<!-- file: wml-special-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
-       SYSTEM "wml-special-1.mod"
-
-	This module contains declarations of the following WML elements. 
-	
-		card, do, onevent, access, go, prev,
-		refresh, noop,  postfield, setvar, getvar
-		timer, anchor
-		
-	It also contains WML extensions of XHTML elements. 
--->
-<!-- ============================================ -->
-<!-- 
-	WML Global attributes
--->
-<!-- ============================================ -->
-<!-- 
-	WML Event attributes
-	
-	These are used on the XHTML body and html elements.
-	The same attributes are also available on the WML card element, but
-	without namespace prefix.
--->
-<!ENTITY % WML.event.attrib "%att.onenterforward.qname; CDATA	#IMPLIED
- %att.onenterbackward.qname; CDATA	#IMPLIED
- %att.ontimer.qname; CDATA	#IMPLIED">
-<!-- ============================================ -->
-<!-- 
-	WML Elements
--->
-<!-- ============================================ -->
-<!-- 
-	Cards 
-	
-	Use same content model as the HTML body element
--->
-<!ELEMENT %card.qname; %CardBody.mix;>
-<!ATTLIST %card.qname;
-	%Common.attrib; 
-	newcontext %Boolean.datatype; "false"
-	onenterforward CDATA #IMPLIED
-	onenterbackward CDATA #IMPLIED
-	ontimer CDATA #IMPLIED
->
-<!-- 
-	Do 
--->
-<!ELEMENT %do.qname; (%Tasks.class;)>
-<!ATTLIST %do.qname;
-	%Common.attrib; 
-  	type             CDATA       #REQUIRED
-  	label             CDATA       #IMPLIED
->
-<!-- 
-	Onevent 
--->
-<!ELEMENT %onevent.qname; %Tasks.class;>
-<!ATTLIST %onevent.qname;
-	%Core.attrib; 
-	type CDATA #REQUIRED
->
-<!-- 
-	Access 
--->
-<!ELEMENT %access.qname; EMPTY>
-<!ATTLIST %access.qname;
-	%Core.attrib; 
-	domain CDATA #IMPLIED
-	path CDATA #IMPLIED
->
-<!-- 
-	Go 
--->
-<!ENTITY % cache-control '(no-cache)'>
-<!ELEMENT %go.qname; (%postfield.qname; | %setvar.qname;)*>
-<!ATTLIST %go.qname;
-	%Core.attrib; 
-	href %URI.datatype; #REQUIRED
-	sendreferer %Boolean.datatype; "false"
-	type %ContentType.datatype; #IMPLIED
-	method (post | get) "get"
-	enctype %ContentType.datatype; "application/x-www-form-urlencoded"
-	accept-charset CDATA #IMPLIED
-	cache-control %cache-control; #IMPLIED
->
-<!-- 
-	Prev 
--->
-<!ELEMENT %prev.qname; (%setvar.qname;)*>
-<!ATTLIST %prev.qname;
-	%Core.attrib; 
->
-<!-- 
-	Refresh 
--->
-<!ELEMENT %refresh.qname; (%setvar.qname;)*>
-<!ATTLIST %refresh.qname;
-	%Core.attrib; 
->
-<!-- 
-	Noop 
--->
-<!ELEMENT %noop.qname; EMPTY>
-<!ATTLIST %noop.qname;
-	%Core.attrib; 
->
-<!-- 
-	Postfield 
--->
-<!ELEMENT %postfield.qname; EMPTY>
-<!ATTLIST %postfield.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	value CDATA #REQUIRED
->
-<!-- 
-	Setvar 
--->
-<!ELEMENT %setvar.qname; EMPTY>
-<!ATTLIST %setvar.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	value CDATA #REQUIRED
->
-<!-- 
-	Getvar
--->
-<!ELEMENT %getvar.qname; EMPTY>
-<!ATTLIST %getvar.qname;
-	%Core.attrib; 
-	name CDATA #REQUIRED
-	conversion (escape | noesc | unesc) "noesc"
->
-<!-- 
-	Timer  
--->
-<!ELEMENT %timer.qname; EMPTY>
-<!ATTLIST %timer.qname;
-	%Core.attrib; 
-	name NMTOKEN #IMPLIED
-	value CDATA #REQUIRED
->
-<!-- 
-	Anchor 
-	
-	Same content model as HTML a element, but extended with WML tasks.
--->
-<!ELEMENT %anchor.qname; (#PCDATA | %InlNoAnchor.mix; | %Tasks-nonoop.class;)*>
-<!ATTLIST %anchor.qname;
-	%Common.attrib; 
-	accesskey CDATA #IMPLIED
->
-<!-- ============================================ -->
-<!-- 
-	WML extensions of XHTML elements
--->
-<!-- ============================================ -->
-<!-- 
-	select 
-	
-	*WML iname, ivalue, value, and name attributes
-	*XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %select.qname;
-	%att.iname.qname; NMTOKEN #IMPLIED
-	%att.value.qname; CDATA #IMPLIED
-	%att.ivalue.qname; CDATA #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	input 
-	
-	*WML format, emptyok, and name attributes
-	*XHTML tabindex (not in Basic Forms module)
--->
-<!ATTLIST %input.qname;
-	%att.format.qname; CDATA #IMPLIED
-	%att.emptyok.qname; %Boolean.datatype; #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	textarea
-	
-	*WML format, emptyok, and name attributes
-	*XHTML tabindex attribute (not in Basic Forms module)
--->
-<!ATTLIST %textarea.qname;
-	%att.format.qname; CDATA #IMPLIED
-	%att.emptyok.qname; %Boolean.datatype; #IMPLIED
-	%att.name.qname; CDATA #IMPLIED
->
-<!-- 
-	option
-	
-	*WML onpick attribute
--->
-<!ATTLIST %option.qname;
-	%att.onpick.qname; CDATA #IMPLIED
->
-<!-- 
-	img 
-
-	*WML localsrc attribute
--->
-<!ATTLIST img
-	%att.localsrc.qname; CDATA #IMPLIED
-	%att.type.qname; %ContentType.datatype; #IMPLIED
->
-<!-- 
-	table 
-	
-	*WML columns attribute
-	
--->
-<!ATTLIST %table.qname;
-	%att.columns.qname; %Number.datatype; #IMPLIED
->
-<!-- 
-	body 
-	
-	*WML newcontext 
-	*WML event attributes
--->
-<!ATTLIST %body.qname;
-	%att.newcontext.qname; %Boolean.datatype; "false"
-	%WML.event.attrib; 
->
-<!-- 
-	html 
-	
-	*Declaration of WML namespace with prefix	
-	*WML event attributes
--->
-<!ATTLIST %html.qname;
-	%WML.xmlns.extra.attrib; 
-	%WML.event.attrib; 
->
-
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
-       "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-<!-- WML Deprecated Module  .................................... -->
-<!-- file: wml-deprecated-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
-       SYSTEM "wml-deprecated-1.mod"
-
-	This module contains deprecated elements and attributes.
-	
-		Attributes: WML mode, XHTML align, XHTML vspace, XHTML hspace
-		
-		Elements: u, b, big, i, small 
-		
--->
-<!-- 
-	p 
-	
-	*WML mode
-	*XHTML align
-	
-	Replacement: Use CSS style sheets 
--->
-<!ATTLIST %p.qname;
-	%att.mode.qname; (wrap | nowrap) #IMPLIED
-	align (left | right | center) "left"
->
-<!-- 
-	table 
-	
-	*WML align 
-	
-	Note: The WML align attribute is not the same as the XHTML attribute with the same name.
--->
-<!ATTLIST %table.qname;
-	%att.align.qname; CDATA #IMPLIED
->
-<!-- 
-	img 
-	
-	*XHTML vspace, hspace, align
-	
-	Replacement: Use CSS style sheets 
--->
-<!ATTLIST img
-	vspace CDATA "0"
-	hspace CDATA "0"
-	align (top | middle | bottom) "bottom"
->
-<!-- 
-	Inline Presentation 
-	
-	*XHTML  b, big, i, small	
-	
-	Replacement: Use CSS style sheets 
--->
-<!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"
-		"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: wml20-flat.dtd,v 1.1 2004/03/17 04:23:58 pavery 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 -->
-
-<!-- 
-	u
-
-	This element is not available in the XHTML inline presentation module.
-	It was deprecated already in HTML 4.0.
-	
-	Replacement: Use CSS style sheets 
--->
-<!ENTITY % u.content "( #PCDATA | %Inline.mix; )*">
-<!ENTITY % u.qname "u">
-<!ELEMENT %u.qname; %u.content;>
-<!ATTLIST %u.qname;
-	%Common.attrib; 
->
-<!-- 
-	meta 
-	
-	*WML forua attribute
--->
-<!ATTLIST %meta.qname;
-	%att.forua.qname; %Boolean.datatype; "true"
->
-<!--
-	html
-	
-	*WML use-xml-fragment attribute
--->
-<!ATTLIST %html.qname;
-	%att.usexmlfragment.qname; 	%Boolean.datatype; "true"
->
-
-
-
-<!-- end of WML 2.0 DTD  ........................................... -->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod
deleted file mode 100644
index d2d7621c8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod
+++ /dev/null
@@ -1,184 +0,0 @@
-<!-- WML 2.0 Document Model Module  .................................... -->
-<!-- file: wml20-model-1.mod -->
-<!-- 
-    @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 DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//WAPFORUM//ENTITIES WML 2.0 Document Model 1.0//EN"
-       SYSTEM "http://www.wapforum.org/dtd/wml20-model-1.mod"
-      
-     This module describes the groupings of elements that make up
-     common content models for WML and XHTML elements.
-
-     Three basic content models are declared:
-
-         %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).
-     
-        	     
--->
-<!-- 
-	Optional Elements in head  
--->
-<!ENTITY % HeadOpts.mix "( %meta.qname; 
-		| %link.qname; 
-		| %style.qname; 
-		| %object.qname; 
-		| %access.qname;)*">
-<!-- 
-	Task elements
-
-	Used for the WML do and onevent elements
--->
-<!ENTITY % Tasks.class "(%go.qname; 
-		| %prev.qname; 
-		| %noop.qname; 
-		| %refresh.qname;)">
-<!-- 
-	Tasks without noop element
-
-	Used for the WML anchor
--->
-<!ENTITY % Tasks-nonoop.class "%go.qname; 
-		| %prev.qname; 
-		| %refresh.qname;">
-<!--
-	Do element
--->
-<!ENTITY % Do.class "%do.qname;">
-<!-- 
-	Miscellaneous Elements  
-	
-	This is not used for anything right now. 
--->
-<!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;
-	| %u.qname;">
-<!ENTITY % I18n.class "">
-<!ENTITY % Anchor.class "| %a.qname; 
-	| %anchor.qname; | %do.qname;">
-<!ENTITY % InlSpecial.class "| %img.qname; 
-	 | %object.qname; 
-	| %getvar.qname;">
-<!ENTITY % InlForm.class "| %input.qname; 
-	 | %select.qname; 
-	 | %textarea.qname;
-         | %label.qname;">
-<!ENTITY % Inline.extra "">
-<!ENTITY % Inline.class "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;">
-<!ENTITY % InlNoAnchor.class "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.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 % Block.mix "%Heading.class;
-      | %List.class;
-      | %Block.class;     
-      | %Do.class;
-      %Misc.class;">
-<!ENTITY % BlkNoForm.mix "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname;
-      %Block.extra;
-      %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;">
-<!-- 	
-	Template level elements 
--->
-<!ENTITY % Template.mix "( %onevent.qname;)*">
-<!-- 
-	Content model of the WML card and XHTML body elements
--->
-<!ENTITY % CardBody.mix "(%onevent.qname;*, %timer.qname;?,  ( %Block.mix; )+)">
-<!-- end of wml20-model-1.mod -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd
deleted file mode 100644
index 7d6f8d31f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd
+++ /dev/null
@@ -1,154 +0,0 @@
-<!-- WML 2.0 DTD  ...................................................... -->
-<!-- file: wml20.dtd -->
-<!-- 
-    @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 WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
-         "-//WAPFORUM//DTD WML 2.0//EN"
-                   	          
-     For example, if you are using WML 2.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 WML 2.0//EN"
-                               "http://www.wapforum.org/dtd/wml20.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-                   xmlns:wml="http://www.wapforum.org/2001/wml">
-         ...
-         </html>
-
--->
-<!-- ============================================ -->
-<!--
-		Version, XML Namespaces, and profile information 
--->
-<!-- ============================================ -->
-<!--
-	Value of XHTML version attribute 
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!-- 
-	Value of XHTML profile attribute
-	
-	Reserved for future use with document profiles 
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
-		Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-framework-1.mod">
-%wml-framework.mod;
-<!-- ============================================ -->
-<!--
-		XHTML modules 
--->
-<!-- ============================================ -->
-<!-- Text Module  ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
-      | %InlStruct.class; | %i.qname; | %b.qname; 
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; 
-	| %getvar.qname;
-	| %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!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.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.mod;
-<!-- 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-list.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-image.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.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-object.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-table.mod;
-<!-- Forms Module  ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
-	%Common.attrib; 	
-	label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
-	%Common.attrib; 
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
-      | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-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-basic-form.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.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-meta.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.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-style.mod;
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!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-struct.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-blkpres.mod;
-<!-- ============================================ -->
-<!--
-		WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-special-1.mod">
-%wml-special.mod;
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
-       "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-%wml-deprecated.mod;
-<!-- end of WML 2.0 DTD  ........................................... -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd
deleted file mode 100644
index 060f7df16..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-Wireless Telephony Applications Wireless Markup Language (WTA-WML) Document Type Definition.
-WTA-WML is an XML language. Typical usage:
-<?xml version="1.0"?>
-<!DOCTYPE wta-wml PUBLIC "-//WAPFORUM//DTD WTA-WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wta-wml12.dtd">
-<wta-wml>
-...
-</wta-wml>
--->
-
-<!ENTITY % wml-dtd PUBLIC "-//WAPFORUM//DTD WML 1.2//EN"
-	"http://www.wapforum.org/DTD/wml12.dtd">
-
-%wml-dtd;
-
-<!ELEMENT wta-wml ( head?, template?, card+ )>
-<!ATTLIST wta-wml
-	xml:lang		NMTOKEN	#IMPLIED
-	%coreattrs;
->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd
deleted file mode 100644
index 7a3e73b44..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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 2004/03/17 04:23:57 pavery 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/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod
deleted file mode 100644
index 380e25efe..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- ....................................................................... -->
-<!-- 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 -->
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd
deleted file mode 100644
index 5eb6b2bfd..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd
+++ /dev/null
@@ -1,189 +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-inlstyle.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-framework.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.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.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-list.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-image.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-table.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-form.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.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-meta.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.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-style.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.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-object.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-struct.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-blkpres.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-inlpres.mod;
-
-<!-- end of XHTML Mobile 1.0 DTD  ........................................... -->
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd
deleted file mode 100644
index 957e955e5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0037)http://www.wapforum.org/DTD/wml20.dtd -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 5.50.4912.300" name=GENERATOR></HEAD>
-<BODY><XMP><!-- WML 2.0 DTD  ...................................................... -->
-<!-- file: wml20.dtd -->
-<!-- 
-    @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 WML 2.0 DTD driver file. Please use this formal public identifier to identify it:
-
-         "-//WAPFORUM//DTD WML 2.0//EN"
-                   	          
-     For example, if you are using WML 2.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 WML 2.0//EN"
-                               "http://www.wapforum.org/dtd/wml20.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-                   xmlns:wml="http://www.wapforum.org/2001/wml">
-         ...
-         </html>
-
--->
-<!-- ============================================ -->
-<!--
-		Version, XML Namespaces, and profile information 
--->
-<!-- ============================================ -->
-<!--
-	Value of XHTML version attribute 
--->
-<!ENTITY % XHTML.version "-//WAPFORUM//DTD WML 2.0//EN">
-<!-- 
-	Value of XHTML profile attribute
-	
-	Reserved for future use with document profiles 
--->
-<!ENTITY % XHTML.profile "">
-<!-- ============================================ -->
-<!--
-		Modularisation framework setup
--->
-<!-- ============================================ -->
-<!ENTITY % wml-framework.mod PUBLIC "-//WAPFORUM//ENTITIES WML Modular Framework 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-framework-1.mod">
-%wml-framework.mod;
-<!-- ============================================ -->
-<!--
-		XHTML modules 
--->
-<!-- ============================================ -->
-<!-- Text Module  ............................................... -->
-<!ENTITY % pre.content "( #PCDATA
-      | %InlStruct.class; | %i.qname; | %b.qname; 
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; 
-	| %getvar.qname;
-	| %input.qname;| %select.qname;)*">
-<!ENTITY % p.content "( #PCDATA | %Inline.mix; | %table.qname; | %fieldset.qname;)*">
-<!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.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.mod;
-<!-- 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-list.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-image.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.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-object.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-table.mod;
-<!-- Forms Module  ............................................... -->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
-	%Common.attrib; 	
-	label %Text.datatype; #REQUIRED
->
-<!ENTITY % option.content "( #PCDATA | %onevent.qname;| %getvar.qname;)*">
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
-	%Common.attrib; 
->
-<!ENTITY % textarea.content "( #PCDATA | %getvar.qname; )*">
-<!ENTITY % form.content "( %BlkNoForm.mix;
-      | %fieldset.qname; )+">
-<!ENTITY % xhtml-basic-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-basic-form.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.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-meta.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.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-style.mod;
-<!-- Document Structure Module ......................................... -->
-<!ENTITY % html.content "( %head.qname;, %Template.mix;, (%body.qname; | (%card.qname;+)))">
-<!ENTITY % body.content "(%CardBody.mix;)">
-<!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-struct.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-blkpres.mod;
-<!-- ============================================ -->
-<!--
-		WML Declarations
--->
-<!-- ============================================ -->
-<!-- Special WML elements........................................ -->
-<!ENTITY % wml-special.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Special 1.0//EN"
-            "http://www.wapforum.org/DTD/wml-special-1.mod">
-%wml-special.mod;
-<!-- Deprecated WML elements.................................. -->
-<!ENTITY % wml-deprecated.mod PUBLIC "-//WAPFORUM//ELEMENTS WML Deprecated 1.0//EN"
-       "http://www.wapforum.org/DTD/wml-deprecated-1.mod">
-%wml-deprecated.mod;
-<!-- end of WML 2.0 DTD  ........................................... -->
-</XMP></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd b/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd
deleted file mode 100644
index 93321c6b3..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/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: 2000/01/26 14:08:56 $
-
--->
-
-<!--================ 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/tests/org.eclipse.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.core.tests/.cvsignore b/tests/org.eclipse.wst.css.core.tests/.cvsignore
deleted file mode 100644
index 28e041b54..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
diff --git a/tests/org.eclipse.wst.css.core.tests/.project b/tests/org.eclipse.wst.css.core.tests/.project
deleted file mode 100644
index 34797db86..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fa6199e08..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:25 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
deleted file mode 100644
index 81bd36acf..000000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               csscoretests.jar,\
-               src/
-src.includes = plugin.xml,\
-               src/,\
-               test.xml
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.xml b/tests/org.eclipse.wst.css.core.tests/plugin.xml
deleted file mode 100644
index 48474bf69..000000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-	id="org.eclipse.wst.css.core.tests"
-	name="CSS Core Tests Plug-in"
-	version="1.0.0"
-	provider-name="Eclipse.org"
-	class="org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin">
-
-	<runtime>
-		<library name="csscoretests.jar">
-			<export name="*" />
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.eclipse.wst.css.core" />
-		<import plugin="org.junit" />
-		<import plugin="org.eclipse.wst.sse.core" />
-  <import plugin="org.eclipse.core.resources"/>
-  <import plugin="org.eclipse.core.runtime"/>
-	</requires>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
deleted file mode 100644
index 4046b8eb9..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,56 +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.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.core.tests.model.BUG73990SelectorFormatTest;
-import org.eclipse.wst.css.core.tests.model.CSSCharsetRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFaceRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSPageRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleSheetTest;
-import org.eclipse.wst.css.core.tests.source.CSSSelectorTest;
-import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-
-
-public class CSSAllTests extends TestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
-		addSourceTests(suite);
-		addModelTests(suite);
-
-		suite.addTestSuite(CSSCorePreferencesTest.class);
-		return suite;
-	}
-
-	private static void addSourceTests(TestSuite suite) {
-		suite.addTestSuite(CSSSourceParserTest.class);
-		suite.addTestSuite(CSSTextParserTest.class);
-		suite.addTestSuite(CSSSelectorTest.class);
-		suite.addTestSuite(CSSUrlTest.class);
-	}
-
-	private static void addModelTests(TestSuite suite) {
-		suite.addTestSuite(CSSStyleSheetTest.class);
-		suite.addTestSuite(CSSCharsetRuleTest.class);
-		suite.addTestSuite(CSSImportRuleTest.class);
-		suite.addTestSuite(CSSStyleRuleTest.class);
-		suite.addTestSuite(CSSMediaRuleTest.class);
-		suite.addTestSuite(CSSPageRuleTest.class);
-		suite.addTestSuite(CSSFontFaceRuleTest.class);
-		suite.addTestSuite(BUG73990SelectorFormatTest.class);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
deleted file mode 100644
index f609c6a48..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
+++ /dev/null
@@ -1,129 +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.css.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CSSCorePreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.xml.core";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, CSSCorePreferenceNames.INDENTATION_SIZE);
-		bundleGetPreference(bundleName, CSSCorePreferenceNames.LINE_WIDTH);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		int defaultValue = -1;
-
-		int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
-		assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginGetDefaultPreference(node, CSSCorePreferenceNames.CASE_IDENTIFIER, "2");
-		pluginGetDefaultPreference(node, CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-	}
-
-	private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-		
-		String theDefaultValue = node.get(prefKey, defaultValue);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IEclipsePreferences node = new InstanceScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginSetPreferenceBoolean(node, CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
-		pluginSetPreferenceInt(node, CSSCorePreferenceNames.CASE_PROPERTY_NAME);
-	}
-
-	private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
-		boolean originalValue = false;
-		boolean expectedValue = true;
-		
-		String originalString = node.get(prefKey, "bogus");
-		if (!"bogus".equals(originalString)) {
-			originalValue = Boolean.valueOf(originalString).booleanValue();
-			expectedValue = !originalValue;
-		}
-		node.putBoolean(prefKey, expectedValue);
-		boolean foundValue = node.getBoolean(prefKey, true);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-		
-		// attempt to restore original preference value
-		if ("bogus".equals(originalString))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalString);
-	}
-
-	private void pluginSetPreferenceInt(IEclipsePreferences node, String prefKey) {
-		int originalValue = node.getInt(prefKey, -999);
-		int expectedValue = -888;
-		node.putInt(prefKey, expectedValue);
-		int foundValue = node.getInt(prefKey, -999);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if (originalValue == -999)
-			node.remove(prefKey);
-		else
-			node.putInt(prefKey, originalValue);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
deleted file mode 100644
index edb47a272..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
+++ /dev/null
@@ -1,31 +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.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author pavery
- */
-public class CSSCoreTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new CSSCoreTestSuite();
-	}
-
-	public CSSCoreTestSuite() {
-		super("CSS Core Tests");
-
-		addTest(CSSAllTests.suite());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
deleted file mode 100644
index 19dc51656..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.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.css.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCoreTestsPlugin extends Plugin {
-	// The shared instance.
-	private static CSSCoreTestsPlugin plugin;
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public CSSCoreTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.css.core.tests.CSSModelTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = CSSCoreTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
deleted file mode 100644
index 87d88c08a..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,173 +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.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-public class AbstractModelTest extends TestCase {
-	protected ICSSModel fModel = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
-		fModel = FileUtil.createModel();
-	}
-
-	protected void tearDown() throws Exception {
-		if (fModel != null) {
-			fModel.releaseFromEdit();
-			fModel = null;
-		}
-		super.tearDown();
-	}
-
-	protected ICSSModel getModel() {
-		return fModel;
-	}
-
-	protected ICSSStyleSheet getStyleSheet() {
-		return (ICSSStyleSheet) fModel.getDocument();
-	}
-
-	class PrimitiveNumber {
-		short type;
-		float value;
-
-		PrimitiveNumber(short newType, float newValue) {
-			type = newType;
-			value = newValue;
-		}
-	}
-
-	class PrimitiveString {
-		short type;
-		String value;
-
-		PrimitiveString(short newType, String newValue) {
-			type = newType;
-			value = newValue;
-		}
-	}
-
-	/* for int, float */
-	protected void checkPrimitiveNumber(CSSValue actual, PrimitiveNumber expected) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		assertEquals(expected.value, ((CSSPrimitiveValue) actual).getFloatValue(expected.type), 0);
-	}
-
-	/* for string */
-	protected void checkPrimitiveString(CSSValue actual, PrimitiveString expected) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		assertEquals(expected.value, ((CSSPrimitiveValue) actual).getStringValue());
-	}
-
-	/* for counter */
-	protected void checkPrimitiveCounter(CSSValue actual, String identifier, String listStyle, String separator) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_COUNTER, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		Counter counter = ((CSSPrimitiveValue) actual).getCounterValue();
-		assertEquals(identifier, counter.getIdentifier());
-		assertEquals(listStyle, counter.getListStyle());
-		assertEquals(separator, counter.getSeparator());
-	}
-
-	/* for rect */
-	protected void checkPrimitiveRect(CSSValue actual, Object[] expectedArray) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_RECT, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		Rect rect = ((CSSPrimitiveValue) actual).getRectValue();
-		CSSPrimitiveValue value;
-		Object expected;
-		value = rect.getTop();
-		expected = expectedArray[0];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getRight();
-		expected = expectedArray[1];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getBottom();
-		expected = expectedArray[2];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getLeft();
-		expected = expectedArray[3];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-	}
-
-	/* for rgb */
-	protected void checkPrimitiveRgb(CSSValue actual, Object[] expectedArray) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_RGBCOLOR, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		RGBColor color = ((CSSPrimitiveValue) actual).getRGBColorValue();
-		CSSPrimitiveValue value;
-		Object expected;
-		value = color.getRed();
-		expected = expectedArray[0];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = color.getGreen();
-		expected = expectedArray[1];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = color.getBlue();
-		expected = expectedArray[2];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java
deleted file mode 100644
index bec24c6e1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class BUG73990SelectorFormatTest extends AbstractModelTest {
-	public void testInsertText1() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString(
-				"src/org/eclipse/wst/css/core/tests/testfiles",
-				"BUG73990_selector_unformatted.css"));
-
-		(new FormatProcessorCSS()).formatModel(model);
-
-		String expected = FileUtil.createString(
-				"src/org/eclipse/wst/css/core/tests/testfiles/results",
-				"BUG73990_selector_formatted.css");
-		// Note: FileUtil.createString() added a commonEOL to the expected
-		// string. We have to concat a commonEOL to the actual string.
-		String actual = structuredDocument.get().concat(FileUtil.commonEOL);
-		assertEquals(expected, actual);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
deleted file mode 100644
index d00a9b0c2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-public class CSSCharsetRuleTest extends AbstractModelTest {
-	private final String RULE = "@charset \"iso-8859-1\";";
-
-	public void testInsertRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSCharsetRule);
-		CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
-		assertEquals("iso-8859-1", charsetRule.getEncoding());
-		assertEquals(RULE, charsetRule.getCssText());
-	}
-
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		CSSCharsetRule newRule = doc.createCSSCharsetRule();
-		newRule.setEncoding("iso-8859-1");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSCharsetRule);
-		CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
-		assertEquals("iso-8859-1", charsetRule.getEncoding());
-		assertEquals(RULE, charsetRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
deleted file mode 100644
index dcb5fdf88..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,265 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSFontFaceRuleTest extends AbstractModelTest {
-	public void testInsertRule() {
-		final String RULE = "@font-face { font-family: \"Swiss 721\"; src: url(swiss721.pfr); /* The expanded Swiss 721 */ font-stretch: expanded; }";
-		CSSStyleSheet sheet = getStyleSheet();
-		assertEquals(0, sheet.insertRule(RULE, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		CSSStyleDeclaration declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(3, declaration.getLength());
-
-		CSSValue value;
-		CSSPrimitiveValue primitiveValue;
-
-		value = declaration.getPropertyCSSValue("font-family");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_STRING, primitiveValue.getPrimitiveType());
-		assertEquals("Swiss 721", primitiveValue.getStringValue());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_URI, primitiveValue.getPrimitiveType());
-		assertEquals("swiss721.pfr", primitiveValue.getStringValue());
-
-		value = declaration.getPropertyCSSValue("font-stretch");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_IDENT, primitiveValue.getPrimitiveType());
-		assertEquals("expanded", primitiveValue.getStringValue());
-	}
-
-	public void testInsertText1() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 1
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(4, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("font-family");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Swiss 721"));
-
-		value = declaration.getPropertyCSSValue("src");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "swiss721blk.pfr"));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 800));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 900));
-	}
-
-	public void testInsertText2() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 2
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(6, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(9, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Palatino"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Times New Roman"));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(4), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "New York"));
-		checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(6), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Utopia"));
-		checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(8), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://somewhere/free/font"));
-
-		value = declaration.getPropertyCSSValue("font-family");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(9, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 100));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 200));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
-		checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
-		checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
-		value = declaration.getPropertyCSSValue("font-variant");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
-		value = declaration.getPropertyCSSValue("font-size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "all"));
-	}
-
-	public void testInsertText3() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 3
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(5, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(4, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Alabama Italic"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.fonts.org/A/alabama-italic"));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truetype"));
-
-		value = declaration.getPropertyCSSValue("panose-1");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(10, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(3), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(5), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
-		checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(7), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 9));
-		checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-		checkPrimitiveNumber(valueList.item(9), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-
-		value = declaration.getPropertyCSSValue("font-family");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Alabama"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(5, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "oblique"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
deleted file mode 100644
index fc579b581..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,94 +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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSImportRuleTest extends AbstractModelTest {
-
-	public void testInsertRuleDoubleQuote() {
-		checkInsert("@import \"dummy.css\";", "dummy.css", null);
-	}
-
-	public void testInsertRuleSingleQuote() {
-		checkInsert("@import \'dummy.css\';", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlNoQuote() {
-		checkInsert("@import url(dummy.css);", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlDoubleQuote() {
-		checkInsert("@import url(\"dummy.css\");", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlSingleQuote() {
-		checkInsert("@import url(\'dummy.css\');", "dummy.css", null);
-	}
-
-	public void testInsertRuleMedia1() {
-		checkInsert("@import url(\"dummy.css\") media1;", "dummy.css", new String[]{"media1"});
-	}
-
-	public void testInsertRuleMedia2() {
-		checkInsert("@import url(\'dummy.css\') media1, media2;", "dummy.css", new String[]{"media1", "media2"});
-	}
-
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		ICSSImportRule newRule = doc.createCSSImportRule();
-		newRule.setHref("dummy.css");
-		MediaList newList = newRule.getMedia();
-		newList.appendMedium("media1");
-		newList.appendMedium("media2");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSImportRule);
-		CSSImportRule importRule = (CSSImportRule) rule;
-		assertEquals("dummy.css", importRule.getHref());
-		MediaList mediaList = importRule.getMedia();
-		assertEquals(2, mediaList.getLength());
-		assertEquals("media1", mediaList.item(0));
-		assertEquals("media2", mediaList.item(1));
-
-		assertEquals("@import url(\"dummy.css\") media1, media2;", importRule.getCssText());
-	}
-
-	private void checkInsert(String ruleString, String href, String[] media) {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(ruleString, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSImportRule);
-
-		CSSImportRule importRule = (CSSImportRule) rule;
-		assertEquals(href, importRule.getHref());
-
-		if (media != null) {
-			assertEquals(media.length, importRule.getMedia().getLength());
-			for (int i = 0; i < media.length; i++) {
-				assertEquals(media[i], importRule.getMedia().item(i));
-			}
-		}
-
-		assertEquals(ruleString, importRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
deleted file mode 100644
index 306d9a1d6..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,42 +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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSMediaRuleTest extends AbstractModelTest {
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		ICSSMediaRule newRule = doc.createCSSMediaRule();
-		MediaList newList = newRule.getMedia();
-		newList.appendMedium("media1");
-		newList.appendMedium("media2");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSMediaRule);
-		CSSMediaRule mediaRule = (CSSMediaRule) rule;
-
-		MediaList mediaList = mediaRule.getMedia();
-		assertEquals(2, mediaList.getLength());
-		assertEquals("media1", mediaList.item(0));
-		assertEquals("media2", mediaList.item(1));
-
-		assertEquals("@media media1, media2 {" + FileUtil.commonEOL + "}", mediaRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
deleted file mode 100644
index 78ec435f3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,215 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSPageRuleTest extends AbstractModelTest {
-	public void testInsertText1() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 1
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(2, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, (float) 8.5));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 11));
-
-		value = declaration.getPropertyCSSValue("margin");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 2));
-	}
-
-	public void testInsertText2() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 2
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "auto"));
-
-		value = declaration.getPropertyCSSValue("margin");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 10));
-	}
-
-	public void testInsertText3() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 3
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals(":left", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("margin-left");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-
-		value = declaration.getPropertyCSSValue("margin-right");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-	}
-
-	public void testInsertText4() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 4
-
-		rule = ruleList.item(3);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals(":right", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("margin-left");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-
-		value = declaration.getPropertyCSSValue("margin-right");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-	}
-
-	public void testInsertText5() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 5
-
-		rule = ruleList.item(4);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals("narrow", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(1, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(2, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 9));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 18));
-	}
-
-	public void testInsertText6() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 6
-
-		rule = ruleList.item(5);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals("rotated", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(1, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "landscape"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
deleted file mode 100644
index ee8d938c8..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,218 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSStyleRuleTest extends AbstractModelTest {
-	public void testInsertTextNumbers() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(19, declaration.getLength());
-
-		// 01
-		value = declaration.getPropertyCSSValue("NUMBER");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_NUMBER, 123.456f));
-
-		// 02
-		value = declaration.getPropertyCSSValue("PERCENTAGE");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 123.456f));
-
-		// 03
-		value = declaration.getPropertyCSSValue("EMS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EMS, 123.456f));
-
-		// 04
-		value = declaration.getPropertyCSSValue("EXS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EXS, 123.456f));
-
-		// 05
-		value = declaration.getPropertyCSSValue("PX");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, 123.456f));
-
-		// 06
-		value = declaration.getPropertyCSSValue("CM");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 123.456f));
-
-		// 07
-		value = declaration.getPropertyCSSValue("MM");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MM, 123.456f));
-
-		// 08
-		value = declaration.getPropertyCSSValue("IN");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 123.456f));
-
-		// 09
-		value = declaration.getPropertyCSSValue("PT");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PT, 123.456f));
-
-		// 10
-		value = declaration.getPropertyCSSValue("PC");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PC, 123.456f));
-
-		// 11
-		value = declaration.getPropertyCSSValue("DEG");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DEG, -123.456f));
-
-		// 12
-		value = declaration.getPropertyCSSValue("RAD");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_RAD, 123.456f));
-
-		// 13
-		value = declaration.getPropertyCSSValue("GRAD");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_GRAD, 123.456f));
-
-		// 14
-		value = declaration.getPropertyCSSValue("MS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MS, 123.456f));
-
-		// 15
-		value = declaration.getPropertyCSSValue("S");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_S, 123.456f));
-
-		// 16
-		value = declaration.getPropertyCSSValue("HZ");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_HZ, 123.456f));
-
-		// 17
-		value = declaration.getPropertyCSSValue("KHZ");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_KHZ, 123.456f));
-
-		// 18
-		value = declaration.getPropertyCSSValue("DIMENSION");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DIMENSION, -123.456f));
-
-		// 19
-		value = declaration.getPropertyCSSValue("INTEGER");
-		checkPrimitiveNumber(value, new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 123));
-	}
-
-	public void testInsertTextStrings() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(11, declaration.getLength());
-
-		// 01
-		value = declaration.getPropertyCSSValue("STRING");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "string"));
-
-		// 02
-		value = declaration.getPropertyCSSValue("URI");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.ibm.com/"));
-
-		// 03
-		value = declaration.getPropertyCSSValue("IDENT");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "left"));
-
-		// 04
-		value = declaration.getPropertyCSSValue("HASH");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_HASH, "#abcdef"));
-
-		// 05
-		value = declaration.getPropertyCSSValue("URANGE");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_URANGE, "U+20A7"));
-
-		// 06
-		value = declaration.getPropertyCSSValue("SLASH");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_SLASH, "/"));
-
-		// 07
-		value = declaration.getPropertyCSSValue("COMMA");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-
-		// 08
-		value = declaration.getPropertyCSSValue("INHERIT_PRIMITIVE");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE, "inherit"));
-
-		// 09
-		value = declaration.getPropertyCSSValue("ATTR");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_ATTR, "KEY"));
-
-		// 10
-		value = declaration.getPropertyCSSValue("FORMAT");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truedoc"));
-
-		// 11
-		value = declaration.getPropertyCSSValue("LOCAL");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Excelsior Roman"));
-	}
-
-	public void testInsertTextFunctions() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(3, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("COUNTER");
-		checkPrimitiveCounter(value, "par-num", "upper-roman", null);
-
-		value = declaration.getPropertyCSSValue("RECT");
-		checkPrimitiveRect(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 12), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 34), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 56), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 78)});
-
-		value = declaration.getPropertyCSSValue("RGBCOLOR");
-		checkPrimitiveRgb(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 255), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 128), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 0)});
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
deleted file mode 100644
index c23ceb4a3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
+++ /dev/null
@@ -1,74 +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.css.core.tests.model;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-public class CSSStyleSheetTest extends AbstractModelTest {
-	private final static String RULE_H1 = "H1 { color : red; }";
-	private final static String RULE_H2 = "H2 { color : red; }";
-	private final static String RULE_H3 = "H3 { color : red; }";
-
-	public void testInsertRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE_H3, 0));
-		assertEquals(0, sheet.insertRule(RULE_H1, 0));
-		assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule;
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-		rule = ruleList.item(1);
-		assertEquals(RULE_H2, rule.getCssText());
-		rule = ruleList.item(2);
-		assertEquals(RULE_H3, rule.getCssText());
-
-	}
-
-	public void testDeleteRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE_H3, 0));
-		assertEquals(0, sheet.insertRule(RULE_H1, 0));
-		assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
-		CSSRuleList ruleList;
-		CSSRule rule;
-
-		sheet.deleteRule(1);
-		ruleList = sheet.getCssRules();
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-		rule = ruleList.item(1);
-		assertEquals(RULE_H3, rule.getCssText());
-
-		sheet.deleteRule(1);
-		ruleList = sheet.getCssRules();
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-
-		sheet.deleteRule(0);
-
-		try {
-			sheet.deleteRule(0);
-		}
-		catch (DOMException e) {
-			assertEquals(DOMException.INDEX_SIZE_ERR, e.code);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
deleted file mode 100644
index 4f20c0d9f..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,817 +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.css.core.tests.source;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class CSSSelectorTest extends TestCase {
-	public void testSelector01() {
-		ICSSSelectorList list = createSelectorList("H1, H2, H3");
-		checkSelectorList(list, "H1, H2, H3", 3, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "H2", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(2);
-		checkSelector(selector, "H3", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector02() {
-		ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
-		checkSelectorList(list, "H\\\\, H\\1, H3", 3, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H\\\\", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "H\\1", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H\\1", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(2);
-		checkSelector(selector, "H3", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector03() {
-		ICSSSelectorList list = createSelectorList("H1.pastoral");
-		checkSelectorList(list, "H1.pastoral", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.pastoral", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"pastoral"});
-	}
-
-	public void testSelector04() {
-		ICSSSelectorList list = createSelectorList("P.pastoral.marine");
-		checkSelectorList(list, "P.pastoral.marine", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P.pastoral.marine", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"pastoral", "marine"});
-	}
-
-	public void testSelector05() {
-		ICSSSelectorList list = createSelectorList("*.warning");
-		checkSelectorList(list, "*.warning", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.warning", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"warning"});
-	}
-
-	public void testSelector06() {
-		ICSSSelectorList list = createSelectorList(".warning");
-		checkSelectorList(list, ".warning", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".warning", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"warning"});
-	}
-
-	public void testSelector07() {
-		ICSSSelectorList list = createSelectorList("*[lang=fr]");
-		checkSelectorList(list, "*[lang=fr]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*[lang=fr]", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
-	}
-
-	public void testSelector08() {
-		ICSSSelectorList list = createSelectorList("[lang=fr]");
-		checkSelectorList(list, "[lang=fr]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "[lang=fr]", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
-	}
-
-	public void testSelector09() {
-		ICSSSelectorList list = createSelectorList("*#myid");
-		checkSelectorList(list, "*#myid", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*#myid", 1, 10000, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"myid"});
-	}
-
-	public void testSelector10() {
-		ICSSSelectorList list = createSelectorList("#myid");
-		checkSelectorList(list, "#myid", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "#myid", 1, 10000, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"myid"});
-	}
-
-	public void testSelector11() {
-		ICSSSelectorList list = createSelectorList("H1#z98y");
-		checkSelectorList(list, "H1#z98y", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1#z98y", 1, 10001, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"z98y"});
-	}
-
-	public void testSelector12() {
-		ICSSSelectorList list = createSelectorList("H1 EM");
-		checkSelectorList(list, "H1 EM", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1 EM", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector13() {
-		ICSSSelectorList list = createSelectorList("DIV * P");
-		checkSelectorList(list, "DIV * P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV * P", 5, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector14() {
-		ICSSSelectorList list = createSelectorList("DIV P *[href]");
-		checkSelectorList(list, "DIV P *[href]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV P *[href]", 5, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"href"});
-	}
-
-	public void testSelector15() {
-		ICSSSelectorList list = createSelectorList("BODY > P");
-		checkSelectorList(list, "BODY > P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "BODY > P", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "BODY", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector16() {
-		ICSSSelectorList list = createSelectorList("DIV OL>LI P");
-		checkSelectorList(list, "DIV OL > LI P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV OL > LI P", 7, 4, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "OL", false, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "LI", false, 0, 0, 0, 0);
-
-		item = selector.getItem(5);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(6);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector17() {
-		ICSSSelectorList list = createSelectorList("MATH + P");
-		checkSelectorList(list, "MATH + P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "MATH + P", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "MATH", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector18() {
-		ICSSSelectorList list = createSelectorList("H1.opener + H2");
-		checkSelectorList(list, "H1.opener + H2", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.opener + H2", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"opener"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector19() {
-		ICSSSelectorList list = createSelectorList("EXAMPLE[notation=decimal]");
-		checkSelectorList(list, "EXAMPLE[notation=decimal]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "EXAMPLE[notation=decimal]", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "EXAMPLE", false, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"notation=decimal"});
-	}
-
-	public void testSelector20() {
-		ICSSSelectorList list = createSelectorList("SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]");
-		checkSelectorList(list, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "SPAN", false, 2, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"hello=\"Cleveland\"", "goodbye=\"Columbus\""});
-	}
-
-	public void testSelector21() {
-		ICSSSelectorList list = createSelectorList("DIV > P:first-child");
-		checkSelectorList(list, "DIV > P:first-child", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV > P:first-child", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-	}
-
-	public void testSelector22() {
-		ICSSSelectorList list = createSelectorList("P:first-child EM");
-		checkSelectorList(list, "P:first-child EM", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P:first-child EM", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector23() {
-		ICSSSelectorList list = createSelectorList("* > A:first-child");
-		checkSelectorList(list, "* > A:first-child", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "* > A:first-child", 3, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-	}
-
-	public void testSelector24() {
-		ICSSSelectorList list = createSelectorList("A:link");
-		checkSelectorList(list, "A:link", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "A:link", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-	}
-
-	public void testSelector25() {
-		ICSSSelectorList list = createSelectorList(":link");
-		checkSelectorList(list, ":link", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ":link", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-	}
-
-	public void testSelector26() {
-		ICSSSelectorList list = createSelectorList("A:focus:hover");
-		checkSelectorList(list, "A:focus:hover", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "A:focus:hover", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 2);
-		checkSimpleSelectorPseudoNames(item, new String[]{"focus", "hover"});
-	}
-
-	public void testSelector27() {
-		ICSSSelectorList list = createSelectorList("HTML:lang(de) > Q");
-		checkSelectorList(list, "HTML:lang(de) > Q", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "HTML:lang(de) > Q", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "HTML", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"lang(de)"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "Q", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector28() {
-		ICSSSelectorList list = createSelectorList("P > A:link, A.external:visited");
-		checkSelectorList(list, "P > A:link, A.external:visited", 2, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P > A:link", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "A.external:visited", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
-		checkSimpleSelectorClasses(item, new String[]{"external"});
-		checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
-	}
-
-	public void testSelector29() {
-		ICSSSelectorList list = createSelectorList("P#hoge98 + *:hover > A:link, A.external:visited");
-		checkSelectorList(list, "P#hoge98 + *:hover > A:link, A.external:visited", 2, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P#hoge98 + *:hover > A:link", 5, 10202, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"hoge98"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"hover"});
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "A.external:visited", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
-		checkSimpleSelectorClasses(item, new String[]{"external"});
-		checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
-	}
-
-	public void testSelector30() {
-		ICSSSelectorList list = createSelectorList("H1.123");
-		checkSelectorList(list, "H1.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.123", 1, 101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector31() {
-		ICSSSelectorList list = createSelectorList("P.123.456");
-		checkSelectorList(list, "P.123.456", 1, 2);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P.123.456", 1, 201, 2);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123", "456"});
-	}
-
-	public void testSelector32() {
-		ICSSSelectorList list = createSelectorList("*.123");
-		checkSelectorList(list, "*.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector33() {
-		ICSSSelectorList list = createSelectorList(".123");
-		checkSelectorList(list, ".123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector34() {
-		ICSSSelectorList list = createSelectorList("H1.1x3");
-		checkSelectorList(list, "H1.1x3", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.1x3", 1, 101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"1x3"});
-	}
-
-	public void testSelector35() {
-		ICSSSelectorList list = createSelectorList("H2.123#46");
-		checkSelectorList(list, "H2.123#46", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H2.123#46", 1, 10101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H2", false, 0, 1, 1, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-		checkSimpleSelectorIDs(item, new String[]{"46"});
-	}
-
-	public void testSelector36() {
-		ICSSSelectorList list = createSelectorList("H3.1x3#4t2");
-		checkSelectorList(list, "H3.1x3#4t2", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H3.1x3#4t2", 1, 10101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 1, 1, 0);
-		checkSimpleSelectorClasses(item, new String[]{"1x3"});
-		checkSimpleSelectorIDs(item, new String[]{"4t2"});
-	}
-
-	public void testSelector37() {
-		ICSSSelectorList list = createSelectorList("*.123");
-		checkSelectorList(list, "*.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector38() {
-		ICSSSelectorList list = createSelectorList(".123");
-		checkSelectorList(list, ".123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector39() {
-		ICSSSelectorList list = createSelectorList(".123f567");
-		checkSelectorList(list, ".123f567", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123f567", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123f567"});
-	}
-
-
-	private void checkSelectorList(ICSSSelectorList list, String formattedSource, int nSelectors, int nErrors) {
-		assertEquals(formattedSource, list.getString());
-		assertEquals(nSelectors, list.getLength());
-		assertEquals(nErrors, list.getErrorCount());
-	}
-
-	private void checkSelector(ICSSSelector selector, String formattedSource, int items, int specificity, int nErrors) {
-		assertEquals(formattedSource, selector.getString());
-		assertEquals(items, selector.getLength());
-		assertEquals(specificity, selector.getSpecificity());
-		assertEquals(nErrors, selector.getErrorCount());
-	}
-
-	private void checkSimpleSelector(ICSSSelectorItem selector, String formattedSource, boolean isUniversal, int nAttributes, int nClasses, int nIds, int nPseudoNames) {
-		assertTrue(selector instanceof ICSSSimpleSelector);
-		assertEquals(formattedSource, ((ICSSSimpleSelector) selector).getName());
-		assertEquals(isUniversal, ((ICSSSimpleSelector) selector).isUniversal());
-		assertEquals(nAttributes, ((ICSSSimpleSelector) selector).getNumOfAttributes());
-		assertEquals(nClasses, ((ICSSSimpleSelector) selector).getNumOfClasses());
-		assertEquals(nIds, ((ICSSSimpleSelector) selector).getNumOfIDs());
-		assertEquals(nPseudoNames, ((ICSSSimpleSelector) selector).getNumOfPseudoNames());
-	}
-
-	private void checkSimpleSelectorAttributes(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfAttributes();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getAttribute(i));
-		}
-	}
-
-	private void checkSimpleSelectorClasses(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfClasses();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getClass(i));
-		}
-	}
-
-	private void checkSimpleSelectorIDs(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfIDs();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getID(i));
-		}
-	}
-
-	private void checkSimpleSelectorPseudoNames(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfPseudoNames();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getPseudoName(i));
-		}
-	}
-
-	private void checkSelectorCombinator(ICSSSelectorItem combinator, String formattedSource, int combinatorType) {
-		assertTrue(combinator instanceof ICSSSelectorCombinator);
-		assertEquals(formattedSource, ((ICSSSelectorCombinator) combinator).getString());
-		assertEquals(combinatorType, ((ICSSSelectorCombinator) combinator).getCombinatorType());
-	}
-
-	private ICSSSelectorList createSelectorList(String str) {
-		return new CSSSelectorListImpl(str);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
deleted file mode 100644
index 50291de1f..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,217 +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.css.core.tests.source;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-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.ITextRegionList;
-
-/**
- * 
- */
-public class CSSSourceParserTest extends TestCase {
-	public void testSourceOpen1() throws IOException {
-		sourceParserTest("sample01.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen2() throws IOException {
-		sourceParserTest("sample02.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen3() throws IOException {
-		sourceParserTest("sample03.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen4() throws IOException {
-		sourceParserTest("sample04.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen5() throws IOException {
-		sourceParserTest("sample05.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen6() throws IOException {
-		sourceParserTest("sample06.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen7() throws IOException {
-		sourceParserTest("sample07.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend1() throws IOException {
-		sourceParserTest("sample01.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend2() throws IOException {
-		sourceParserTest("sample02.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend3() throws IOException {
-		sourceParserTest("sample03.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend4() throws IOException {
-		sourceParserTest("sample04.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend5() throws IOException {
-		sourceParserTest("sample05.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend6() throws IOException {
-		sourceParserTest("sample06.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend7() throws IOException {
-		sourceParserTest("sample07.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert1() throws IOException {
-		sourceParserTest("sample01.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert2() throws IOException {
-		sourceParserTest("sample02.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert3() throws IOException {
-		sourceParserTest("sample03.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert4() throws IOException {
-		sourceParserTest("sample04.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert5() throws IOException {
-		sourceParserTest("sample05.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert6() throws IOException {
-		sourceParserTest("sample06.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert7() throws IOException {
-		sourceParserTest("sample07.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	private void sourceParserTest(String filename, String mode) throws IOException {
-		ICSSModel model = null;
-		if (mode.equals(MODE_OPEN)) {
-			model = readModelOpen(filename);
-		}
-		else if (mode.equals(MODE_APPEND)) {
-			model = readModelAppend(filename);
-		}
-		else if (mode.equals(MODE_INSERT)) {
-			model = readModelInsert(filename);
-		}
-		String result = dumpRegions(model.getStructuredDocument());
-		compareResult(result, "CSSSourceParserTest-" + filename); //$NON-NLS-1$
-		closeModel(model);
-	}
-
-	private ICSSModel readModelOpen(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.replaceText(null, 0, 0, source);
-
-		return model;
-	}
-
-	private ICSSModel readModelAppend(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			document.replaceText(null, i, 0, source.substring(i, i + 1));
-		}
-
-		return model;
-	}
-
-	private ICSSModel readModelInsert(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			int textIndex = source.length() - i - 1;
-			document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
-		}
-
-		return model;
-	}
-
-	private void closeModel(ICSSModel model) {
-		model.releaseFromEdit();
-	}
-
-	private String dumpRegions(IStructuredDocument document) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
-		return buf.toString();
-	}
-
-	private String dumpRegions(IStructuredDocumentRegion region) {
-		StringBuffer buf = new StringBuffer();
-		do {
-			buf.append(dumpOneRegion(region));
-			region = region.getNext();
-		}
-		while (region != null);
-
-		buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
-		return buf.toString();
-	}
-
-	private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(documentRegion.toString());
-		buf.append(FileUtil.commonEOL + "    "); //$NON-NLS-1$
-
-		ITextRegionList regionList = documentRegion.getRegions();
-		Iterator i = regionList.iterator();
-		while (i.hasNext()) {
-			ITextRegion textRegion = (ITextRegion) i.next();
-			buf.append(textRegion.toString());
-			buf.append(", "); //$NON-NLS-1$
-		}
-		buf.append(FileUtil.commonEOL); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	private boolean fDump = false;
-
-	private void compareResult(String actual, String filename) throws IOException {
-		if (fDump) {
-			FileUtil.dumpString(actual, RESULTS_DIR, filename);
-		}
-		else {
-			String result = FileUtil.createString(RESULTS_DIR, filename);
-			assertEquals(result, actual);
-		}
-	}
-
-	private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
-	private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results"; //$NON-NLS-1$
-	private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
-	private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
-	private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
deleted file mode 100644
index a7acb9dfd..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,105 +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.css.core.tests.source;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-
-
-public class CSSTextParserTest extends TestCase {
-	public void testText1() throws IOException {
-		textParserTest("sample01.css"); //$NON-NLS-1$
-	}
-
-	public void testText2() throws IOException {
-		textParserTest("sample02.css"); //$NON-NLS-1$
-	}
-
-	public void testText3() throws IOException {
-		textParserTest("sample03.css"); //$NON-NLS-1$
-	}
-
-	public void testText4() throws IOException {
-		textParserTest("sample04.css"); //$NON-NLS-1$
-	}
-
-	public void testText5() throws IOException {
-		textParserTest("sample05.css"); //$NON-NLS-1$
-	}
-
-	public void testText6() throws IOException {
-		textParserTest("sample06.css"); //$NON-NLS-1$
-	}
-
-	public void testText7() throws IOException {
-		textParserTest("sample07.css"); //$NON-NLS-1$
-	}
-
-	private void textParserTest(String filename) throws IOException {
-		String source = createString(filename); //$NON-NLS-1$
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, source);
-		String result = dumpRegions(parser.getTokenList());
-		compareResult(result, "CSSTextParserTest-" + filename); //$NON-NLS-1$
-	}
-
-	private String createString(String filename) throws FileNotFoundException, IOException {
-		return FileUtil.createString(FILES_DIR, filename);
-	}
-
-	private String dumpRegions(List tokens) {
-		StringBuffer buf = new StringBuffer();
-		Iterator i = tokens.iterator();
-		while (i.hasNext()) {
-			buf.append(dumpOneRegion((CSSTextToken) i.next()));
-		}
-
-		buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
-		return buf.toString();
-	}
-
-	private String dumpOneRegion(CSSTextToken token) {
-		StringBuffer buf = new StringBuffer();
-
-		buf.append("["); //$NON-NLS-1$
-		buf.append(token.image);
-		buf.append("] "); //$NON-NLS-1$
-		buf.append(token.kind);
-		buf.append(" - "); //$NON-NLS-1$
-		buf.append(token.start);
-		buf.append(", "); //$NON-NLS-1$
-		buf.append(token.length);
-
-		buf.append(FileUtil.commonEOL); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	private boolean fDump = false;
-
-	private void compareResult(String actual, String filename) throws IOException {
-		if (fDump) {
-			FileUtil.dumpString(actual, RESULTS_DIR, filename);
-		}
-		else {
-			String result = FileUtil.createString(RESULTS_DIR, filename);
-			assertEquals(result, actual);
-		}
-	}
-
-	private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
-	private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
deleted file mode 100644
index 2a599aed4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,261 +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.css.core.tests.source;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-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.ITextRegionList;
-
-public class CSSUrlTest extends TestCase {
-
-	/**
-	 * Declaration: without quotes
-	 */
-	public void testDeclaration1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(white space.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: without quotes, with surrounded space
-	 */
-	public void testDeclaration2() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(  white space.gif  );"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: with single quote
-	 */
-	public void testDeclaration3() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(\'white space.gif\');"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: with double quote
-	 */
-	public void testDeclaration4() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(\"white space.gif\");"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: two urls
-	 */
-	public void testDeclaration5() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(white space.gif); list-style-image: url(style image.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Style rule: two urls
-	 */
-	public void testStyleRule1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.set("LI { background-image: url(white space.gif);\r\nlist-style-image: url(style image.gif); }"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule and style rule: without quotes
-	 */
-	public void testSomeRules1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.set("@import url(white space.css);LI { background-image: url(white space.gif);list-style-image: url(style image.gif); }"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(3, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[2].getType());
-		assertEquals("style image.gif", urls[2].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: Two urls but parenthesis are missed, so concatenated url
-	 * is identified. By adding parenthesis, urls are corrected.
-	 */
-	public void testFixError1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		// ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
-		document.set("background-image: url(white space.gif; list-style-image: urlstyle image.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif; list-style-image: urlstyle image.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct first url
-		document.replaceText(null, 37, 0, ")"); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct second url
-		document.replaceText(null, 61, 0, "("); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule and style rule: Two urls but parenthesis are missed, so
-	 * concatenated url is identified. By adding parenthesis, urls are
-	 * corrected.
-	 */
-	public void testFixError2() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		// ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
-		document.set("@import url(white space.css;LI { background-image: urlwhite space.gif); }"); //$NON-NLS-1$		
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css;LI { background-image: urlwhite space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct first url
-		document.replaceText(null, 27, 0, ")"); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct second url
-		document.replaceText(null, 55, 0, "("); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule: Url has only one quote, so it is not identified as url. By
-	 * removing quote, url is corrected.
-	 */
-	public void testFixError3() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		// ____________0123456789012345678901234567890
-		document.set("@import url(white space.css\");"); //$NON-NLS-1$		
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(0, urls.length);
-
-		// correct url
-		document.replaceText(null, 27, 1, ""); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-
-	private UrlInfo[] pickupUrl(IStructuredDocument document) {
-		List urls = new ArrayList();
-		IStructuredDocumentRegion documentRegion = document.getFirstStructuredDocumentRegion();
-		while (documentRegion != null) {
-			ITextRegionList regionList = documentRegion.getRegions();
-			Iterator i = regionList.iterator();
-			while (i.hasNext()) {
-				ITextRegion textRegion = (ITextRegion) i.next();
-				String type = textRegion.getType();
-				if (type.equals(CSSRegionContexts.CSS_URI) || type.equals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI)) {
-					urls.add(new UrlInfo(type, documentRegion.getFullText(textRegion)));
-				}
-			}
-			documentRegion = documentRegion.getNext();
-		}
-		return (UrlInfo[]) urls.toArray(new UrlInfo[urls.size()]);
-	}
-
-	private class UrlInfo {
-		UrlInfo(String type, String url) {
-			fType = type;
-			fUrl = CSSUtil.extractUriContents(url);
-		}
-
-		String getType() {
-			return fType;
-		}
-
-		String getUrl() {
-			return fUrl;
-		}
-
-		private String fType;
-		private String fUrl;
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/BUG73990_selector_unformatted.css
deleted file mode 100644
index ed52c9395..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/BUG73990_selector_unformatted.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Class as selector */
-H1.pastoral { color: #00FF00 }
-
-/* ID as selector */
-#z98y { letter-spacing: 0.3em }
-H1#z98y { letter-spacing: 0.5em }
-
-/* Contextual selectors */
-DIV P           { font: small sans-serif }
-.reddish H1     { color: red }
-#x78y CODE      { background: blue }
-DIV.sidenote H1 { font-size: large }
-
-/* Anchor pseudo-classes */
-A:link { color: red }       /* unvisited link */
-A:visited { color: blue }   /* visited links */
-A:active { color: lime }    /* active links */
-
-/* Pseudo-class combined with normal class */ 
-A.external:visited { color: blue }
-
-/* 'first-line' pseudo-element */
-P:first-line { font-variant: small-caps }
-
-/* 'first-letter' pseudo-element */
-P:first-letter { font-size: 200%; float: left }
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter { color: purple }
-P.initial:first-letter { color: red }
-
-/* Multiple pseudo-elements */
-P { color: red; font-size: 12pt }
-P:first-letter { color: green; font-size: 200% }
-P:first-line { color: blue }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
deleted file mode 100644
index 09bd076c1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
-	font-family: "Swiss 721";
-	src: url("swiss721blk.pfr"); /* Swiss 721 black */
-	font-style: normal, italic;
-	font-weight: 800,900; /* note the interesting problem that
-	the 900 weight italic doesn�ft exist */
-}
-
-@font-face {
-	src: local("Palatino"),
-		local("Times New Roman"),
-		local("New York"),
-		local("Utopia"),
-		url("http://somewhere/free/font");
-	font-family: serif;
-	font-weight: 100, 200, 300, 400, 500;
-	font-style: normal;
-	font-variant: normal;
-	font-size: all
-}
-
-@font-face {
-	src: local("Alabama Italic"),
-	url(http://www.fonts.org/A/alabama-italic) format("truetype");
-	panose-1: 2 4 5 2 5 4 5 9 3 3;
-	font-family: Alabama, serif;
-	font-weight: 300, 400, 500;
-	font-style: italic, oblique;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
deleted file mode 100644
index b977f2cc5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@page {size: 8.5in 11in;margin: 2cm}
-
-@page {
-	size: auto; /* auto is the initial value */
-	margin: 10%;
-}
-
-@page :left {
-	margin-left: 4cm;
-	margin-right: 3cm;
-}
-@page :right {
-	margin-left: 3cm;
-	margin-right: 4cm;
-}
-
-@page narrow {size: 9cm 18cm}@page rotated {size: landscape}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
deleted file mode 100644
index 8e4a89a4b..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* primitive values */
-NUMBERS {
-	NUMBER: 123.456;
-	PERCENTAGE: 123.456%;
-	EMS: 123.456em;
-	EXS: 123.456ex;
-	PX: 123.456px;
-	CM: 123.456cm;
-	MM: 123.456mm;
-	IN: 123.456in;
-	PT: 123.456pt;
-	PC: 123.456pc;
-	DEG: -123.456deg;
-	RAD: 123.456rad;
-	GRAD: 123.456grad;
-	MS: 123.456ms;
-	S: 123.456s;
-	HZ: 123.456Hz;
-	KHZ: 123.456kHz;
-	DIMENSION: -123.456zzz;
-	INTEGER: 123;
-}
-
-STRINGS {
-	STRING: "string";
-	URI: URL("http://www.ibm.com/");
-	IDENT: left;
-	HASH: #abcdef;
-	URANGE: U+20A7;
-	SLASH: /;
-	COMMA: ,;
-	INHERIT_PRIMITIVE: inherit;
-	ATTR: attr(KEY);
-	FORMAT: format("truedoc");
-	LOCAL: local("Excelsior Roman");
-}
-
-FUNCTIONS {
-	COUNTER: counter(par-num, upper-roman);
-	RECT: rect(12, 34, 56, 78);
-	RGBCOLOR: rgb(255, 128, 0);
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css
deleted file mode 100644
index 6da6ff707..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Class as selector */
-H1.pastoral {
-	color: #00FF00
-}
-
-/* ID as selector */
-#z98y {
-	letter-spacing: 0.3em
-}
-
-H1#z98y {
-	letter-spacing: 0.5em
-}
-
-/* Contextual selectors */
-DIV P {
-	font: small sans-serif
-}
-
-.reddish H1 {
-	color: red
-}
-
-#x78y CODE {
-	background: blue
-}
-
-DIV.sidenote H1 {
-	font-size: large
-}
-
-/* Anchor pseudo-classes */
-A:link {
-	color: red
-}  /* unvisited link */
-A:visited {
-	color: blue
-}  /* visited links */
-A:active {
-	color: lime
-}  /* active links */ /* Pseudo-class combined with normal class */
-A.external:visited {
-	color: blue
-}
-
-/* 'first-line' pseudo-element */
-P:first-line {
-	font-variant: small-caps
-}
-
-/* 'first-letter' pseudo-element */
-P:first-letter {
-	font-size: 200%;
-	float: left
-}
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter {
-	color: purple
-}
-
-P.initial:first-letter {
-	color: red
-}
-
-/* Multiple pseudo-elements */
-P {
-	color: red;
-	font-size: 12pt
-}
-
-P:first-letter {
-	color: green;
-	font-size: 200%
-}
-
-P:first-line {
-	color: blue
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
deleted file mode 100644
index e1ac2f766..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 3] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[3, 9] ({
-
-	)
-    ContextRegion--> LBRACE: 0-1/6, 
-[9, 21] (color: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[21, 24] (
-	)
-    ContextRegion--> S: 0-3, 
-[24, 25] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[25, 30] (
-
-	)
-    ContextRegion--> S: 0-5, 
-[30, 54] (background-color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-24, 
-[54, 59] (
-	
-)
-    ContextRegion--> S: 0-5, 
-[59, 60] (})
-    ContextRegion--> RBRACE: 0-1, 
-[60, 62] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
deleted file mode 100644
index e867c985d..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
+++ /dev/null
@@ -1,41 +0,0 @@
-[0, 23] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[23, 24] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[24, 26] (
-)
-    ContextRegion--> S: 0-2, 
-[26, 61] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[61, 62] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[62, 64] (
-)
-    ContextRegion--> S: 0-2, 
-[64, 96] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[96, 97] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[97, 99] (
-)
-    ContextRegion--> S: 0-2, 
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> UNKNOWN: 19-20, ContextRegion--> MEDIUM: 20-26, ContextRegion--> MEDIA_SEPARATOR: 26-27, ContextRegion--> MEDIUM: 27-33, ContextRegion--> MEDIA_SEPARATOR: 33-34, ContextRegion--> UNKNOWN: 34-35, ContextRegion--> MEDIUM: 35-41/42, ContextRegion--> UNKNOWN: 42-48, ContextRegion--> MEDIA_SEPARATOR: 48-49, ContextRegion--> MEDIUM: 49-55/56, 
-[155, 169] (@import media6)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> UNKNOWN: 8-14, 
-[169, 170] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
-    ContextRegion--> S: 0-4, ContextRegion--> CDO: 4-8/9, ContextRegion--> COMMENT: 9-23/27, ContextRegion--> CDC: 27-30/34, ContextRegion--> COMMENT: 34-49/51, 
-[221, 227] (kuso
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
deleted file mode 100644
index b057117d4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
+++ /dev/null
@@ -1,102 +0,0 @@
-[0, 29] (@import url("../sample2.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29, 
-[29, 30] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[30, 57] (
-
-/* Sample Styles */
-
-)
-    ContextRegion--> S: 0-4, ContextRegion--> COMMENT: 4-23/27, 
-[57, 62] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[62, 66] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[66, 79] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[79, 80] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[80, 83] (
-	)
-    ContextRegion--> S: 0-3, 
-[83, 120] (background-color : rgb(181, 253, 211))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, ContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37, 
-[120, 121] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[121, 124] (
-	)
-    ContextRegion--> S: 0-3, 
-[124, 143] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[143, 144] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[144, 147] (
-	)
-    ContextRegion--> S: 0-3, 
-[147, 186] (font-family : "Heisei Mincho W3", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-39, 
-[186, 188] (
-)
-    ContextRegion--> S: 0-2, 
-[188, 189] (})
-    ContextRegion--> RBRACE: 0-1, 
-[189, 193] (
-
-)
-    ContextRegion--> S: 0-4, 
-[193, 205] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[205, 207] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[207, 224] (margin-left : 4cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[224, 225] ( )
-    ContextRegion--> S: 0-1, 
-[225, 226] (})
-    ContextRegion--> RBRACE: 0-1, 
-[226, 230] (
-
-)
-    ContextRegion--> S: 0-4, 
-[230, 243] (@media aural )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[243, 247] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[247, 255] (P.heidi )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[255, 260] ({
-		)
-    ContextRegion--> LBRACE: 0-1/5, 
-[260, 281] (azimuth : center-left)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21, 
-[281, 282] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[282, 286] (
-		)
-    ContextRegion--> S: 0-4, 
-[286, 305] (elevation : 12.3deg)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19, 
-[305, 306] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[306, 310] (
-		)
-    ContextRegion--> S: 0-4, 
-[310, 327] (pause : 30ms 1.6s)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, 
-[327, 330] (
-	)
-    ContextRegion--> S: 0-3, 
-[330, 331] (})
-    ContextRegion--> RBRACE: 0-1, 
-[331, 333] (
-)
-    ContextRegion--> S: 0-2, 
-[333, 334] (})
-    ContextRegion--> RBRACE: 0-1, 
-[334, 336] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
deleted file mode 100644
index a761962f1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 49] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[49, 50] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[50, 52] (
-)
-    ContextRegion--> S: 0-2, 
-[52, 87] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[87, 88] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[88, 90] (
-)
-    ContextRegion--> S: 0-2, 
-[90, 122] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[122, 123] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[123, 125] (
-)
-    ContextRegion--> S: 0-2, 
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41, 
-[166, 167] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[167, 171] (
-
-)
-    ContextRegion--> S: 0-4, 
-[171, 184] (@media print )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[184, 189] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[189, 190] (})
-    ContextRegion--> RBRACE: 0-1, 
-[190, 194] (
-
-)
-    ContextRegion--> S: 0-4, 
-[194, 206] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[206, 211] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[211, 212] (})
-    ContextRegion--> RBRACE: 0-1, 
-[212, 216] (
-
-)
-    ContextRegion--> S: 0-4, 
-[216, 227] (h1, h2, h3 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11, 
-[227, 230] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[230, 253] (font-family: sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23, 
-[253, 255] (  )
-    ContextRegion--> S: 0-2, 
-[255, 256] (})
-    ContextRegion--> RBRACE: 0-1, 
-[256, 258] (
-)
-    ContextRegion--> S: 0-2, 
-[258, 264] (h1 em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6, 
-[264, 267] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[267, 278] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[278, 280] (  )
-    ContextRegion--> S: 0-2, 
-[280, 281] (})
-    ContextRegion--> RBRACE: 0-1, 
-[281, 283] (
-)
-    ContextRegion--> S: 0-2, 
-[283, 297] (div p *[href] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[297, 300] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[300, 311] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[311, 313] (  )
-    ContextRegion--> S: 0-2, 
-[313, 314] (})
-    ContextRegion--> RBRACE: 0-1, 
-[314, 316] (
-)
-    ContextRegion--> S: 0-2, 
-[316, 325] (body > P )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[325, 328] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[328, 344] (line-height: 1.3)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16, 
-[344, 346] (  )
-    ContextRegion--> S: 0-2, 
-[346, 347] (})
-    ContextRegion--> RBRACE: 0-1, 
-[347, 349] (
-)
-    ContextRegion--> S: 0-2, 
-[349, 361] (div ol>li p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12, 
-[361, 363] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[363, 364] (})
-    ContextRegion--> RBRACE: 0-1, 
-[364, 366] (
-)
-    ContextRegion--> S: 0-2, 
-[366, 375] (math + p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[375, 378] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[378, 392] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[392, 394] (  )
-    ContextRegion--> S: 0-2, 
-[394, 395] (})
-    ContextRegion--> RBRACE: 0-1, 
-[395, 397] (
-)
-    ContextRegion--> S: 0-2, 
-[397, 412] (h1.opener + h2 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15, 
-[412, 415] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[415, 431] (margin-top: -5mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-16, 
-[431, 433] (  )
-    ContextRegion--> S: 0-2, 
-[433, 434] (})
-    ContextRegion--> RBRACE: 0-1, 
-[434, 436] (
-)
-    ContextRegion--> S: 0-2, 
-[436, 446] (h1[title] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10, 
-[446, 449] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[449, 460] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[460, 461] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[461, 463] (  )
-    ContextRegion--> S: 0-2, 
-[463, 464] (})
-    ContextRegion--> RBRACE: 0-1, 
-[464, 466] (
-)
-    ContextRegion--> S: 0-2, 
-[466, 486] (span[class=example] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[486, 489] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[489, 500] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[500, 501] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[501, 503] (  )
-    ContextRegion--> S: 0-2, 
-[503, 504] (})
-    ContextRegion--> RBRACE: 0-1, 
-[504, 506] (
-)
-    ContextRegion--> S: 0-2, 
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44, 
-[550, 553] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[553, 564] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[564, 565] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[565, 567] (  )
-    ContextRegion--> S: 0-2, 
-[567, 568] (})
-    ContextRegion--> RBRACE: 0-1, 
-[568, 570] (
-)
-    ContextRegion--> S: 0-2, 
-[570, 590] (a[rel~="copyright"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[590, 593] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[593, 604] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[604, 606] (  )
-    ContextRegion--> S: 0-2, 
-[606, 607] (})
-    ContextRegion--> RBRACE: 0-1, 
-[607, 609] (
-)
-    ContextRegion--> S: 0-2, 
-[609, 638] (a[href="http://www.w3.org/"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29, 
-[638, 641] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[641, 652] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[652, 654] (  )
-    ContextRegion--> S: 0-2, 
-[654, 655] (})
-    ContextRegion--> RBRACE: 0-1, 
-[655, 657] (
-)
-    ContextRegion--> S: 0-2, 
-[657, 668] (*[lang=fr] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11, 
-[668, 671] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[671, 685] (display : none)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14, 
-[685, 687] (  )
-    ContextRegion--> S: 0-2, 
-[687, 688] (})
-    ContextRegion--> RBRACE: 0-1, 
-[688, 690] (
-)
-    ContextRegion--> S: 0-2, 
-[690, 704] (*[lang|="en"] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[704, 707] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[707, 718] (color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[718, 720] (  )
-    ContextRegion--> S: 0-2, 
-[720, 721] (})
-    ContextRegion--> RBRACE: 0-1, 
-[721, 723] (
-)
-    ContextRegion--> S: 0-2, 
-[723, 750] (DIALOGUE[character=romeo]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27, 
-[750, 753] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47, 
-[800, 802] (  )
-    ContextRegion--> S: 0-2, 
-[802, 803] (})
-    ContextRegion--> RBRACE: 0-1, 
-[803, 805] (
-)
-    ContextRegion--> S: 0-2, 
-[805, 837] (DIALOGUE[ character = juliet ]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32, 
-[837, 840] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46, 
-[886, 888] (  )
-    ContextRegion--> S: 0-2, 
-[888, 889] (})
-    ContextRegion--> RBRACE: 0-1, 
-[889, 891] (
-)
-    ContextRegion--> S: 0-2, 
-[891, 902] (*.pastoral )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11, 
-[902, 905] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[905, 917] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[917, 919] (  )
-    ContextRegion--> S: 0-2, 
-[919, 920] (})
-    ContextRegion--> RBRACE: 0-1, 
-[920, 922] (
-)
-    ContextRegion--> S: 0-2, 
-[922, 932] (.pastoral )
-    ContextRegion--> SELECTOR_CLASS: 0-9/10, 
-[932, 935] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[935, 947] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[947, 949] (  )
-    ContextRegion--> S: 0-2, 
-[949, 950] (})
-    ContextRegion--> RBRACE: 0-1, 
-[950, 952] (
-)
-    ContextRegion--> S: 0-2, 
-[952, 964] (H1.pastoral )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12, 
-[964, 967] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[967, 979] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[979, 981] (  )
-    ContextRegion--> S: 0-2, 
-[981, 982] (})
-    ContextRegion--> RBRACE: 0-1, 
-[982, 984] (
-)
-    ContextRegion--> S: 0-2, 
-[984, 1002] (p.pastoral.marine )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18, 
-[1002, 1005] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1005, 1017] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[1017, 1019] (  )
-    ContextRegion--> S: 0-2, 
-[1019, 1020] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1020, 1022] (
-)
-    ContextRegion--> S: 0-2, 
-[1022, 1034] (h1#chapter1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12, 
-[1034, 1037] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1037, 1055] (text-align: center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18, 
-[1055, 1057] (  )
-    ContextRegion--> S: 0-2, 
-[1057, 1058] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1058, 1060] (
-)
-    ContextRegion--> S: 0-2, 
-[1060, 1080] (div > p:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20, 
-[1080, 1083] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1083, 1097] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[1097, 1099] (  )
-    ContextRegion--> S: 0-2, 
-[1099, 1100] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1100, 1102] (
-)
-    ContextRegion--> S: 0-2, 
-[1102, 1119] (p:first-child em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17, 
-[1119, 1122] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1122, 1140] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1140, 1142] (  )
-    ContextRegion--> S: 0-2, 
-[1142, 1143] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1143, 1145] (
-)
-    ContextRegion--> S: 0-2, 
-[1145, 1163] (* > a:first-child )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18, 
-[1163, 1166] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1166, 1184] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1184, 1186] (  )
-    ContextRegion--> S: 0-2, 
-[1186, 1187] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1187, 1189] (
-)
-    ContextRegion--> S: 0-2, 
-[1189, 1203] (a:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1203, 1206] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1206, 1224] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1224, 1226] (  )
-    ContextRegion--> S: 0-2, 
-[1226, 1227] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1227, 1229] (
-)
-    ContextRegion--> S: 0-2, 
-[1229, 1248] (a.external:visited )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19, 
-[1248, 1251] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1251, 1262] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[1262, 1264] (  )
-    ContextRegion--> S: 0-2, 
-[1264, 1265] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1265, 1267] (
-)
-    ContextRegion--> S: 0-2, 
-[1267, 1281] (a:focus:hover )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14, 
-[1281, 1284] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1284, 1301] (background: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17, 
-[1301, 1303] (  )
-    ContextRegion--> S: 0-2, 
-[1303, 1304] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1304, 1306] (
-)
-    ContextRegion--> S: 0-2, 
-[1306, 1320] (html:lang(fr) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1320, 1323] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1323, 1340] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1340, 1342] (  )
-    ContextRegion--> S: 0-2, 
-[1342, 1343] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1343, 1345] (
-)
-    ContextRegion--> S: 0-2, 
-[1345, 1359] (html:lang(de) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1359, 1362] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1395, 1397] (  )
-    ContextRegion--> S: 0-2, 
-[1397, 1398] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1398, 1400] (
-)
-    ContextRegion--> S: 0-2, 
-[1400, 1414] (:lang(fr) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1414, 1417] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1417, 1434] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1434, 1436] (  )
-    ContextRegion--> S: 0-2, 
-[1436, 1437] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1437, 1439] (
-)
-    ContextRegion--> S: 0-2, 
-[1439, 1453] (:lang(de) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1453, 1456] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1489, 1491] (  )
-    ContextRegion--> S: 0-2, 
-[1491, 1492] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1492, 1494] (
-)
-    ContextRegion--> S: 0-2, 
-[1494, 1509] (p:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15, 
-[1509, 1512] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1512, 1526] (font-size: 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14, 
-[1526, 1527] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1527, 1528] ( )
-    ContextRegion--> S: 0-1, 
-[1528, 1547] (font-weight: normal)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[1547, 1549] (  )
-    ContextRegion--> S: 0-2, 
-[1549, 1550] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1550, 1552] (
-)
-    ContextRegion--> S: 0-2, 
-[1552, 1569] (p.special:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17, 
-[1569, 1571] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1571, 1591] (content: "Special! ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20, 
-[1591, 1592] ( )
-    ContextRegion--> S: 0-1, 
-[1592, 1593] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1593, 1595] (
-)
-    ContextRegion--> S: 0-2, 
-[1595, 1618] (p.special:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23, 
-[1618, 1620] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1620, 1634] (color: #ffd800)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[1634, 1635] ( )
-    ContextRegion--> S: 0-1, 
-[1635, 1636] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1636, 1638] (
-)
-    ContextRegion--> S: 0-2, 
-[1638, 1643] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[1643, 1645] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58, 
-[1703, 1704] ( )
-    ContextRegion--> S: 0-1, 
-[1704, 1705] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1705, 1707] (
-)
-    ContextRegion--> S: 0-2, 
-[1707, 1721] (*:lang(ja-jp) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1721, 1723] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45, 
-[1768, 1769] ( )
-    ContextRegion--> S: 0-1, 
-[1769, 1770] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1770, 1772] (
-)
-    ContextRegion--> S: 0-2, 
-[1772, 1786] (*:lang(zh-tw) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1786, 1788] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38, 
-[1826, 1827] ( )
-    ContextRegion--> S: 0-1, 
-[1827, 1828] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1828, 1830] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
deleted file mode 100644
index a761962f1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 49] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[49, 50] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[50, 52] (
-)
-    ContextRegion--> S: 0-2, 
-[52, 87] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[87, 88] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[88, 90] (
-)
-    ContextRegion--> S: 0-2, 
-[90, 122] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[122, 123] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[123, 125] (
-)
-    ContextRegion--> S: 0-2, 
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41, 
-[166, 167] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[167, 171] (
-
-)
-    ContextRegion--> S: 0-4, 
-[171, 184] (@media print )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[184, 189] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[189, 190] (})
-    ContextRegion--> RBRACE: 0-1, 
-[190, 194] (
-
-)
-    ContextRegion--> S: 0-4, 
-[194, 206] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[206, 211] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[211, 212] (})
-    ContextRegion--> RBRACE: 0-1, 
-[212, 216] (
-
-)
-    ContextRegion--> S: 0-4, 
-[216, 227] (h1, h2, h3 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11, 
-[227, 230] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[230, 253] (font-family: sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23, 
-[253, 255] (  )
-    ContextRegion--> S: 0-2, 
-[255, 256] (})
-    ContextRegion--> RBRACE: 0-1, 
-[256, 258] (
-)
-    ContextRegion--> S: 0-2, 
-[258, 264] (h1 em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6, 
-[264, 267] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[267, 278] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[278, 280] (  )
-    ContextRegion--> S: 0-2, 
-[280, 281] (})
-    ContextRegion--> RBRACE: 0-1, 
-[281, 283] (
-)
-    ContextRegion--> S: 0-2, 
-[283, 297] (div p *[href] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[297, 300] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[300, 311] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[311, 313] (  )
-    ContextRegion--> S: 0-2, 
-[313, 314] (})
-    ContextRegion--> RBRACE: 0-1, 
-[314, 316] (
-)
-    ContextRegion--> S: 0-2, 
-[316, 325] (body > P )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[325, 328] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[328, 344] (line-height: 1.3)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16, 
-[344, 346] (  )
-    ContextRegion--> S: 0-2, 
-[346, 347] (})
-    ContextRegion--> RBRACE: 0-1, 
-[347, 349] (
-)
-    ContextRegion--> S: 0-2, 
-[349, 361] (div ol>li p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12, 
-[361, 363] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[363, 364] (})
-    ContextRegion--> RBRACE: 0-1, 
-[364, 366] (
-)
-    ContextRegion--> S: 0-2, 
-[366, 375] (math + p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[375, 378] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[378, 392] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[392, 394] (  )
-    ContextRegion--> S: 0-2, 
-[394, 395] (})
-    ContextRegion--> RBRACE: 0-1, 
-[395, 397] (
-)
-    ContextRegion--> S: 0-2, 
-[397, 412] (h1.opener + h2 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15, 
-[412, 415] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[415, 431] (margin-top: -5mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-16, 
-[431, 433] (  )
-    ContextRegion--> S: 0-2, 
-[433, 434] (})
-    ContextRegion--> RBRACE: 0-1, 
-[434, 436] (
-)
-    ContextRegion--> S: 0-2, 
-[436, 446] (h1[title] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10, 
-[446, 449] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[449, 460] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[460, 461] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[461, 463] (  )
-    ContextRegion--> S: 0-2, 
-[463, 464] (})
-    ContextRegion--> RBRACE: 0-1, 
-[464, 466] (
-)
-    ContextRegion--> S: 0-2, 
-[466, 486] (span[class=example] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[486, 489] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[489, 500] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[500, 501] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[501, 503] (  )
-    ContextRegion--> S: 0-2, 
-[503, 504] (})
-    ContextRegion--> RBRACE: 0-1, 
-[504, 506] (
-)
-    ContextRegion--> S: 0-2, 
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44, 
-[550, 553] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[553, 564] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[564, 565] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[565, 567] (  )
-    ContextRegion--> S: 0-2, 
-[567, 568] (})
-    ContextRegion--> RBRACE: 0-1, 
-[568, 570] (
-)
-    ContextRegion--> S: 0-2, 
-[570, 590] (a[rel~="copyright"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[590, 593] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[593, 604] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[604, 606] (  )
-    ContextRegion--> S: 0-2, 
-[606, 607] (})
-    ContextRegion--> RBRACE: 0-1, 
-[607, 609] (
-)
-    ContextRegion--> S: 0-2, 
-[609, 638] (a[href="http://www.w3.org/"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29, 
-[638, 641] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[641, 652] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[652, 654] (  )
-    ContextRegion--> S: 0-2, 
-[654, 655] (})
-    ContextRegion--> RBRACE: 0-1, 
-[655, 657] (
-)
-    ContextRegion--> S: 0-2, 
-[657, 668] (*[lang=fr] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11, 
-[668, 671] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[671, 685] (display : none)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14, 
-[685, 687] (  )
-    ContextRegion--> S: 0-2, 
-[687, 688] (})
-    ContextRegion--> RBRACE: 0-1, 
-[688, 690] (
-)
-    ContextRegion--> S: 0-2, 
-[690, 704] (*[lang|="en"] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[704, 707] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[707, 718] (color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[718, 720] (  )
-    ContextRegion--> S: 0-2, 
-[720, 721] (})
-    ContextRegion--> RBRACE: 0-1, 
-[721, 723] (
-)
-    ContextRegion--> S: 0-2, 
-[723, 750] (DIALOGUE[character=romeo]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27, 
-[750, 753] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47, 
-[800, 802] (  )
-    ContextRegion--> S: 0-2, 
-[802, 803] (})
-    ContextRegion--> RBRACE: 0-1, 
-[803, 805] (
-)
-    ContextRegion--> S: 0-2, 
-[805, 837] (DIALOGUE[ character = juliet ]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32, 
-[837, 840] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46, 
-[886, 888] (  )
-    ContextRegion--> S: 0-2, 
-[888, 889] (})
-    ContextRegion--> RBRACE: 0-1, 
-[889, 891] (
-)
-    ContextRegion--> S: 0-2, 
-[891, 902] (*.pastoral )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11, 
-[902, 905] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[905, 917] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[917, 919] (  )
-    ContextRegion--> S: 0-2, 
-[919, 920] (})
-    ContextRegion--> RBRACE: 0-1, 
-[920, 922] (
-)
-    ContextRegion--> S: 0-2, 
-[922, 932] (.pastoral )
-    ContextRegion--> SELECTOR_CLASS: 0-9/10, 
-[932, 935] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[935, 947] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[947, 949] (  )
-    ContextRegion--> S: 0-2, 
-[949, 950] (})
-    ContextRegion--> RBRACE: 0-1, 
-[950, 952] (
-)
-    ContextRegion--> S: 0-2, 
-[952, 964] (H1.pastoral )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12, 
-[964, 967] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[967, 979] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[979, 981] (  )
-    ContextRegion--> S: 0-2, 
-[981, 982] (})
-    ContextRegion--> RBRACE: 0-1, 
-[982, 984] (
-)
-    ContextRegion--> S: 0-2, 
-[984, 1002] (p.pastoral.marine )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18, 
-[1002, 1005] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1005, 1017] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[1017, 1019] (  )
-    ContextRegion--> S: 0-2, 
-[1019, 1020] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1020, 1022] (
-)
-    ContextRegion--> S: 0-2, 
-[1022, 1034] (h1#chapter1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12, 
-[1034, 1037] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1037, 1055] (text-align: center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18, 
-[1055, 1057] (  )
-    ContextRegion--> S: 0-2, 
-[1057, 1058] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1058, 1060] (
-)
-    ContextRegion--> S: 0-2, 
-[1060, 1080] (div > p:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20, 
-[1080, 1083] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1083, 1097] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[1097, 1099] (  )
-    ContextRegion--> S: 0-2, 
-[1099, 1100] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1100, 1102] (
-)
-    ContextRegion--> S: 0-2, 
-[1102, 1119] (p:first-child em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17, 
-[1119, 1122] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1122, 1140] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1140, 1142] (  )
-    ContextRegion--> S: 0-2, 
-[1142, 1143] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1143, 1145] (
-)
-    ContextRegion--> S: 0-2, 
-[1145, 1163] (* > a:first-child )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18, 
-[1163, 1166] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1166, 1184] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1184, 1186] (  )
-    ContextRegion--> S: 0-2, 
-[1186, 1187] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1187, 1189] (
-)
-    ContextRegion--> S: 0-2, 
-[1189, 1203] (a:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1203, 1206] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1206, 1224] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1224, 1226] (  )
-    ContextRegion--> S: 0-2, 
-[1226, 1227] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1227, 1229] (
-)
-    ContextRegion--> S: 0-2, 
-[1229, 1248] (a.external:visited )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19, 
-[1248, 1251] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1251, 1262] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[1262, 1264] (  )
-    ContextRegion--> S: 0-2, 
-[1264, 1265] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1265, 1267] (
-)
-    ContextRegion--> S: 0-2, 
-[1267, 1281] (a:focus:hover )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14, 
-[1281, 1284] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1284, 1301] (background: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17, 
-[1301, 1303] (  )
-    ContextRegion--> S: 0-2, 
-[1303, 1304] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1304, 1306] (
-)
-    ContextRegion--> S: 0-2, 
-[1306, 1320] (html:lang(fr) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1320, 1323] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1323, 1340] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1340, 1342] (  )
-    ContextRegion--> S: 0-2, 
-[1342, 1343] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1343, 1345] (
-)
-    ContextRegion--> S: 0-2, 
-[1345, 1359] (html:lang(de) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1359, 1362] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1395, 1397] (  )
-    ContextRegion--> S: 0-2, 
-[1397, 1398] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1398, 1400] (
-)
-    ContextRegion--> S: 0-2, 
-[1400, 1414] (:lang(fr) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1414, 1417] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1417, 1434] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1434, 1436] (  )
-    ContextRegion--> S: 0-2, 
-[1436, 1437] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1437, 1439] (
-)
-    ContextRegion--> S: 0-2, 
-[1439, 1453] (:lang(de) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1453, 1456] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1489, 1491] (  )
-    ContextRegion--> S: 0-2, 
-[1491, 1492] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1492, 1494] (
-)
-    ContextRegion--> S: 0-2, 
-[1494, 1509] (p:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15, 
-[1509, 1512] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1512, 1526] (font-size: 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14, 
-[1526, 1527] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1527, 1528] ( )
-    ContextRegion--> S: 0-1, 
-[1528, 1547] (font-weight: normal)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[1547, 1549] (  )
-    ContextRegion--> S: 0-2, 
-[1549, 1550] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1550, 1552] (
-)
-    ContextRegion--> S: 0-2, 
-[1552, 1569] (p.special:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17, 
-[1569, 1571] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1571, 1591] (content: "Special! ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20, 
-[1591, 1592] ( )
-    ContextRegion--> S: 0-1, 
-[1592, 1593] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1593, 1595] (
-)
-    ContextRegion--> S: 0-2, 
-[1595, 1618] (p.special:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23, 
-[1618, 1620] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1620, 1634] (color: #ffd800)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[1634, 1635] ( )
-    ContextRegion--> S: 0-1, 
-[1635, 1636] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1636, 1638] (
-)
-    ContextRegion--> S: 0-2, 
-[1638, 1643] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[1643, 1645] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58, 
-[1703, 1704] ( )
-    ContextRegion--> S: 0-1, 
-[1704, 1705] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1705, 1707] (
-)
-    ContextRegion--> S: 0-2, 
-[1707, 1721] (*:lang(ja-jp) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1721, 1723] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45, 
-[1768, 1769] ( )
-    ContextRegion--> S: 0-1, 
-[1769, 1770] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1770, 1772] (
-)
-    ContextRegion--> S: 0-2, 
-[1772, 1786] (*:lang(zh-tw) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1786, 1788] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38, 
-[1826, 1827] ( )
-    ContextRegion--> S: 0-1, 
-[1827, 1828] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1828, 1830] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
deleted file mode 100644
index 6477cb07e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
+++ /dev/null
@@ -1,68 +0,0 @@
-[0, 12] (declaration )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12, 
-[12, 16] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[16, 33] (dimension : 100ex)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17, 
-[33, 34] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[34, 37] (
-	)
-    ContextRegion--> S: 0-3, 
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, ContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, ContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, ContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, ContextRegion--> DECLARATION_VALUE_STRING: 44-57, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, ContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, ContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, ContextRegion--> DECLARATION_VALUE_STRING: 66-95, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96, 
-[133, 134] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[134, 137] (
-	)
-    ContextRegion--> S: 0-3, 
-[137, 151] (hash : #aabbcc)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[151, 152] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[152, 155] (
-	)
-    ContextRegion--> S: 0-3, 
-[155, 166] (ident : any)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[166, 167] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[167, 170] (
-	)
-    ContextRegion--> S: 0-3, 
-[170, 184] (number : 99999)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-14, 
-[184, 185] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[185, 188] (
-	)
-    ContextRegion--> S: 0-3, 
-[188, 205] (percentage : 100%)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17, 
-[205, 206] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[206, 209] (
-	)
-    ContextRegion--> S: 0-3, 
-[209, 226] (string : "string")
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-17, 
-[226, 227] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[227, 230] (
-	)
-    ContextRegion--> S: 0-3, 
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38, 
-[268, 269] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[269, 271] (
-)
-    ContextRegion--> S: 0-2, 
-[271, 272] (})
-    ContextRegion--> RBRACE: 0-1, 
-[272, 274] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
deleted file mode 100644
index 902c663fa..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
+++ /dev/null
@@ -1,454 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 70] (@import url("../sample2.css") projection, tv)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29/30, ContextRegion--> MEDIUM: 30-40, ContextRegion--> MEDIA_SEPARATOR: 40-41/42, ContextRegion--> MEDIUM: 42-44, 
-[70, 71] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[71, 75] (
-
-)
-    ContextRegion--> S: 0-4, 
-[75, 80] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[80, 87] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[87, 100] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[100, 101] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[101, 107] (
-    )
-    ContextRegion--> S: 0-6, 
-[107, 126] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[126, 127] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[127, 133] (
-    )
-    ContextRegion--> S: 0-6, 
-[133, 172] (background-color : rgb( 181, 253, 211 ))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39, 
-[172, 174] (
-)
-    ContextRegion--> S: 0-2, 
-[174, 175] (})
-    ContextRegion--> RBRACE: 0-1, 
-[175, 179] (
-
-)
-    ContextRegion--> S: 0-4, 
-[179, 182] (UL )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[182, 189] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[189, 202] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[202, 203] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[203, 209] (
-    )
-    ContextRegion--> S: 0-6, 
-[209, 251] (list-style-image : url("images/l_a01.gif"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_URI: 19-42, 
-[251, 252] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[252, 258] (
-    )
-    ContextRegion--> S: 0-6, 
-[258, 287] (list-style-position : outside)
-    ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_IDENT: 22-29, 
-[287, 289] (
-)
-    ContextRegion--> S: 0-2, 
-[289, 290] (})
-    ContextRegion--> RBRACE: 0-1, 
-[290, 294] (
-
-)
-    ContextRegion--> S: 0-4, 
-[294, 297] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[297, 304] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[304, 317] (color : white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[317, 318] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[318, 324] (
-    )
-    ContextRegion--> S: 0-6, 
-[324, 343] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[343, 344] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[344, 350] (
-    )
-    ContextRegion--> S: 0-6, 
-[350, 377] (border-left-color : #996666)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_HASH: 20-27, 
-[377, 378] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[378, 384] (
-    )
-    ContextRegion--> S: 0-6, 
-[384, 401] (padding-top : 0px)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[401, 402] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[402, 408] (
-    )
-    ContextRegion--> S: 0-6, 
-[408, 427] (padding-right : 1cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, 
-[427, 428] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[428, 434] (
-    )
-    ContextRegion--> S: 0-6, 
-[434, 452] (padding-bottom : 2)
-    ContextRegion--> DECLARATION_PROPERTY: 0-14/15, ContextRegion--> DECLARATION_SEPARATOR: 15-16/17, ContextRegion--> DECLARATION_VALUE_NUMBER: 17-18, 
-[452, 453] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[453, 459] (
-    )
-    ContextRegion--> S: 0-6, 
-[459, 477] (padding-left : 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18, 
-[477, 478] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[478, 484] (
-    )
-    ContextRegion--> S: 0-6, 
-[484, 504] (border-style : solid)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-20, 
-[504, 505] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[505, 511] (
-    )
-    ContextRegion--> S: 0-6, 
-[511, 535] (border-top-width : 4.5ex)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24, 
-[535, 536] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[536, 542] (
-    )
-    ContextRegion--> S: 0-6, 
-[542, 566] (border-right-width : 5in)
-    ContextRegion--> DECLARATION_PROPERTY: 0-18/19, ContextRegion--> DECLARATION_SEPARATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24, 
-[566, 567] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[567, 573] (
-    )
-    ContextRegion--> S: 0-6, 
-[573, 601] (border-bottom-width : 6.02mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28, 
-[601, 602] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[602, 608] (
-    )
-    ContextRegion--> S: 0-6, 
-[608, 629] (border-left-width : 7)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_NUMBER: 20-21, 
-[629, 631] (
-)
-    ContextRegion--> S: 0-2, 
-[631, 632] (})
-    ContextRegion--> RBRACE: 0-1, 
-[632, 636] (
-
-)
-    ContextRegion--> S: 0-4, 
-[636, 646] (H1:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_PSEUDO: 2-9/10, 
-[646, 653] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, ContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, ContextRegion--> DECLARATION_VALUE_STRING: 40-44, 
-[697, 698] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[698, 704] (
-    )
-    ContextRegion--> S: 0-6, 
-[704, 731] (counter-increment : chapter)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_IDENT: 20-27, 
-[731, 732] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[732, 738] (
-    )
-    ContextRegion--> S: 0-6, 
-[738, 761] (counter-reset : section)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_IDENT: 16-23, 
-[761, 763] (
-)
-    ContextRegion--> S: 0-2, 
-[763, 764] (})
-    ContextRegion--> RBRACE: 0-1, 
-[764, 768] (
-
-)
-    ContextRegion--> S: 0-4, 
-[768, 779] (IMG:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_PSEUDO: 3-10/11, 
-[779, 780] ({)
-    ContextRegion--> LBRACE: 0-1, 
-[780, 799] (content : attr(alt))
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19, 
-[799, 800] (})
-    ContextRegion--> RBRACE: 0-1, 
-[800, 804] (
-
-)
-    ContextRegion--> S: 0-4, 
-[804, 815] (DIV.sample )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_CLASS: 3-10/11, 
-[815, 822] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[822, 863] (font-family : "Robson Celtic", sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_IDENT: 31-41, 
-[863, 864] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[864, 870] (
-    )
-    ContextRegion--> S: 0-6, 
-[870, 889] (position : absolute)
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_IDENT: 11-19, 
-[889, 890] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[890, 896] (
-    )
-    ContextRegion--> S: 0-6, 
-[896, 910] (left : 833.5pc)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14, 
-[910, 911] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[911, 917] (
-    )
-    ContextRegion--> S: 0-6, 
-[917, 926] (top : 90%)
-    ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9, 
-[926, 927] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[927, 933] (
-    )
-    ContextRegion--> S: 0-6, 
-[933, 946] (width : 100pt)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13, 
-[946, 947] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[947, 953] (
-    )
-    ContextRegion--> S: 0-6, 
-[953, 971] (height : 110.777px)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18, 
-[971, 972] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[972, 978] (
-    )
-    ContextRegion--> S: 0-6, 
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, ContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, ContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, ContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, ContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37, 
-[1015, 1017] (
-)
-    ContextRegion--> S: 0-2, 
-[1017, 1018] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1018, 1022] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1022, 1033] (@font-face )
-    ContextRegion--> FONT_FACE: 0-10/11, 
-[1033, 1040] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[1040, 1065] (font-family : "Swiss 721")
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-25, 
-[1065, 1066] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1066, 1072] (
-    )
-    ContextRegion--> S: 0-6, 
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_URI: 6-26/27, ContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, ContextRegion--> DECLARATION_VALUE_STRING: 34-47, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, ContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, ContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, ContextRegion--> DECLARATION_VALUE_STRING: 56-85, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86, 
-[1158, 1159] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1159, 1165] (
-    )
-    ContextRegion--> S: 0-6, 
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38, 
-[1203, 1204] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1204, 1210] (
-    )
-    ContextRegion--> S: 0-6, 
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, ContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37, 
-[1247, 1249] (
-)
-    ContextRegion--> S: 0-2, 
-[1249, 1250] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1250, 1254] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1254, 1266] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[1266, 1267] ({)
-    ContextRegion--> LBRACE: 0-1, 
-[1267, 1284] (margin-left : 4cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[1284, 1285] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1285, 1289] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1289, 1302] (@media aural )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[1302, 1309] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, ContextRegion--> SELECTOR_SEPARATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, ContextRegion--> SELECTOR_SEPARATOR: 14-15/16, ContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, ContextRegion--> SELECTOR_SEPARATOR: 18-19/20, ContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23, 
-[1332, 1343] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1343, 1369] (voice-family : paul, child)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, 
-[1369, 1370] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1370, 1380] (
-        )
-    ContextRegion--> S: 0-10, 
-[1380, 1391] (stress : 20)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-11, 
-[1391, 1392] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1392, 1402] (
-        )
-    ContextRegion--> S: 0-10, 
-[1402, 1415] (richness : 90)
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_NUMBER: 11-13, 
-[1415, 1416] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1416, 1426] (
-        )
-    ContextRegion--> S: 0-10, 
-[1426, 1453] (cue-before : url("ping.au"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_URI: 13-27, 
-[1453, 1459] (
-    )
-    ContextRegion--> S: 0-6, 
-[1459, 1460] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1460, 1466] (
-    )
-    ContextRegion--> S: 0-6, 
-[1466, 1474] (P.heidi )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[1474, 1485] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1485, 1506] (azimuth : center-left)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21, 
-[1506, 1507] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1507, 1517] (
-        )
-    ContextRegion--> S: 0-10, 
-[1517, 1536] (elevation : 12.3deg)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19, 
-[1536, 1537] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1537, 1547] (
-        )
-    ContextRegion--> S: 0-10, 
-[1547, 1564] (pause : 30ms 1.6s)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, 
-[1564, 1570] (
-    )
-    ContextRegion--> S: 0-6, 
-[1570, 1571] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1571, 1577] (
-    )
-    ContextRegion--> S: 0-6, 
-[1577, 1585] (P.peter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[1585, 1596] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1596, 1611] (azimuth : right)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-15, 
-[1611, 1612] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1612, 1622] (
-        )
-    ContextRegion--> S: 0-10, 
-[1622, 1642] (elevation : -0.36rad)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20, 
-[1642, 1643] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1643, 1653] (
-        )
-    ContextRegion--> S: 0-10, 
-[1653, 1666] (pitch : 210Hz)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13, 
-[1666, 1672] (
-    )
-    ContextRegion--> S: 0-6, 
-[1672, 1673] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1673, 1679] (
-    )
-    ContextRegion--> S: 0-6, 
-[1679, 1686] (P.goat )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-6/7, 
-[1686, 1697] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1697, 1712] (volume : x-soft)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_IDENT: 9-15, 
-[1712, 1713] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1713, 1723] (
-        )
-    ContextRegion--> S: 0-10, 
-[1723, 1741] (elevation : 66grad)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18, 
-[1741, 1742] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1742, 1752] (
-        )
-    ContextRegion--> S: 0-10, 
-[1752, 1767] (pitch : 0.17kHz)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15, 
-[1767, 1773] (
-    )
-    ContextRegion--> S: 0-6, 
-[1773, 1774] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1774, 1776] (
-)
-    ContextRegion--> S: 0-2, 
-[1776, 1777] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1777, 1781] (
-
-)
-    ContextRegion--> S: 0-4, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
deleted file mode 100644
index 403a43564..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
+++ /dev/null
@@ -1,29 +0,0 @@
-[H1] SELECTOR_ELEMENT_NAME - 0, 2
-[ ] S - 2, 1
-[{] LBRACE - 3, 1
-[
-
-	] S - 4, 5
-[color] DECLARATION_PROPERTY - 9, 5
-[:] DECLARATION_SEPARATOR - 14, 1
-[ ] S - 15, 1
-[white] DECLARATION_VALUE_IDENT - 16, 5
-[
-	] S - 21, 3
-[;] DECLARATION_DELIMITER - 24, 1
-[
-
-	] S - 25, 5
-[background-color] DECLARATION_PROPERTY - 30, 16
-[ ] S - 46, 1
-[:] DECLARATION_SEPARATOR - 47, 1
-[ ] S - 48, 1
-[black] DECLARATION_VALUE_IDENT - 49, 5
-[
-	
-] S - 54, 5
-[}] RBRACE - 59, 1
-[
-] S - 60, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
deleted file mode 100644
index 34f6047fb..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
+++ /dev/null
@@ -1,73 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("hoge.css")] URI - 8, 15
-[;] DELIMITER - 23, 1
-[
-] S - 24, 2
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[/* comment */] COMMENT - 34, 13
-[ ] S - 47, 1
-[url(hoge.css)] URI - 48, 13
-[;] DELIMITER - 61, 1
-[
-] S - 62, 2
-[@import] IMPORT - 64, 7
-[ ] S - 71, 1
-["hoge.css"] STRING - 72, 10
-[ ] S - 82, 1
-[/* comment */] COMMENT - 83, 13
-[;] DELIMITER - 96, 1
-[
-] S - 97, 2
-[@IMPORT] IMPORT - 99, 7
-[ ] S - 106, 1
-['hoge.css'] STRING - 107, 10
-[ ] S - 117, 1
-[,] undefined - 118, 1
-[media1] MEDIUM - 119, 6
-[,] MEDIA_SEPARATOR - 125, 1
-[media2] MEDIUM - 126, 6
-[,] MEDIA_SEPARATOR - 132, 1
-[,] undefined - 133, 1
-[media3] MEDIUM - 134, 6
-[ ] S - 140, 1
-[m] undefined - 141, 1
-[e] undefined - 142, 1
-[d] undefined - 143, 1
-[i] undefined - 144, 1
-[a] undefined - 145, 1
-[4] undefined - 146, 1
-[,] MEDIA_SEPARATOR - 147, 1
-[media5] MEDIUM - 148, 6
-[ ] S - 154, 1
-[@import] IMPORT - 155, 7
-[ ] S - 162, 1
-[m] undefined - 163, 1
-[e] undefined - 164, 1
-[d] undefined - 165, 1
-[i] undefined - 166, 1
-[a] undefined - 167, 1
-[6] undefined - 168, 1
-[;] DELIMITER - 169, 1
-[
-
-] S - 170, 4
-[<!--] CDO - 174, 4
-[ ] S - 178, 1
-[/* hogehoge */] COMMENT - 179, 14
-[
-
-] S - 193, 4
-[-->] CDC - 197, 3
-[
-
-] S - 200, 4
-[/* comment 2 */] COMMENT - 204, 15
-[
-] S - 219, 2
-[kuso] SELECTOR_ELEMENT_NAME - 221, 4
-[
-] S - 225, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
deleted file mode 100644
index 3a3e11cd9..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
+++ /dev/null
@@ -1,124 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("../sample2.css")] URI - 8, 21
-[;] DELIMITER - 29, 1
-[
-
-] S - 30, 4
-[/* Sample Styles */] COMMENT - 34, 19
-[
-
-] S - 53, 4
-[BODY] SELECTOR_ELEMENT_NAME - 57, 4
-[ ] S - 61, 1
-[{] LBRACE - 62, 1
-[
-	] S - 63, 3
-[color] DECLARATION_PROPERTY - 66, 5
-[ ] S - 71, 1
-[:] DECLARATION_SEPARATOR - 72, 1
-[ ] S - 73, 1
-[black] DECLARATION_VALUE_IDENT - 74, 5
-[;] DECLARATION_DELIMITER - 79, 1
-[
-	] S - 80, 3
-[background-color] DECLARATION_PROPERTY - 83, 16
-[ ] S - 99, 1
-[:] DECLARATION_SEPARATOR - 100, 1
-[ ] S - 101, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 102, 4
-[181] DECLARATION_VALUE_NUMBER - 106, 3
-[,] DECLARATION_VALUE_OPERATOR - 109, 1
-[ ] DECLARATION_VALUE_S - 110, 1
-[253] DECLARATION_VALUE_NUMBER - 111, 3
-[,] DECLARATION_VALUE_OPERATOR - 114, 1
-[ ] DECLARATION_VALUE_S - 115, 1
-[211] DECLARATION_VALUE_NUMBER - 116, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 119, 1
-[;] DECLARATION_DELIMITER - 120, 1
-[
-	] S - 121, 3
-[text-align] DECLARATION_PROPERTY - 124, 10
-[ ] S - 134, 1
-[:] DECLARATION_SEPARATOR - 135, 1
-[ ] S - 136, 1
-[center] DECLARATION_VALUE_IDENT - 137, 6
-[;] DECLARATION_DELIMITER - 143, 1
-[
-	] S - 144, 3
-[font-family] DECLARATION_PROPERTY - 147, 11
-[ ] S - 158, 1
-[:] DECLARATION_SEPARATOR - 159, 1
-[ ] S - 160, 1
-["Heisei Mincho W3"] DECLARATION_VALUE_STRING - 161, 18
-[,] DECLARATION_VALUE_OPERATOR - 179, 1
-[ ] DECLARATION_VALUE_S - 180, 1
-[serif] DECLARATION_VALUE_IDENT - 181, 5
-[
-] S - 186, 2
-[}] RBRACE - 188, 1
-[
-
-] S - 189, 4
-[@page] PAGE - 193, 5
-[ ] S - 198, 1
-[:left] CSS_PAGE_SELECTOR - 199, 5
-[ ] S - 204, 1
-[{] LBRACE - 205, 1
-[ ] S - 206, 1
-[margin-left] DECLARATION_PROPERTY - 207, 11
-[ ] S - 218, 1
-[:] DECLARATION_SEPARATOR - 219, 1
-[ ] S - 220, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 221, 3
-[ ] S - 224, 1
-[}] RBRACE - 225, 1
-[
-
-] S - 226, 4
-[@media] MEDIA - 230, 6
-[ ] S - 236, 1
-[aural] MEDIUM - 237, 5
-[ ] S - 242, 1
-[{] LBRACE - 243, 1
-[
-	] S - 244, 3
-[P] SELECTOR_ELEMENT_NAME - 247, 1
-[.heidi] SELECTOR_CLASS - 248, 6
-[ ] S - 254, 1
-[{] LBRACE - 255, 1
-[
-		] S - 256, 4
-[azimuth] DECLARATION_PROPERTY - 260, 7
-[ ] S - 267, 1
-[:] DECLARATION_SEPARATOR - 268, 1
-[ ] S - 269, 1
-[center-left] DECLARATION_VALUE_IDENT - 270, 11
-[;] DECLARATION_DELIMITER - 281, 1
-[
-		] S - 282, 4
-[elevation] DECLARATION_PROPERTY - 286, 9
-[ ] S - 295, 1
-[:] DECLARATION_SEPARATOR - 296, 1
-[ ] S - 297, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 298, 7
-[;] DECLARATION_DELIMITER - 305, 1
-[
-		] S - 306, 4
-[pause] DECLARATION_PROPERTY - 310, 5
-[ ] S - 315, 1
-[:] DECLARATION_SEPARATOR - 316, 1
-[ ] S - 317, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 318, 4
-[ ] DECLARATION_VALUE_S - 322, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 323, 4
-[
-	] S - 327, 3
-[}] RBRACE - 330, 1
-[
-] S - 331, 2
-[}] RBRACE - 333, 1
-[
-] S - 334, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
deleted file mode 100644
index 5bb3f2b81..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[  ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[  ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[  ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[  ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[  ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[  ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[  ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[  ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[  ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[  ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[  ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_IDENT - 427, 4
-[  ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[  ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[  ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[  ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[  ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[  ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[  ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[  ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[  ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[  ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[  ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[  ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[  ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[  ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[  ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[  ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[  ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[  ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[  ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[  ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[  ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[  ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[  ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[  ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[  ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[  ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[  ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[  ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[  ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[  ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[  ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[  ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[  ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[  ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[  ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[  ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[  ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[  ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[  ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[  ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[  ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[  ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[  ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[  ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[  ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[  ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[  ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[  ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[  ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[  ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[  ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
deleted file mode 100644
index 5bb3f2b81..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[  ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[  ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[  ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[  ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[  ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[  ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[  ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[  ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[  ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[  ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[  ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_IDENT - 427, 4
-[  ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[  ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[  ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[  ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[  ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[  ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[  ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[  ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[  ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[  ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[  ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[  ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[  ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[  ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[  ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[  ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[  ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[  ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[  ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[  ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[  ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[  ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[  ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[  ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[  ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[  ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[  ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[  ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[  ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[  ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[  ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[  ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[  ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[  ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[  ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[  ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[  ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[  ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[  ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[  ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[  ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[  ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[  ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[  ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[  ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[  ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[  ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[  ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[  ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[  ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[  ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
deleted file mode 100644
index 82217c00b..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
+++ /dev/null
@@ -1,101 +0,0 @@
-[declaration] SELECTOR_ELEMENT_NAME - 0, 11
-[ ] S - 11, 1
-[{] LBRACE - 12, 1
-[
-	] S - 13, 3
-[dimension] DECLARATION_PROPERTY - 16, 9
-[ ] S - 25, 1
-[:] DECLARATION_SEPARATOR - 26, 1
-[ ] S - 27, 1
-[100ex] DECLARATION_VALUE_DIMENSION - 28, 5
-[;] DECLARATION_DELIMITER - 33, 1
-[
-	] S - 34, 3
-[function] DECLARATION_PROPERTY - 37, 8
-[ ] S - 45, 1
-[:] DECLARATION_SEPARATOR - 46, 1
-[ ] S - 47, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 48, 5
-[100] DECLARATION_VALUE_NUMBER - 53, 3
-[,] DECLARATION_VALUE_OPERATOR - 56, 1
-[ ] DECLARATION_VALUE_S - 57, 1
-[200] DECLARATION_VALUE_NUMBER - 58, 3
-[,] DECLARATION_VALUE_OPERATOR - 61, 1
-[ ] DECLARATION_VALUE_S - 62, 1
-[300] DECLARATION_VALUE_NUMBER - 63, 3
-[,] DECLARATION_VALUE_OPERATOR - 66, 1
-[ ] DECLARATION_VALUE_S - 67, 1
-[400] DECLARATION_VALUE_NUMBER - 68, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 71, 1
-[,] DECLARATION_VALUE_OPERATOR - 72, 1
-[ ] DECLARATION_VALUE_S - 73, 1
-[format(] DECLARATION_VALUE_FUNCTION - 74, 7
-["intellifont"] DECLARATION_VALUE_STRING - 81, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 94, 1
-[,] DECLARATION_VALUE_OPERATOR - 95, 1
-[ ] DECLARATION_VALUE_S - 96, 1
-[local(] DECLARATION_VALUE_FUNCTION - 97, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 103, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 132, 1
-[;] DECLARATION_DELIMITER - 133, 1
-[
-	] S - 134, 3
-[hash] DECLARATION_PROPERTY - 137, 4
-[ ] S - 141, 1
-[:] DECLARATION_SEPARATOR - 142, 1
-[ ] S - 143, 1
-[#aabbcc] DECLARATION_VALUE_HASH - 144, 7
-[;] DECLARATION_DELIMITER - 151, 1
-[
-	] S - 152, 3
-[ident] DECLARATION_PROPERTY - 155, 5
-[ ] S - 160, 1
-[:] DECLARATION_SEPARATOR - 161, 1
-[ ] S - 162, 1
-[any] DECLARATION_VALUE_IDENT - 163, 3
-[;] DECLARATION_DELIMITER - 166, 1
-[
-	] S - 167, 3
-[number] DECLARATION_PROPERTY - 170, 6
-[ ] S - 176, 1
-[:] DECLARATION_SEPARATOR - 177, 1
-[ ] S - 178, 1
-[99999] DECLARATION_VALUE_NUMBER - 179, 5
-[;] DECLARATION_DELIMITER - 184, 1
-[
-	] S - 185, 3
-[percentage] DECLARATION_PROPERTY - 188, 10
-[ ] S - 198, 1
-[:] DECLARATION_SEPARATOR - 199, 1
-[ ] S - 200, 1
-[100%] DECLARATION_VALUE_PERCENTAGE - 201, 4
-[;] DECLARATION_DELIMITER - 205, 1
-[
-	] S - 206, 3
-[string] DECLARATION_PROPERTY - 209, 6
-[ ] S - 215, 1
-[:] DECLARATION_SEPARATOR - 216, 1
-[ ] S - 217, 1
-["string"] DECLARATION_VALUE_STRING - 218, 8
-[;] DECLARATION_DELIMITER - 226, 1
-[
-	] S - 227, 3
-[unicode-range] DECLARATION_PROPERTY - 230, 13
-[ ] S - 243, 1
-[:] DECLARATION_SEPARATOR - 244, 1
-[ ] S - 245, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 246, 4
-[,] DECLARATION_VALUE_OPERATOR - 250, 1
-[ ] DECLARATION_VALUE_S - 251, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 252, 9
-[,] DECLARATION_VALUE_OPERATOR - 261, 1
-[ ] DECLARATION_VALUE_S - 262, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 263, 5
-[;] DECLARATION_DELIMITER - 268, 1
-[
-] S - 269, 2
-[}] RBRACE - 271, 1
-[
-] S - 272, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
deleted file mode 100644
index 74b30766f..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
+++ /dev/null
@@ -1,583 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("../sample2.css")] URI - 34, 21
-[ ] S - 55, 1
-[projection] MEDIUM - 56, 10
-[,] MEDIA_SEPARATOR - 66, 1
-[ ] S - 67, 1
-[tv] MEDIUM - 68, 2
-[;] DELIMITER - 70, 1
-[
-
-] S - 71, 4
-[BODY] SELECTOR_ELEMENT_NAME - 75, 4
-[ ] S - 79, 1
-[{] LBRACE - 80, 1
-[
-    ] S - 81, 6
-[color] DECLARATION_PROPERTY - 87, 5
-[ ] S - 92, 1
-[:] DECLARATION_SEPARATOR - 93, 1
-[ ] S - 94, 1
-[black] DECLARATION_VALUE_IDENT - 95, 5
-[;] DECLARATION_DELIMITER - 100, 1
-[
-    ] S - 101, 6
-[text-align] DECLARATION_PROPERTY - 107, 10
-[ ] S - 117, 1
-[:] DECLARATION_SEPARATOR - 118, 1
-[ ] S - 119, 1
-[center] DECLARATION_VALUE_IDENT - 120, 6
-[;] DECLARATION_DELIMITER - 126, 1
-[
-    ] S - 127, 6
-[background-color] DECLARATION_PROPERTY - 133, 16
-[ ] S - 149, 1
-[:] DECLARATION_SEPARATOR - 150, 1
-[ ] S - 151, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 152, 4
-[ ] DECLARATION_VALUE_S - 156, 1
-[181] DECLARATION_VALUE_NUMBER - 157, 3
-[,] DECLARATION_VALUE_OPERATOR - 160, 1
-[ ] DECLARATION_VALUE_S - 161, 1
-[253] DECLARATION_VALUE_NUMBER - 162, 3
-[,] DECLARATION_VALUE_OPERATOR - 165, 1
-[ ] DECLARATION_VALUE_S - 166, 1
-[211] DECLARATION_VALUE_NUMBER - 167, 3
-[ ] DECLARATION_VALUE_S - 170, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 171, 1
-[
-] S - 172, 2
-[}] RBRACE - 174, 1
-[
-
-] S - 175, 4
-[UL] SELECTOR_ELEMENT_NAME - 179, 2
-[ ] S - 181, 1
-[{] LBRACE - 182, 1
-[
-    ] S - 183, 6
-[color] DECLARATION_PROPERTY - 189, 5
-[ ] S - 194, 1
-[:] DECLARATION_SEPARATOR - 195, 1
-[ ] S - 196, 1
-[black] DECLARATION_VALUE_IDENT - 197, 5
-[;] DECLARATION_DELIMITER - 202, 1
-[
-    ] S - 203, 6
-[list-style-image] DECLARATION_PROPERTY - 209, 16
-[ ] S - 225, 1
-[:] DECLARATION_SEPARATOR - 226, 1
-[ ] S - 227, 1
-[url("images/l_a01.gif")] DECLARATION_VALUE_URI - 228, 23
-[;] DECLARATION_DELIMITER - 251, 1
-[
-    ] S - 252, 6
-[list-style-position] DECLARATION_PROPERTY - 258, 19
-[ ] S - 277, 1
-[:] DECLARATION_SEPARATOR - 278, 1
-[ ] S - 279, 1
-[outside] DECLARATION_VALUE_IDENT - 280, 7
-[
-] S - 287, 2
-[}] RBRACE - 289, 1
-[
-
-] S - 290, 4
-[H1] SELECTOR_ELEMENT_NAME - 294, 2
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[
-    ] S - 298, 6
-[color] DECLARATION_PROPERTY - 304, 5
-[ ] S - 309, 1
-[:] DECLARATION_SEPARATOR - 310, 1
-[ ] S - 311, 1
-[white] DECLARATION_VALUE_IDENT - 312, 5
-[;] DECLARATION_DELIMITER - 317, 1
-[
-    ] S - 318, 6
-[text-align] DECLARATION_PROPERTY - 324, 10
-[ ] S - 334, 1
-[:] DECLARATION_SEPARATOR - 335, 1
-[ ] S - 336, 1
-[center] DECLARATION_VALUE_IDENT - 337, 6
-[;] DECLARATION_DELIMITER - 343, 1
-[
-    ] S - 344, 6
-[border-left-color] DECLARATION_PROPERTY - 350, 17
-[ ] S - 367, 1
-[:] DECLARATION_SEPARATOR - 368, 1
-[ ] S - 369, 1
-[#996666] DECLARATION_VALUE_HASH - 370, 7
-[;] DECLARATION_DELIMITER - 377, 1
-[
-    ] S - 378, 6
-[padding-top] DECLARATION_PROPERTY - 384, 11
-[ ] S - 395, 1
-[:] DECLARATION_SEPARATOR - 396, 1
-[ ] S - 397, 1
-[0px] DECLARATION_VALUE_DIMENSION - 398, 3
-[;] DECLARATION_DELIMITER - 401, 1
-[
-    ] S - 402, 6
-[padding-right] DECLARATION_PROPERTY - 408, 13
-[ ] S - 421, 1
-[:] DECLARATION_SEPARATOR - 422, 1
-[ ] S - 423, 1
-[1cm] DECLARATION_VALUE_DIMENSION - 424, 3
-[;] DECLARATION_DELIMITER - 427, 1
-[
-    ] S - 428, 6
-[padding-bottom] DECLARATION_PROPERTY - 434, 14
-[ ] S - 448, 1
-[:] DECLARATION_SEPARATOR - 449, 1
-[ ] S - 450, 1
-[2] DECLARATION_VALUE_NUMBER - 451, 1
-[;] DECLARATION_DELIMITER - 452, 1
-[
-    ] S - 453, 6
-[padding-left] DECLARATION_PROPERTY - 459, 12
-[ ] S - 471, 1
-[:] DECLARATION_SEPARATOR - 472, 1
-[ ] S - 473, 1
-[3em] DECLARATION_VALUE_DIMENSION - 474, 3
-[;] DECLARATION_DELIMITER - 477, 1
-[
-    ] S - 478, 6
-[border-style] DECLARATION_PROPERTY - 484, 12
-[ ] S - 496, 1
-[:] DECLARATION_SEPARATOR - 497, 1
-[ ] S - 498, 1
-[solid] DECLARATION_VALUE_IDENT - 499, 5
-[;] DECLARATION_DELIMITER - 504, 1
-[
-    ] S - 505, 6
-[border-top-width] DECLARATION_PROPERTY - 511, 16
-[ ] S - 527, 1
-[:] DECLARATION_SEPARATOR - 528, 1
-[ ] S - 529, 1
-[4.5ex] DECLARATION_VALUE_DIMENSION - 530, 5
-[;] DECLARATION_DELIMITER - 535, 1
-[
-    ] S - 536, 6
-[border-right-width] DECLARATION_PROPERTY - 542, 18
-[ ] S - 560, 1
-[:] DECLARATION_SEPARATOR - 561, 1
-[ ] S - 562, 1
-[5in] DECLARATION_VALUE_DIMENSION - 563, 3
-[;] DECLARATION_DELIMITER - 566, 1
-[
-    ] S - 567, 6
-[border-bottom-width] DECLARATION_PROPERTY - 573, 19
-[ ] S - 592, 1
-[:] DECLARATION_SEPARATOR - 593, 1
-[ ] S - 594, 1
-[6.02mm] DECLARATION_VALUE_DIMENSION - 595, 6
-[;] DECLARATION_DELIMITER - 601, 1
-[
-    ] S - 602, 6
-[border-left-width] DECLARATION_PROPERTY - 608, 17
-[ ] S - 625, 1
-[:] DECLARATION_SEPARATOR - 626, 1
-[ ] S - 627, 1
-[7] DECLARATION_VALUE_NUMBER - 628, 1
-[
-] S - 629, 2
-[}] RBRACE - 631, 1
-[
-
-] S - 632, 4
-[H1] SELECTOR_ELEMENT_NAME - 636, 2
-[:before] SELECTOR_PSEUDO - 638, 7
-[ ] S - 645, 1
-[{] LBRACE - 646, 1
-[
-    ] S - 647, 6
-[content] DECLARATION_PROPERTY - 653, 7
-[ ] S - 660, 1
-[:] DECLARATION_SEPARATOR - 661, 1
-[ ] S - 662, 1
-["Chapter "] DECLARATION_VALUE_STRING - 663, 10
-[ ] DECLARATION_VALUE_S - 673, 1
-[counter(] DECLARATION_VALUE_FUNCTION - 674, 8
-[ ] DECLARATION_VALUE_S - 682, 1
-[chapter] DECLARATION_VALUE_IDENT - 683, 7
-[ ] DECLARATION_VALUE_S - 690, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 691, 1
-[ ] DECLARATION_VALUE_S - 692, 1
-[". "] DECLARATION_VALUE_STRING - 693, 4
-[;] DECLARATION_DELIMITER - 697, 1
-[
-    ] S - 698, 6
-[counter-increment] DECLARATION_PROPERTY - 704, 17
-[ ] S - 721, 1
-[:] DECLARATION_SEPARATOR - 722, 1
-[ ] S - 723, 1
-[chapter] DECLARATION_VALUE_IDENT - 724, 7
-[;] DECLARATION_DELIMITER - 731, 1
-[
-    ] S - 732, 6
-[counter-reset] DECLARATION_PROPERTY - 738, 13
-[ ] S - 751, 1
-[:] DECLARATION_SEPARATOR - 752, 1
-[ ] S - 753, 1
-[section] DECLARATION_VALUE_IDENT - 754, 7
-[
-] S - 761, 2
-[}] RBRACE - 763, 1
-[
-
-] S - 764, 4
-[IMG] SELECTOR_ELEMENT_NAME - 768, 3
-[:before] SELECTOR_PSEUDO - 771, 7
-[ ] S - 778, 1
-[{] LBRACE - 779, 1
-[content] DECLARATION_PROPERTY - 780, 7
-[ ] S - 787, 1
-[:] DECLARATION_SEPARATOR - 788, 1
-[ ] S - 789, 1
-[attr(] DECLARATION_VALUE_FUNCTION - 790, 5
-[alt] DECLARATION_VALUE_IDENT - 795, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 798, 1
-[}] RBRACE - 799, 1
-[
-
-] S - 800, 4
-[DIV] SELECTOR_ELEMENT_NAME - 804, 3
-[.sample] SELECTOR_CLASS - 807, 7
-[ ] S - 814, 1
-[{] LBRACE - 815, 1
-[
-    ] S - 816, 6
-[font-family] DECLARATION_PROPERTY - 822, 11
-[ ] S - 833, 1
-[:] DECLARATION_SEPARATOR - 834, 1
-[ ] S - 835, 1
-["Robson Celtic"] DECLARATION_VALUE_STRING - 836, 15
-[,] DECLARATION_VALUE_OPERATOR - 851, 1
-[ ] DECLARATION_VALUE_S - 852, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 853, 10
-[;] DECLARATION_DELIMITER - 863, 1
-[
-    ] S - 864, 6
-[position] DECLARATION_PROPERTY - 870, 8
-[ ] S - 878, 1
-[:] DECLARATION_SEPARATOR - 879, 1
-[ ] S - 880, 1
-[absolute] DECLARATION_VALUE_IDENT - 881, 8
-[;] DECLARATION_DELIMITER - 889, 1
-[
-    ] S - 890, 6
-[left] DECLARATION_PROPERTY - 896, 4
-[ ] S - 900, 1
-[:] DECLARATION_SEPARATOR - 901, 1
-[ ] S - 902, 1
-[833.5pc] DECLARATION_VALUE_DIMENSION - 903, 7
-[;] DECLARATION_DELIMITER - 910, 1
-[
-    ] S - 911, 6
-[top] DECLARATION_PROPERTY - 917, 3
-[ ] S - 920, 1
-[:] DECLARATION_SEPARATOR - 921, 1
-[ ] S - 922, 1
-[90%] DECLARATION_VALUE_PERCENTAGE - 923, 3
-[;] DECLARATION_DELIMITER - 926, 1
-[
-    ] S - 927, 6
-[width] DECLARATION_PROPERTY - 933, 5
-[ ] S - 938, 1
-[:] DECLARATION_SEPARATOR - 939, 1
-[ ] S - 940, 1
-[100pt] DECLARATION_VALUE_DIMENSION - 941, 5
-[;] DECLARATION_DELIMITER - 946, 1
-[
-    ] S - 947, 6
-[height] DECLARATION_PROPERTY - 953, 6
-[ ] S - 959, 1
-[:] DECLARATION_SEPARATOR - 960, 1
-[ ] S - 961, 1
-[110.777px] DECLARATION_VALUE_DIMENSION - 962, 9
-[;] DECLARATION_DELIMITER - 971, 1
-[
-    ] S - 972, 6
-[clip] DECLARATION_PROPERTY - 978, 4
-[ ] S - 982, 1
-[:] DECLARATION_SEPARATOR - 983, 1
-[ ] S - 984, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 985, 5
-[ ] DECLARATION_VALUE_S - 990, 1
-[-5px] DECLARATION_VALUE_IDENT - 991, 4
-[,] DECLARATION_VALUE_OPERATOR - 995, 1
-[ ] DECLARATION_VALUE_S - 996, 1
-[80px] DECLARATION_VALUE_DIMENSION - 997, 4
-[,] DECLARATION_VALUE_OPERATOR - 1001, 1
-[ ] DECLARATION_VALUE_S - 1002, 1
-[130px] DECLARATION_VALUE_DIMENSION - 1003, 5
-[,] DECLARATION_VALUE_OPERATOR - 1008, 1
-[ ] DECLARATION_VALUE_S - 1009, 1
-[0px] DECLARATION_VALUE_DIMENSION - 1010, 3
-[ ] DECLARATION_VALUE_S - 1013, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1014, 1
-[
-] S - 1015, 2
-[}] RBRACE - 1017, 1
-[
-
-] S - 1018, 4
-[@font-face] FONT_FACE - 1022, 10
-[ ] S - 1032, 1
-[{] LBRACE - 1033, 1
-[
-    ] S - 1034, 6
-[font-family] DECLARATION_PROPERTY - 1040, 11
-[ ] S - 1051, 1
-[:] DECLARATION_SEPARATOR - 1052, 1
-[ ] S - 1053, 1
-["Swiss 721"] DECLARATION_VALUE_STRING - 1054, 11
-[;] DECLARATION_DELIMITER - 1065, 1
-[
-    ] S - 1066, 6
-[src] DECLARATION_PROPERTY - 1072, 3
-[ ] S - 1075, 1
-[:] DECLARATION_SEPARATOR - 1076, 1
-[ ] S - 1077, 1
-[url("swiss721t.pfr")] DECLARATION_VALUE_URI - 1078, 20
-[ ] DECLARATION_VALUE_S - 1098, 1
-[format(] DECLARATION_VALUE_FUNCTION - 1099, 7
-["intellifont"] DECLARATION_VALUE_STRING - 1106, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1119, 1
-[,] DECLARATION_VALUE_OPERATOR - 1120, 1
-[ ] DECLARATION_VALUE_S - 1121, 1
-[local(] DECLARATION_VALUE_FUNCTION - 1122, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 1128, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1157, 1
-[;] DECLARATION_DELIMITER - 1158, 1
-[
-    ] S - 1159, 6
-[unicode-range] DECLARATION_PROPERTY - 1165, 13
-[ ] S - 1178, 1
-[:] DECLARATION_SEPARATOR - 1179, 1
-[ ] S - 1180, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 1181, 4
-[,] DECLARATION_VALUE_OPERATOR - 1185, 1
-[ ] DECLARATION_VALUE_S - 1186, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 1187, 9
-[,] DECLARATION_VALUE_OPERATOR - 1196, 1
-[ ] DECLARATION_VALUE_S - 1197, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 1198, 5
-[;] DECLARATION_DELIMITER - 1203, 1
-[
-    ] S - 1204, 6
-[font-weight] DECLARATION_PROPERTY - 1210, 11
-[ ] S - 1221, 1
-[:] DECLARATION_SEPARATOR - 1222, 1
-[ ] S - 1223, 1
-[100] DECLARATION_VALUE_NUMBER - 1224, 3
-[,] DECLARATION_VALUE_OPERATOR - 1227, 1
-[ ] DECLARATION_VALUE_S - 1228, 1
-[200] DECLARATION_VALUE_NUMBER - 1229, 3
-[,] DECLARATION_VALUE_OPERATOR - 1232, 1
-[ ] DECLARATION_VALUE_S - 1233, 1
-[300] DECLARATION_VALUE_NUMBER - 1234, 3
-[,] DECLARATION_VALUE_OPERATOR - 1237, 1
-[ ] DECLARATION_VALUE_S - 1238, 1
-[400] DECLARATION_VALUE_NUMBER - 1239, 3
-[,] DECLARATION_VALUE_OPERATOR - 1242, 1
-[ ] DECLARATION_VALUE_S - 1243, 1
-[500] DECLARATION_VALUE_NUMBER - 1244, 3
-[
-] S - 1247, 2
-[}] RBRACE - 1249, 1
-[
-
-] S - 1250, 4
-[@page] PAGE - 1254, 5
-[ ] S - 1259, 1
-[:left] CSS_PAGE_SELECTOR - 1260, 5
-[ ] S - 1265, 1
-[{] LBRACE - 1266, 1
-[margin-left] DECLARATION_PROPERTY - 1267, 11
-[ ] S - 1278, 1
-[:] DECLARATION_SEPARATOR - 1279, 1
-[ ] S - 1280, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 1281, 3
-[}] RBRACE - 1284, 1
-[
-
-] S - 1285, 4
-[@media] MEDIA - 1289, 6
-[ ] S - 1295, 1
-[aural] MEDIUM - 1296, 5
-[ ] S - 1301, 1
-[{] LBRACE - 1302, 1
-[
-    ] S - 1303, 6
-[H1] SELECTOR_ELEMENT_NAME - 1309, 2
-[,] SELECTOR_SEPARATOR - 1311, 1
-[ ] S - 1312, 1
-[H2] SELECTOR_ELEMENT_NAME - 1313, 2
-[,] SELECTOR_SEPARATOR - 1315, 1
-[ ] S - 1316, 1
-[H3] SELECTOR_ELEMENT_NAME - 1317, 2
-[,] SELECTOR_SEPARATOR - 1319, 1
-[ ] S - 1320, 1
-[H4] SELECTOR_ELEMENT_NAME - 1321, 2
-[,] SELECTOR_SEPARATOR - 1323, 1
-[ ] S - 1324, 1
-[H5] SELECTOR_ELEMENT_NAME - 1325, 2
-[,] SELECTOR_SEPARATOR - 1327, 1
-[ ] S - 1328, 1
-[H6] SELECTOR_ELEMENT_NAME - 1329, 2
-[ ] S - 1331, 1
-[{] LBRACE - 1332, 1
-[
-        ] S - 1333, 10
-[voice-family] DECLARATION_PROPERTY - 1343, 12
-[ ] S - 1355, 1
-[:] DECLARATION_SEPARATOR - 1356, 1
-[ ] S - 1357, 1
-[paul] DECLARATION_VALUE_IDENT - 1358, 4
-[,] DECLARATION_VALUE_OPERATOR - 1362, 1
-[ ] DECLARATION_VALUE_S - 1363, 1
-[child] DECLARATION_VALUE_IDENT - 1364, 5
-[;] DECLARATION_DELIMITER - 1369, 1
-[
-        ] S - 1370, 10
-[stress] DECLARATION_PROPERTY - 1380, 6
-[ ] S - 1386, 1
-[:] DECLARATION_SEPARATOR - 1387, 1
-[ ] S - 1388, 1
-[20] DECLARATION_VALUE_NUMBER - 1389, 2
-[;] DECLARATION_DELIMITER - 1391, 1
-[
-        ] S - 1392, 10
-[richness] DECLARATION_PROPERTY - 1402, 8
-[ ] S - 1410, 1
-[:] DECLARATION_SEPARATOR - 1411, 1
-[ ] S - 1412, 1
-[90] DECLARATION_VALUE_NUMBER - 1413, 2
-[;] DECLARATION_DELIMITER - 1415, 1
-[
-        ] S - 1416, 10
-[cue-before] DECLARATION_PROPERTY - 1426, 10
-[ ] S - 1436, 1
-[:] DECLARATION_SEPARATOR - 1437, 1
-[ ] S - 1438, 1
-[url("ping.au")] DECLARATION_VALUE_URI - 1439, 14
-[
-    ] S - 1453, 6
-[}] RBRACE - 1459, 1
-[
-    ] S - 1460, 6
-[P] SELECTOR_ELEMENT_NAME - 1466, 1
-[.heidi] SELECTOR_CLASS - 1467, 6
-[ ] S - 1473, 1
-[{] LBRACE - 1474, 1
-[
-        ] S - 1475, 10
-[azimuth] DECLARATION_PROPERTY - 1485, 7
-[ ] S - 1492, 1
-[:] DECLARATION_SEPARATOR - 1493, 1
-[ ] S - 1494, 1
-[center-left] DECLARATION_VALUE_IDENT - 1495, 11
-[;] DECLARATION_DELIMITER - 1506, 1
-[
-        ] S - 1507, 10
-[elevation] DECLARATION_PROPERTY - 1517, 9
-[ ] S - 1526, 1
-[:] DECLARATION_SEPARATOR - 1527, 1
-[ ] S - 1528, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 1529, 7
-[;] DECLARATION_DELIMITER - 1536, 1
-[
-        ] S - 1537, 10
-[pause] DECLARATION_PROPERTY - 1547, 5
-[ ] S - 1552, 1
-[:] DECLARATION_SEPARATOR - 1553, 1
-[ ] S - 1554, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 1555, 4
-[ ] DECLARATION_VALUE_S - 1559, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 1560, 4
-[
-    ] S - 1564, 6
-[}] RBRACE - 1570, 1
-[
-    ] S - 1571, 6
-[P] SELECTOR_ELEMENT_NAME - 1577, 1
-[.peter] SELECTOR_CLASS - 1578, 6
-[ ] S - 1584, 1
-[{] LBRACE - 1585, 1
-[
-        ] S - 1586, 10
-[azimuth] DECLARATION_PROPERTY - 1596, 7
-[ ] S - 1603, 1
-[:] DECLARATION_SEPARATOR - 1604, 1
-[ ] S - 1605, 1
-[right] DECLARATION_VALUE_IDENT - 1606, 5
-[;] DECLARATION_DELIMITER - 1611, 1
-[
-        ] S - 1612, 10
-[elevation] DECLARATION_PROPERTY - 1622, 9
-[ ] S - 1631, 1
-[:] DECLARATION_SEPARATOR - 1632, 1
-[ ] S - 1633, 1
-[-0.36rad] DECLARATION_VALUE_DIMENSION - 1634, 8
-[;] DECLARATION_DELIMITER - 1642, 1
-[
-        ] S - 1643, 10
-[pitch] DECLARATION_PROPERTY - 1653, 5
-[ ] S - 1658, 1
-[:] DECLARATION_SEPARATOR - 1659, 1
-[ ] S - 1660, 1
-[210Hz] DECLARATION_VALUE_DIMENSION - 1661, 5
-[
-    ] S - 1666, 6
-[}] RBRACE - 1672, 1
-[
-    ] S - 1673, 6
-[P] SELECTOR_ELEMENT_NAME - 1679, 1
-[.goat] SELECTOR_CLASS - 1680, 5
-[ ] S - 1685, 1
-[{] LBRACE - 1686, 1
-[
-        ] S - 1687, 10
-[volume] DECLARATION_PROPERTY - 1697, 6
-[ ] S - 1703, 1
-[:] DECLARATION_SEPARATOR - 1704, 1
-[ ] S - 1705, 1
-[x-soft] DECLARATION_VALUE_IDENT - 1706, 6
-[;] DECLARATION_DELIMITER - 1712, 1
-[
-        ] S - 1713, 10
-[elevation] DECLARATION_PROPERTY - 1723, 9
-[ ] S - 1732, 1
-[:] DECLARATION_SEPARATOR - 1733, 1
-[ ] S - 1734, 1
-[66grad] DECLARATION_VALUE_DIMENSION - 1735, 6
-[;] DECLARATION_DELIMITER - 1741, 1
-[
-        ] S - 1742, 10
-[pitch] DECLARATION_PROPERTY - 1752, 5
-[ ] S - 1757, 1
-[:] DECLARATION_SEPARATOR - 1758, 1
-[ ] S - 1759, 1
-[0.17kHz] DECLARATION_VALUE_DIMENSION - 1760, 7
-[
-    ] S - 1767, 6
-[}] RBRACE - 1773, 1
-[
-] S - 1774, 2
-[}] RBRACE - 1776, 1
-[
-
-] S - 1777, 4
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
deleted file mode 100644
index 3c898269e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
+++ /dev/null
@@ -1,8 +0,0 @@
-H1 {
-
-	color: white
-	;
-
-	background-color : black
-	
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
deleted file mode 100644
index 5a4c4dda3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 @import media6;
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-kuso
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
deleted file mode 100644
index e57ccc099..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@import url("../sample2.css");
-
-/* Sample Styles */
-
-BODY {
-	color : black;
-	background-color : rgb(181, 253, 211);
-	text-align : center;
-	font-family : "Heisei Mincho W3", serif
-}
-
-@page :left { margin-left : 4cm }
-
-@media aural {
-	P.heidi {
-		azimuth : center-left;
-		elevation : 12.3deg;
-		pause : 30ms 1.6s
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
deleted file mode 100644
index d2de4f4a2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 {  font-family: sans-serif  }
-h1 em {  color: blue  }
-div p *[href] {  color: blue  }
-body > P {  line-height: 1.3  }
-div ol>li p { }
-math + p {  text-indent: 0  }
-h1.opener + h2 {  margin-top: -5mm  }
-h1[title] {  color: blue;  }
-span[class=example] {  color: blue;  }
-span[hello="Cleveland"][goodbye="Columbus"] {  color: blue;  }
-a[rel~="copyright"] {  color: blue  }
-a[href="http://www.w3.org/"] {  color: blue  }
-*[lang=fr] {  display : none  }
-*[lang|="en"] {  color : red  }
-DIALOGUE[character=romeo]
-{  voice-family: "Lawrence Olivier", charles, male  }
-DIALOGUE[ character = juliet ]
-{  voice-family: "Vivien Leigh", victoria, female  }
-*.pastoral {  color: green  }
-.pastoral {  color: green  }
-H1.pastoral {  color: green  }
-p.pastoral.marine {  color: green  }
-h1#chapter1 {  text-align: center  }
-div > p:first-child {  text-indent: 0  }
-p:first-child em {  font-weight : bold  }
-* > a:first-child {  font-weight : bold  }
-a:first-child {  font-weight : bold  }
-a.external:visited {  color: blue  }
-a:focus:hover {  background: white  }
-html:lang(fr) {  quotes: '<<' '>>'  }
-html:lang(de) {  quotes: '>>' '<<' '\2039' '\203A'  }
-:lang(fr) > Q {  quotes: '<<' '>>'  }
-:lang(de) > Q {  quotes: '>>' '<<' '\2039' '\203A'  }
-p:first-letter {  font-size: 3em; font-weight: normal  }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
deleted file mode 100644
index d2de4f4a2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 {  font-family: sans-serif  }
-h1 em {  color: blue  }
-div p *[href] {  color: blue  }
-body > P {  line-height: 1.3  }
-div ol>li p { }
-math + p {  text-indent: 0  }
-h1.opener + h2 {  margin-top: -5mm  }
-h1[title] {  color: blue;  }
-span[class=example] {  color: blue;  }
-span[hello="Cleveland"][goodbye="Columbus"] {  color: blue;  }
-a[rel~="copyright"] {  color: blue  }
-a[href="http://www.w3.org/"] {  color: blue  }
-*[lang=fr] {  display : none  }
-*[lang|="en"] {  color : red  }
-DIALOGUE[character=romeo]
-{  voice-family: "Lawrence Olivier", charles, male  }
-DIALOGUE[ character = juliet ]
-{  voice-family: "Vivien Leigh", victoria, female  }
-*.pastoral {  color: green  }
-.pastoral {  color: green  }
-H1.pastoral {  color: green  }
-p.pastoral.marine {  color: green  }
-h1#chapter1 {  text-align: center  }
-div > p:first-child {  text-indent: 0  }
-p:first-child em {  font-weight : bold  }
-* > a:first-child {  font-weight : bold  }
-a:first-child {  font-weight : bold  }
-a.external:visited {  color: blue  }
-a:focus:hover {  background: white  }
-html:lang(fr) {  quotes: '<<' '>>'  }
-html:lang(de) {  quotes: '>>' '<<' '\2039' '\203A'  }
-:lang(fr) > Q {  quotes: '<<' '>>'  }
-:lang(de) > Q {  quotes: '>>' '<<' '\2039' '\203A'  }
-p:first-letter {  font-size: 3em; font-weight: normal  }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
deleted file mode 100644
index ea73cea11..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
+++ /dev/null
@@ -1,10 +0,0 @@
-declaration {
-	dimension : 100ex;
-	function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright");
-	hash : #aabbcc;
-	ident : any;
-	number : 99999;
-	percentage : 100%;
-	string : "string";
-	unicode-range : U+??, U+100-220, U+4??;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
deleted file mode 100644
index fd3472965..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
+++ /dev/null
@@ -1,82 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("../sample2.css") projection, tv;
-
-BODY {
-    color : black;
-    text-align : center;
-    background-color : rgb( 181, 253, 211 )
-}
-
-UL {
-    color : black;
-    list-style-image : url("images/l_a01.gif");
-    list-style-position : outside
-}
-
-H1 {
-    color : white;
-    text-align : center;
-    border-left-color : #996666;
-    padding-top : 0px;
-    padding-right : 1cm;
-    padding-bottom : 2;
-    padding-left : 3em;
-    border-style : solid;
-    border-top-width : 4.5ex;
-    border-right-width : 5in;
-    border-bottom-width : 6.02mm;
-    border-left-width : 7
-}
-
-H1:before {
-    content : "Chapter " counter( chapter ) ". ";
-    counter-increment : chapter;
-    counter-reset : section
-}
-
-IMG:before {content : attr(alt)}
-
-DIV.sample {
-    font-family : "Robson Celtic", sans-serif;
-    position : absolute;
-    left : 833.5pc;
-    top : 90%;
-    width : 100pt;
-    height : 110.777px;
-    clip : rect( -5px, 80px, 130px, 0px )
-}
-
-@font-face {
-    font-family : "Swiss 721";
-    src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright");
-    unicode-range : U+??, U+100-220, U+4??;
-    font-weight : 100, 200, 300, 400, 500
-}
-
-@page :left {margin-left : 4cm}
-
-@media aural {
-    H1, H2, H3, H4, H5, H6 {
-        voice-family : paul, child;
-        stress : 20;
-        richness : 90;
-        cue-before : url("ping.au")
-    }
-    P.heidi {
-        azimuth : center-left;
-        elevation : 12.3deg;
-        pause : 30ms 1.6s
-    }
-    P.peter {
-        azimuth : right;
-        elevation : -0.36rad;
-        pitch : 210Hz
-    }
-    P.goat {
-        volume : x-soft;
-        elevation : 66grad;
-        pitch : 0.17kHz
-    }
-}
-
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
deleted file mode 100644
index e12271f91..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,103 +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.css.core.tests.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-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.StructuredModelManager;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- */
-public class FileUtil {
-	public static final String commonEOL = "\r\n";
-
-	public static File createFile(String directory, String filename) throws IOException {
-		Bundle bundle = Platform.getBundle("org.eclipse.wst.css.core.tests"); //$NON-NLS-1$
-		URL url = bundle.getEntry("/"); //$NON-NLS-1$
-		URL localURL = Platform.asLocalURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
-		URL totalURL = new URL(url, totalPath);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		return file;
-	}
-
-	// public static Reader createReader(File file) throws
-	// FileNotFoundException {
-	// return new FileReader(file);
-	// }
-	//	
-	// public static Reader createReader(String directory, String filename)
-	// throws IOException {
-	// File file = createFile(directory, filename);
-	// return createReader(file);
-	// }
-
-	public static String createString(String directory, String filename) throws FileNotFoundException, IOException {
-		StringBuffer buf = new StringBuffer();
-		Reader fileReader = new FileReader(createFile(directory, filename));
-		BufferedReader reader = new BufferedReader(fileReader);
-		String line;
-		while ((line = reader.readLine()) != null) {
-			buf.append(line);
-			buf.append(commonEOL);
-		}
-		return buf.toString();
-		// return new DataInputStream(new
-		// FileInputStream(createFile(directory, filename))).readUTF();
-	}
-
-	static int uniqueNum = 0;
-
-	public static ICSSModel createModel() {
-		IStructuredModel model = null;
-		try {
-
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-
-			model = modelManager.getModelForEdit("test" + uniqueNum++ + ".css", new NullInputStream(), null); //$NON-NLS-1$
-
-			// always use the same line delimiter for these tests, regardless
-			// of plaform or preference settings
-			model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return (ICSSModel) model;
-
-	}
-
-	public static void dumpString(String string, String directory, String filename) throws IOException {
-		File file = createFile(directory, filename);
-		Writer writer = new FileWriter(file);
-		writer.write(string);
-		writer.close();
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
deleted file mode 100644
index ad9b2fdf2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
+++ /dev/null
@@ -1,69 +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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#mark(int)
-	 */
-	public synchronized void mark(int readlimit) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#markSupported()
-	 */
-	public boolean markSupported() {
-		// we can mark nothing.
-		// and, we are using this Null class specifically for
-		// a "fake" resettable stream.
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#reset()
-	 */
-	public synchronized void reset() throws IOException {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#skip(long)
-	 */
-	public long skip(long n) throws IOException {
-		return 0;
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml
deleted file mode 100644
index c7b2786ab..000000000
--- a/tests/org.eclipse.wst.css.core.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.wst.css.core.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
-		<echo message="basedir ${basedir}" />
-		<echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.wst.css.core.tests.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true"/>
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${wst-folder}" />
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" />
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!-- <delete dir="${workspace}" quiet="true" /> -->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.wst.css.core.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-		<!--		<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.classpath b/tests/org.eclipse.wst.css.tests.encoding/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore b/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
deleted file mode 100644
index 06101b98d..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-cssencodingtests.jar
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.project b/tests/org.eclipse.wst.css.tests.encoding/.project
deleted file mode 100644
index ea358d590..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.tests.encoding</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3217eb327..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:34 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties
deleted file mode 100644
index 1ab65c562..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
-               cssencodingtests.jar,\
-               testfiles/,\
-               test.xml
-src.includes = cssencodingtests.jar
-source.cssencodingtests.jar = src/
-output.cssencodingtests.jar = bin/
-               
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/plugin.xml b/tests/org.eclipse.wst.css.tests.encoding/plugin.xml
deleted file mode 100644
index dbfc4f9ee..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.css.tests.encoding"
-   name="CSS Encoding Tests Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin">
-
-   <runtime>
-      <library name="cssencodingtests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.css.core"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.wst.sse.core"/>
-      <import plugin="org.eclipse.wst.xml.tests.encoding"/>
-   </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
deleted file mode 100644
index e3e728955..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +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.css.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.tests.encoding.css.CSSEncodingTester;
-import org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester;
-import org.eclipse.wst.css.tests.encoding.css.TestContentTypeDetectionForCSS;
-
-public class CSSEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{CSSEncodingTester.class, CSSHeadTokenizerTester.class, TestContentTypeDetectionForCSS.class};
-
-	public static Test suite() {
-		return new CSSEncodingTestSuite();
-	}
-
-	public CSSEncodingTestSuite() {
-		super("CSS Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public CSSEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public CSSEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public CSSEncodingTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
deleted file mode 100644
index b0788b992..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +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.css.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static CSSEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-		else {
-			result = getFilesInDir(topDir);
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.wst.css.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = Platform.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = CSSEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public CSSEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
deleted file mode 100644
index fd21c23d6..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
+++ /dev/null
@@ -1,171 +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.css.tests.encoding.css;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class CSSEncodingTester extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-	private boolean DEBUG = false;
-	private final String fileDir = "css/";
-	// private final String pluginLocation =
-	// TestsPlugin.getInstallLocation().toString();
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = CSSEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = encodingMemento = detector.getEncodingMemento();
-
-			String foundIANAEncoding = null;
-
-			if (encodingMemento != null) {
-				foundIANAEncoding = encodingMemento.getDetectedCharsetName();
-			}
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			if (expectedIANAEncoding == null) {
-				expectedIANAResult = expectedIANAEncoding == foundIANAEncoding;
-			}
-			else {
-				expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-			}
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if
-			// throws exception.
-			if (foundIANAEncoding != null) {
-				ensureCanRead(filename, foundIANAEncoding, istream);
-			}
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inputStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nonStandard.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "emptyFile.css";
-		doTestFileStream(filename, null, new CSSResourceEncodingDetector());
-	}
-
-	public void testEUCJP() throws IOException {
-		String filename = fileLocation + "encoding_test_eucjp.css";
-		doTestFileStream(filename, "EUC-JP", new CSSResourceEncodingDetector());
-	}
-
-	public void testJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_jis.css";
-		doTestFileStream(filename, "ISO-2022-JP", new CSSResourceEncodingDetector());
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.css";
-		doTestFileStream(filename, null, new CSSResourceEncodingDetector());
-	}
-
-	public void testnonStandardIllFormed() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-	}
-
-	public void testnonStandardIllFormed2() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed2.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-	}
-
-	public void testShiftJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_sjis.css";
-		doTestFileStream(filename, "SHIFT_JIS", new CSSResourceEncodingDetector());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
deleted file mode 100644
index eb5a3d629..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.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.css.tests.encoding.css;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer;
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizerConstants;
-import org.eclipse.wst.css.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-
-public class CSSHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fcharset;
-	private final String fileDir = "css/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-
-	private void doTestFile(String filename, String expectedName) throws IOException {
-		doTestFile(filename, expectedName, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
-		CSSHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = CSSEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new CSSHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-			throw e;
-		}
-
-		HeadParserToken resultToken = null;
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = fcharset;
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-		else {
-			if (expectedName == null) {
-				assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
-			}
-			else {
-				assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
-			}
-		}
-
-	}
-
-	private boolean isLegalString(String tokenType) {
-		if (tokenType == null)
-			return false;
-		else
-			return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(CSSHeadTokenizer tokenizer) throws IOException {
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			String tokenType = token.getType();
-			if (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fcharset = valueToken.getText();
-
-					}
-				}
-			}
-		}
-		while (tokenizer.hasMoreTokens());
-		finalToken = token;
-		return finalToken;
-
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nonStandard.css";
-		doTestFile(filename, "ISO-8859-6");
-
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "emptyFile.css";
-		doTestFile(filename, null);
-	}
-
-	public void testEUCJP() throws IOException {
-		String filename = fileLocation + "encoding_test_eucjp.css";
-		doTestFile(filename, "EUC-JP");
-	}
-
-	public void testJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_jis.css";
-		doTestFile(filename, "ISO-2022-JP");
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.css";
-		doTestFile(filename, null);
-	}
-
-	public void testnonStandardIllFormed() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed.css";
-		doTestFile(filename, "ISO-8859-6");
-	}
-
-	public void testnonStandardIllFormed2() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed2.css";
-		doTestFile(filename, "ISO-8859-6");
-	}
-
-	public void testShiftJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_sjis.css";
-		doTestFile(filename, "SHIFT_JIS");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
deleted file mode 100644
index cc60cd8a8..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
+++ /dev/null
@@ -1,30 +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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding.css;
-
-
-public interface EncodingParserConstants {
-
-	final String EOF = "EOF"; //$NON-NLS-1$
-	final String InvalidTerminatedStringValue = "InvalidTerminatedStringValue"; //$NON-NLS-1$
-	final String InvalidTermintatedUnDelimitedStringValue = "InvalidTermintatedUnDelimitedStringValue"; //$NON-NLS-1$
-	final String MAX_CHARS_REACHED = "MAX_CHARS_REACHED"; //$NON-NLS-1$
-	final String StringValue = "strval"; //$NON-NLS-1$
-	final String UnDelimitedStringValue = "UnDelimitedStringValue"; //$NON-NLS-1$
-	public final String UTF16BE = "UTF16BE"; //$NON-NLS-1$
-	public final String UTF16LE = "UTF16LE"; //$NON-NLS-1$
-
-
-	public final String UTF83ByteBOM = "UTF83ByteBOM"; //$NON-NLS-1$
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
deleted file mode 100644
index 7468724ce..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
+++ /dev/null
@@ -1,54 +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.css.tests.encoding.css;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForCSS extends TestContentTypeDetection {
-	public void testFile7() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed.css", null);
-	}
-
-	public void testFile1001() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/emptyFile.css", null);
-	}
-
-	public void testFile1002() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_eucjp.css", null);
-	}
-
-	public void testFile1003() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_jis.css", null);
-	}
-
-	public void testFile4() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_sjis.css", null);
-	}
-
-
-	public void testFile5() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/noEncoding.css", null);
-	}
-
-	public void testFile6() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandard.css", null);
-	}
-
-	public void testFile8() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed2.css", null);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml
deleted file mode 100644
index 2be68ffc7..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	
-	<!-- Configurable Properties -->
-	
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-	
-		<echo message="basedir ${basedir}" />
-	    <echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.wst.css.tests.encoding" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-	
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.wst.css.tests.encoding.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true" />
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${wst-folder}" />
-			<property name="plugin-name" value="org.eclipse.wst.css.tests.encoding" />
-			<property name="classname" value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" />
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.wst.css.tests.encoding.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-		<!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7ca..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
-	font-family : "�ͣ� �Х����å�";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768beb..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
-	font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda9e..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
-	font-family : "�l�r �o�S�V�b�N";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc9e..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
-	font-family: "Times New Roman", "MS Sans Serif";
-	text-decoration: none;
-	background-color: white;
-}
-
-TD {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	text-align: left;
-}
-
-TH {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder;
-	text-align: left;
-}
-
-H1 {
-	font-family: "Times New Roman";
-	font-size: 14pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder;
-	text-align: center
-}
-
-H2 {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder
-}
-
-H3 {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: italic  
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997ebbc..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44ab..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1fd0..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-    @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.classpath b/tests/org.eclipse.wst.dtd.ui.tests/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore b/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
deleted file mode 100644
index 65ebfe74a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-dtduitests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.project b/tests/org.eclipse.wst.dtd.ui.tests/.project
deleted file mode 100644
index f497e031a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/build.properties b/tests/org.eclipse.wst.dtd.ui.tests/build.properties
deleted file mode 100644
index 72a89306c..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.dtduitests.jar = src/
-output.dtduitests.jar = bin/
-bin.includes = plugin.xml,\
-               dtduitests.jar,\
-               test.xml
-src.includes = plugin.xml,\
-               test.xml
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/plugin.xml b/tests/org.eclipse.wst.dtd.ui.tests/plugin.xml
deleted file mode 100644
index 61f8e3831..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.dtd.ui.tests"
-   name="DTD UI Tests"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin">
-
-   <runtime>
-      <library name="dtduitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-		<import plugin="org.eclipse.core.resources"/>
-		<import plugin="org.eclipse.core.runtime" />
-		<import plugin="org.eclipse.jface.text"/>
-		<import plugin="org.eclipse.ui" />
-		<import plugin="org.eclipse.ui.editors"/>
-		<import plugin="org.eclipse.ui.ide" />
-		<import plugin="org.eclipse.ui.views"/>
-		<import plugin="org.eclipse.ui.workbench"/>
-		<import plugin="org.eclipse.ui.workbench.texteditor"/>
-		<import plugin="org.eclipse.wst.common.ui"/>
-		<import plugin="org.eclipse.wst.common.uriresolver"/>
-		<import plugin="org.eclipse.wst.dtd.core"/>
-		<import plugin="org.eclipse.wst.dtd.ui"/>
-		<import plugin="org.eclipse.wst.sse.core"/>
-		<import plugin="org.eclipse.wst.sse.ui"/>
-		<import plugin="org.eclipse.wst.validation"/>
-		<import plugin="org.eclipse.wst.xml.core"/>
-		<import plugin="org.junit"/>
-   </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
deleted file mode 100644
index 5397305dc..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
+++ /dev/null
@@ -1,104 +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.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class DTDUIPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.dtd.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-
-	private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
-		String originalValue = store.getString(prefKey);
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-		store.setValue(prefKey, expectedValue);
-		String foundValue = store.getString(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
deleted file mode 100644
index f0e3c2dc0..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
+++ /dev/null
@@ -1,31 +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.dtd.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.dtd.ui.tests.viewer.TestViewerConfigurationDTD;
-
-
-
-public class DTDUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new DTDUITestSuite();
-	}
-
-	public DTDUITestSuite() {
-		super("DTD UI TestSuite");
-		addTest(new TestSuite(VerifyUIPlugin.class));
-		addTest(new TestSuite(DTDUIPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfigurationDTD.class));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
deleted file mode 100644
index ba2daa76a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
+++ /dev/null
@@ -1,32 +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.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-
-public class VerifyUIPlugin extends TestCase {
-
-	public void testPluginExists() {
-		// TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
-		assertTrue(true);
-		Plugin plugin = null;
-		try {
-			plugin = DTDUIPlugin.getDefault();
-		}
-		catch (Exception e) {
-			plugin = null;
-		}
-		assertNotNull("editor plugin could not be instantiated", plugin);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
deleted file mode 100644
index 14ed0caeb..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.dtd.ui.tests.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DTDUITestsPlugin extends Plugin {
-	// The shared instance.
-	private static DTDUITestsPlugin plugin;
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public DTDUITestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DTDUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = DTDUITestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.dtd.ui.tests.internal.TestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java
deleted file mode 100644
index f69fda111..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java
+++ /dev/null
@@ -1,144 +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.dtd.ui.tests.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * 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 {
-	private static final String PLUGIN_ID = "org.eclipse.wst.dtd.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * 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 == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!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, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(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 (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(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 (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + 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) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
deleted file mode 100644
index 004100d91..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.eclipse.wst.dtd.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.dtd.core.internal.provisional.text.IDTDPartitionTypes;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.provisional.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.tests.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.IHighlighter;
-
-public class TestViewerConfigurationDTD extends TestCase {
-
-	private StructuredTextViewer fViewer = null;
-	private StructuredTextViewerConfigurationDTD fConfig = null;
-	private IPreferenceStore fPreferenceStore = null;
-	private boolean fDisplayExists = true;
-	private boolean isSetup = false;
-
-	public TestViewerConfigurationDTD() {
-		super("TestViewerConfigurationDTD");
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		if (!this.isSetup) {
-			setUpPreferences();
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-	}
-
-	private void setUpPreferences() {
-		fPreferenceStore = DTDUIPlugin.getDefault().getPreferenceStore();
-		fPreferenceStore.setValue(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED, true);
-	}
-
-	private void setUpViewerConfiguration() {
-
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			}
-			else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationDTD(fPreferenceStore);
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "TestViewerConfigurationHTML tests cannot run because there is no DISPLAY available");
-		}
-	}
-
-	public void testGetAutoEditStrategies() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IDTDPartitionTypes.DTD_DEFAULT);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-
-	public void testGetConfiguredContentTypes() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-
-	public void testGetContentAssistant() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-
-	public void testGetCorrectionAssistant() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentAssistant ca = fConfig.getCorrectionAssistant(fViewer);
-		assertNotNull("there is no correction assistant", ca);
-	}
-
-//	public void testGetContentFormatter() {
-//
-//		// probably no display
-//		if (!fDisplayExists)
-//			return;
-//
-//		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-//		assertNotNull("there is no content formatter", cf);
-//	}
-
-	public void testGetDoubleClickStrategy() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if (strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-
-	public void testGetHighlighter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IHighlighter highlighter = fConfig.getHighlighter(fViewer);
-		assertNotNull("Highlighter is null", highlighter);
-	}
-
-//	public void testGetInformationPresenter() {
-//
-//		// probably no display
-//		if (!fDisplayExists)
-//			return;
-//
-//		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-//		assertNotNull("InformationPresenter is null", presenter);
-//	}
-
-//	public void testGetAnnotationHover() {
-//
-//		// probably no display
-//		if (!fDisplayExists)
-//			return;
-//
-//		IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
-//		assertNotNull("AnnotationHover is null", hover);
-//	}
-
-	public void testUnconfigure() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		fConfig.unConfigure(fViewer);
-		// need a good test here to make sure thing are really unconfigured
-
-		// need to re-set up since it's likely
-		// more tests are called after this one
-		setUpViewerConfiguration();
-	}
-
-//	public void testGetReconciler() {
-//
-//		// probably no display
-//		if (!fDisplayExists)
-//			return;
-//
-//		IReconciler r = fConfig.getReconciler(fViewer);
-//		assertNotNull("Reconciler is null", r);
-//	}
-//
-//	public void testGetHyperlinkDetectors() {
-//
-//		// probably no display
-//		if (!fDisplayExists)
-//			return;
-//
-//		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-//		assertNotNull(detectors);
-//		assertTrue("there are no hyperlink detectors", detectors.length > 1);
-//	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
deleted file mode 100644
index db1fa19b2..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
+++ /dev/null
@@ -1,447 +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.dtd.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.internal.provisional.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentoutline.StructuredTextEditorContentOutlinePage;
-import org.eclipse.wst.sse.ui.internal.provisional.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.w3c.dom.Attr;
-
-public class ViewerTestDTD extends ViewPart {
-	private final String SSE_EDITOR_FONT = "com.ibm.sse.editor.textfont";
-	private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n	<HEAD>\n		<META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n		<TITLE>place title here</TITLE>\n	</HEAD>\n	<BODY>\n		place content here	\n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
-
-	private StructuredTextViewer fSourceViewer = null;
-	private StructuredTextViewerConfiguration fConfig = null;
-	private IContentOutlinePage fContentOutlinePage = null;
-	private INodeSelectionListener fHighlightRangeListener = null;
-
-	/**
-	 * Sets the viewer's highlighting text range to the text range indicated
-	 * by the selected Nodes.
-	 */
-	protected class NodeRangeSelectionListener implements INodeSelectionListener {
-		public void nodeSelectionChanged(NodeSelectionChangedEvent event) {
-			if (!event.getSelectedNodes().isEmpty()) {
-				IndexedRegion startNode = (IndexedRegion) event.getSelectedNodes().get(0);
-				IndexedRegion endNode = (IndexedRegion) event.getSelectedNodes().get(event.getSelectedNodes().size() - 1);
-
-				if (startNode instanceof Attr)
-					startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-				if (endNode instanceof Attr)
-					endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-				int start = startNode.getStartOffset();
-				int end = endNode.getEndOffset();
-
-				fSourceViewer.resetVisibleRegion();
-				fSourceViewer.setVisibleRegion(start, end - start);
-				fSourceViewer.setSelectedRange(start, 0);
-			}
-			else {
-				fSourceViewer.resetVisibleRegion();
-			}
-		}
-	}
-
-	protected class NumberInputDialog extends Dialog {
-		public NumberInputDialog(Shell shell) {
-			super(shell);
-		}
-
-		public Text start;
-		int startValue;
-		public Text length;
-		int lengthValue;
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite container = new Composite(composite, SWT.NULL);
-			container.setLayoutData(new GridData(GridData.FILL_BOTH));
-			container.setLayout(new GridLayout(2, true));
-			setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
-			Label label = new Label(container, SWT.NULL);
-			label.setText("Start");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			label = new Label(container, SWT.NULL);
-			label.setText("Length");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			start = new Text(container, SWT.BORDER);
-			startValue = fSourceViewer.getVisibleRegion().getOffset();
-			start.setText("" + startValue);
-			start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			length = new Text(container, SWT.BORDER);
-			lengthValue = fSourceViewer.getVisibleRegion().getLength();
-			length.setText("" + lengthValue);
-			length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			// start.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == start) {
-			// try {
-			// startValue = Integer.decode(start.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// startValue = 0;
-			// }
-			// }
-			// }
-			// });
-			// length.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == length) {
-			// try {
-			// lengthValue = Integer.decode(length.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// lengthValue = 0;
-			// }
-			// }
-			// }
-			// });
-
-			return composite;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			try {
-				startValue = Integer.decode(start.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				startValue = 0;
-			}
-			try {
-				lengthValue = Integer.decode(length.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				lengthValue = 0;
-			}
-			super.okPressed();
-		}
-	}
-
-	protected void addActions(IContributionManager mgr) {
-		if (mgr != null) {
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "New HTML";
-				}
-
-				public void run() {
-					super.run();
-					BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-						public void run() {
-							setupViewerForNew();
-							fSourceViewer.setEditable(true);
-						}
-					});
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility";
-				}
-
-				public void run() {
-					super.run();
-					NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
-					int proceed = dlg.open();
-					if (proceed == Window.CANCEL)
-						return;
-					fSourceViewer.resetVisibleRegion();
-					fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All";
-				}
-
-				public void run() {
-					super.run();
-					fSourceViewer.resetVisibleRegion();
-				}
-			});
-			mgr.add(new Separator());
-			// no longer able to set input to NULL
-			// mgr.add(new Action() {
-			// public String getText() {
-			// return getToolTipText();
-			// }
-			//
-			// public String getToolTipText() {
-			// return "Set Input to NULL";
-			// }
-			// public void run() {
-			// super.run();
-			// viewer.setInput(null);
-			// }
-			// });
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input from Active Editor";
-				}
-
-				public void run() {
-					super.run();
-					ITextEditor textEditor = getActiveEditor();
-					if (textEditor != null) {
-						setupViewerForEditor(textEditor);
-						fSourceViewer.setEditable(true);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(true);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection As ReadOnly";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(false);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Stop Following Selection";
-				}
-
-				public void run() {
-					super.run();
-					stopFollowSelection();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
-		addActions(mgr);
-
-		// create source viewer & its content type-specific viewer
-		// configuration
-		fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		fConfig = new StructuredTextViewerConfigurationDTD();
-
-		// set up the viewer with a document & viewer config
-		setupViewerForNew();
-
-		setupViewerPreferences();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		stopFollowSelection();
-		fSourceViewer.unconfigure();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
-			fSourceViewer.getControl().setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-	}
-
-	/**
-	 * Set up source viewer with any additional preferences it should have Ex:
-	 * font, tab width
-	 */
-	private void setupViewerPreferences() {
-		fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
-	}
-
-	/**
-	 * Set up source viewer with a new document & configure it
-	 */
-	private void setupViewerForNew() {
-		stopFollowSelection(); // if was following selection, stop
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		doc.set(DEFAULT_VIEWER_CONTENTS);
-
-		fSourceViewer.setDocument(doc);
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(fConfig);
-	}
-
-	/**
-	 * Returns the current active text editor if possible
-	 * 
-	 * @return ITextEditor
-	 */
-	private ITextEditor getActiveEditor() {
-		ITextEditor editor = null;
-		IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart instanceof ITextEditor)
-			editor = (ITextEditor) editorPart;
-		if (editor == null && editorPart != null)
-			editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-		return editor;
-	}
-
-	/**
-	 * Sets up the viewer with the same document/input as the given editor
-	 * 
-	 * @param ITextEditor
-	 *            editor - the editor to use *cannot to be null*
-	 */
-	private void setupViewerForEditor(ITextEditor editor) {
-		stopFollowSelection(); // if was following selection, stop
-		IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-		fSourceViewer.setDocument(doc);
-
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(new StructuredTextViewerConfigurationDTD());
-	}
-
-	/**
-	 * Hooks up the viewer to follow the selection made in the active editor
-	 */
-	private void followSelection() {
-		ITextEditor editor = getActiveEditor();
-		if (editor != null) {
-			setupViewerForEditor(editor);
-			if (fHighlightRangeListener == null)
-				fHighlightRangeListener = new NodeRangeSelectionListener();
-
-			fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
-			if (fContentOutlinePage != null && fContentOutlinePage instanceof StructuredTextEditorContentOutlinePage) {
-				((StructuredTextEditorContentOutlinePage) fContentOutlinePage).getViewerSelectionManager().addNodeSelectionListener(fHighlightRangeListener);
-
-				if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
-					fSourceViewer.resetVisibleRegion();
-
-					Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
-					IndexedRegion startNode = (IndexedRegion) nodes[0];
-					IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
-					if (startNode instanceof Attr)
-						startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-					if (endNode instanceof Attr)
-						endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-					int start = startNode.getStartOffset();
-					int end = endNode.getEndOffset();
-
-					fSourceViewer.setVisibleRegion(start, end - start);
-					fSourceViewer.setSelectedRange(start, 0);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Cease following the selection made in the editor
-	 */
-	private void stopFollowSelection() {
-		if (fContentOutlinePage != null && fContentOutlinePage instanceof StructuredTextEditorContentOutlinePage) {
-			((StructuredTextEditorContentOutlinePage) fContentOutlinePage).getViewerSelectionManager().removeNodeSelectionListener(fHighlightRangeListener);
-			fSourceViewer.resetVisibleRegion();
-			fContentOutlinePage = null;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/test.xml b/tests/org.eclipse.wst.dtd.ui.tests/test.xml
deleted file mode 100644
index 9ae2df4e0..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-    <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-    		
-		<echo message="basedir ${basedir}" />
-		<echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.wst.dtd.ui.tests" />
-    <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.wst.dtd.ui.tests.*xml"/>
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${workspace}" quiet="true"/>
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="data-dir" value="${wst-folder}"/>
-			<property name="plugin-name" value="${plugin-name}" />
-			<property name="classname" value="org.eclipse.wst.dtd.ui.tests.DTDUITestSuite" />
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-	  <!--<delete dir="${workspace}" quiet="true"/>-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.wst.dtd.ui.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-<!--		<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="nitind@us.ibm.com,david_williams@us.ibm.com" /> -->
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/.classpath b/tests/org.eclipse.wst.html.core.tests/.classpath
deleted file mode 100644
index 065ac06e1..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.core.tests/.cvsignore b/tests/org.eclipse.wst.html.core.tests/.cvsignore
deleted file mode 100644
index f90a72f76..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-htmlcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.html.core.tests/.project b/tests/org.eclipse.wst.html.core.tests/.project
deleted file mode 100644
index 25bb24033..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9760fed1d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,69 +0,0 @@
-#Wed Jan 12 16:48:16 EST 2005
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
deleted file mode 100644
index b67db1821..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest
-Source :
-<a href="<%=c%>">a</a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a href=")
-[9, 10] (<)
-[10, 12] (%=)
-[12, 13] (c)
-[13, 14] (%)
-[14, 18] (>">a)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a href&#61;")@[18, 22] (</a>)
-----#text(<%&#61;c%>">a)@{[9, 10] (<),[10, 12] (%&#61;),[12, 13] (c),[13, 14] (%),[14, 18] (>">a)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
deleted file mode 100644
index 7962c6149..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest2
-Source :
-<a b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 15] (<a b="c" d="e">)
-[15, 16] (f)
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 15] (<a b&#61;"c" d&#61;"e">)@[16, 20] (</a>)
-----#text(f)@[15, 16] (f)
-
-b.name=x:b
-b.value=c
-a b=null
-a x:b=c
-Source :
-<a x:b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 17] (<a x:b="c" d="e">)
-[17, 18] (f)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 17] (<a x:b&#61;"c" d&#61;"e">)@[18, 22] (</a>)
-----#text(f)@[17, 18] (f)
-
-Source :
-<a x:b="c" y:d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 19] (<a x:b="c" y:d="e">)
-[19, 20] (f)
-[20, 24] (</a>)
-
-Tree :
-#document
---a/a@[0, 19] (<a x:b&#61;"c" y:d&#61;"e">)@[20, 24] (</a>)
-----#text(f)@[19, 20] (f)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
deleted file mode 100644
index 8deb57191..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
deleted file mode 100644
index 8ef86ab70..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest2
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
deleted file mode 100644
index c7cc12171..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest3
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new < content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new < content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new < content)@[3, 28] (<![CDATA[new < content]]>)
-
-new < content
-Source :
-<a><![CDATA[new > content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new > content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new > content)@[3, 28] (<![CDATA[new > content]]>)
-
-new > content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
deleted file mode 100644
index 2cca97b7c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.DocTypeTest
-Source :
-<!DOCTYPE HTML><html></html>
-
-
-StructuredDocument Regions :
-[0, 15] (<!DOCTYPE HTML>)
-[15, 21] (<html>)
-[21, 28] (</html>)
-
-Tree :
-#document
---HTML(null)(null)@[0, 15] (<!DOCTYPE HTML>)
---html/html@[15, 21] (<html>)@[21, 28] (</html>)
-
-Source :
-<!DOCTYPE HTML SYSTEM "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 30] (<!DOCTYPE HTML SYSTEM "sytem">)
-[30, 36] (<html>)
-[36, 43] (</html>)
-