132251 New: NOT function on filters

13 files changed, 43 insertions, 497 deletions

diff --git a/org.eclipse.ua.tests/data/help/context/contexts.xml b/org.eclipse.ua.tests/data/help/context/contexts.xml
index ed1c0fe00..19963f40c 100644
--- a/org.eclipse.ua.tests/data/help/context/contexts.xml
+++ b/org.eclipse.ua.tests/data/help/context/contexts.xml
@@ -5,52 +5,23 @@
    <context id="test.id" >
       <description>This is a test context.</description>
 	  <topic label="This topic should always appear" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=win32" label="Your OS is win32" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=linux" label="Your OS is linux" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=macosx" label="Your OS is macosx" href="data/help/context/simple_page.html"/>
 	  
 	  <!-- should never appear -->
 	  <topic filter="os=invalid" label="Your OS is invalid" href="data/help/context/simple_page.html"/>
-	  
-	  <topic filter="ws=win32" label="Your WS is win32" href="data/help/context/simple_page.html"/>
-	  <topic filter="ws=gtk" label="Your WS is gtk" href="data/help/context/simple_page.html"/>
-	  <topic filter="ws=carbon" label="Your WS is carbon" href="data/help/context/simple_page.html"/>
-	  
-	  <!-- should never appear -->
 	  <topic filter="ws=invalid" label="Your WS is invalid" href="data/help/context/simple_page.html"/>
-
-	  <topic filter="arch=x86" label="Your ARCH is x86" href="data/help/context/simple_page.html"/>
-	  <topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/context/simple_page.html"/>
-
-	  <!-- should never appear -->
 	  <topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/context/simple_page.html"/>
-	  
-	  <topic label="Your OS is win32 AND your WS is win32" href="data/help/context/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-	  </topic>
-
-	  <topic label="Your OS is linux AND your WS is gtk" href="data/help/context/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-	  </topic>
-
-	  <topic label="Your OS is macosx AND your WS is carbon" href="data/help/context/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-	  </topic>
-
-	  <!-- should never appear -->
 	  <topic label="Your OS is win32 AND your WS is invalid" href="data/help/context/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
 	  </topic>
 
 	  <topic filter="plugin=org.eclipse.help" label="The plugin org.eclipse.help is installed" href="data/help/context/simple_page.html"/>
+	  <topic filter="plugin!=org.eclipse.help" label="The plugin org.eclipse.help is NOT installed" href="data/help/context/simple_page.html"/>
 
       <!-- should never appear -->
-      <topic filter="plugin=invalid" label="The plugin invalid is installed" href="data/help/context/simple_page.html"/>
+      <topic filter="plugin=my.invalid.plugin.id.12345" label="The plugin my.invalid.plugin.id.12345 is installed" href="data/help/context/simple_page.html"/>
 
+      <topic filter="plugin!=my.invalid.plugin.id.12345d" label="The plugin my.invalid.plugin.id.12345 is NOT installed" href="data/help/context/simple_page.html"/>
       <topic filter="product=org.eclipse.sdk.ide" label="The product org.eclipse.sdk.ide is running" href="data/help/context/simple_page.html"/>
 
       <!-- should never appear -->
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt b/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
index 1d86c68e4..fbd2fd71f 100644
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt
+++ b/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
@@ -7,23 +7,11 @@
             href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
       </topic>
       <topic
-            label="Your OS is linux"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
+            label="The plugin org.eclipse.help is installed"
             href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
       </topic>
       <topic
-            label="The plugin org.eclipse.help is installed"
+            label="The plugin my.invalid.plugin.id.12345 is NOT installed"
             href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
       </topic>
       <topic
@@ -39,4 +27,4 @@
             href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
       </topic>
    </context>
-</contexts>
+</contexts>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt b/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt
deleted file mode 100644
index 76f03d888..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<contexts>
-   <context id="test.id">
-      <description>This is a test context.<description>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt b/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt
deleted file mode 100644
index c61019fe6..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<contexts>
-   <context id="test.id">
-      <description>This is a test context.<description>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml b/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
index c855300b7..17c02c356 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
@@ -18,8 +18,28 @@
 This page contains filtered content.
 </p>
 <p filter="os=invalid">
-This paragraph should always be filtered out.
+This paragraph, which has filter attribute "os=invalid" should always be filtered out.
 </p>
+<p filter="os!=invalid">
+This paragraph, which has filter attribute "os!=invalid" should never be filtered out.
+</p>
+<p filter="plugin=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin=my.invalid.plugin.id.012345" should always be filtered out.
+</p>
+<p filter="plugin!=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345" should never be filtered out.
+</p>
+<p>
+   <filter name="plugin" value="my.invalid.plugin.id.012345"/>
+   This paragraph, which has filter element name="plugin", value="my.invalid.plugin.id.012345",
+   should always be filtered out.
+</p>
+<p>
+   <filter name="plugin" value="!my.invalid.plugin.id.012345"/>
+   This paragraph, which has filter element name="plugin", value="!my.invalid.plugin.id.012345",
+   should never be filtered out.
+</p>
+
 
 </body>
 </html>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt b/org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt
index c82bdaaa0..4259491ce 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt
+++ b/org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt
@@ -5,7 +5,7 @@
 --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+
 <title>dynamicInZip.xhtml</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
index f839440a4..005f29040 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
@@ -5,7 +5,7 @@
 --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+
 <title>dynamic.xhtml</title>
 </head>
 <body>
@@ -15,6 +15,20 @@
 This page contains filtered content.
 </p>
 
+<p filter="os!=invalid">
+This paragraph, which has filter attribute "os!=invalid" should never be filtered out.
+</p>
+
+<p filter="plugin!=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345" should never be filtered out.
+</p>
+
+<p>
+   <filter name="plugin" value="!my.invalid.plugin.id.012345" />
+   This paragraph, which has filter element name="plugin", value="!my.invalid.plugin.id.012345",
+   should never be filtered out.
+</p>
+
 
 </body>
 </html>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
index e7b25dca4..e7b25dca4 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
index e35bbb632..e35bbb632 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml b/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
index 2d1115349..bcbfe497a 100644
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
@@ -8,67 +8,17 @@
 	<topic label="This topic should always appear" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-	<topic filter="os=win32" label="Your OS is win32" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="os=linux" label="Your OS is linux" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="os=macosx" label="Your OS is macosx" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
 
 	<!-- should never appear -->
 	<topic filter="os=invalid" label="Your OS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-
-	<topic filter="ws=win32" label="Your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="ws=gtk" label="Your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="ws=carbon" label="Your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic filter="ws=invalid" label="Your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-
-	<topic filter="arch=x86" label="Your ARCH is x86" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-	
-	<topic label="Your OS is win32 AND your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<topic label="Your OS is linux AND your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<topic label="Your OS is macosx AND your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic label="Your OS is win32 AND your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
@@ -115,42 +65,11 @@
 	<!-- Topics -->
 
 	<topic label="This topic should always appear" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=win32" label="Your OS is win32" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=linux" label="Your OS is linux" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=macosx" label="Your OS is macosx" href="data/help/toc/filteredToc/simple_page.html"/>
 
 	<!-- should never appear -->
 	<topic filter="os=invalid" label="Your OS is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<topic filter="ws=win32" label="Your WS is win32" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="ws=gtk" label="Your WS is gtk" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="ws=carbon" label="Your WS is carbon" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<!-- should never appear -->
 	<topic filter="ws=invalid" label="Your WS is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<topic filter="arch=x86" label="Your ARCH is x86" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<!-- should never appear -->
 	<topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-	
-	<topic label="Your OS is win32 AND your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-	</topic>
-
-	<topic label="Your OS is linux AND your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-	</topic>
-
-	<topic label="Your OS is macosx AND your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-	</topic>
-
-	<!-- should never appear -->
 	<topic label="Your OS is win32 AND your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
index 70112dd80..72cb7236f 100644
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
@@ -14,38 +14,6 @@
          </topic>
       </topic>
       <topic
-            label="Your OS is linux"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
             label="The plugin org.eclipse.help is installed"
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
@@ -82,22 +50,6 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
       </topic>
       <topic
-            label="Your OS is linux"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
             label="The plugin org.eclipse.help is installed"
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
       </topic>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt
deleted file mode 100644
index a62416e5c..000000000
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="filteredToc"
-      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
-   <topic
-         label="filter.xml"
-         href="null">
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-   </topic>
-</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt
deleted file mode 100644
index 97066bf6e..000000000
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="filteredToc"
-      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
-   <topic
-         label="filter.xml"
-         href="null">
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-         <topic
-               label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
-         </topic>
-      </topic>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-   </topic>
-</toc>