dynamic content across all UA

18 files changed, 62 insertions, 200 deletions

diff --git a/org.eclipse.ua.tests/data/help/context/contexts.xml b/org.eclipse.ua.tests/data/help/context/contexts.xml
deleted file mode 100644
index 19963f40c..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-
-<contexts>
-   <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"/>
-	  
-	  <!-- should never appear -->
-	  <topic filter="os=invalid" label="Your OS is invalid" href="data/help/context/simple_page.html"/>
-	  <topic filter="ws=invalid" label="Your WS is invalid" href="data/help/context/simple_page.html"/>
-	  <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 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=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 -->
-      <topic filter="product=invalid" label="The product invalid is running" href="data/help/context/simple_page.html"/>
-
-      <topic filter="category=org.eclipse.categories.developmentCategory" label="The category org.eclipse.categories.developmentCategory is enabled" href="data/help/context/simple_page.html"/>
-
-      <!-- should never appear -->
-      <topic filter="category=invalid" label="The category invalid is enabled" href="data/help/context/simple_page.html"/>
-
-      <topic filter="activity=org.eclipse.javaDevelopment" label="The activity org.eclipse.javaDevelopment is enabled" href="data/help/context/simple_page.html"/>
-
-      <!-- should never appear -->
-      <topic filter="activity=invalid" label="The activity invalid is enabled" href="data/help/context/simple_page.html"/>	
-	  
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_expected.txt b/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
deleted file mode 100644
index fbd2fd71f..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
+++ /dev/null
@@ -1,30 +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="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin my.invalid.plugin.id.12345 is NOT 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>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/context/simple_page.html b/org.eclipse.ua.tests/data/help/context/simple_page.html
deleted file mode 100644
index 5918e900f..000000000
--- a/org.eclipse.ua.tests/data/help/context/simple_page.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><HTML>
-<HEAD>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<TITLE>Test</TITLE>
-</HEAD>
-
-<p>
-Test
-</p>
-
-</BODY>
-</HTML>
diff --git a/org.eclipse.ua.tests/data/help/dynamic/filter_expected.txt b/org.eclipse.ua.tests/data/help/dynamic/filter_expected.txt
index 3edd5098a..428e09f24 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/filter_expected.txt
+++ b/org.eclipse.ua.tests/data/help/dynamic/filter_expected.txt
@@ -8,14 +8,14 @@
 	
 	
 	
-	<element></element>
-	<element></element>
-	<element></element>
-	<element></element>
-	<element></element>
-	<element></element>
-	<element></element>
-	<element></element>
+	<element filter="os!=invalid"></element>
+	<element filter="ws!=invalid"></element>
+	<element filter="arch!=invalid"></element>
+	<element filter="product!=invalid"></element>
+	<element filter="plugin!=invalid"></element>
+	<element filter="category!=invalid"></element>
+	<element filter="activity!=invalid"></element>
+	<element filter="systemProperty!=invalid"></element>
 
 	
 	
@@ -29,28 +29,28 @@
 
 	
 	<element>
-		
+		<filter name="os" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="ws" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="arch" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="product" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="plugin" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="category" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="activity" value="!invalid"></filter>
 	</element>
 	<element>
-		
+		<filter name="systemProperty" value="!invalid"></filter>
 	</element>
 
 	
@@ -65,8 +65,8 @@
 
 	
 	<element>
-		
-		
+		<filter name="os" value="!invalid"></filter>
+		<filter name="ws" value="!invalid"></filter>
 	</element>
 
 	
@@ -74,7 +74,7 @@
 
 	
 	<element>
-		
+		<filter name="os" value="!invalid"></filter>
 		<child>This child element shouldnt be filtered</child>
 	</element>
 
@@ -86,7 +86,7 @@
 	
 
 	
-	<element>
+	<element filter="os!=invalid">
 		<doc id="doc.1">
 	<description>
 		This document contains a mixture of dynamic content and is used by other
@@ -112,7 +112,7 @@
 </doc>
 	</element>
 	<element>
-		
+		<filter name="os" value="!invalid"></filter>
 		<doc id="doc.1">
 	<description>
 		This document contains a mixture of dynamic content and is used by other
@@ -141,30 +141,30 @@
 	
 
 	
-	<element></element>
+	<element filter=""></element>
 
 	
-	<element></element>
+	<element filter="invalid"></element>
 
 	
-	<element></element>
+	<element filter="invalid="></element>
 
 	
-	<element></element>
+	<element filter="=invalid"></element>
 
 	
 	<element>
-		
+		<filter></filter>
 	</element>
 
 	
 	<element>
-		
+		<filter value="invalid"></filter>
 	</element>
 
 	
 	<element>
-		
+		<filter name="invalid"></filter>
 	</element>
 
 </root>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/index/index.xml b/org.eclipse.ua.tests/data/help/index/index.xml
index 4952da9f6..056a3336a 100644
--- a/org.eclipse.ua.tests/data/help/index/index.xml
+++ b/org.eclipse.ua.tests/data/help/index/index.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <index>
-   <entry keyword="topic1.html">
+   <entry keyword="keyword1">
       <topic href="data/help/index/topic1.html"/>
    </entry>
-   <entry keyword="topic2.html">
+   <entry keyword="keyword2">
       <topic href="data/help/index/topic2.html"/>
    </entry>
-   <entry keyword="topic3.html">
+   <entry keyword="keyword3">
       <topic href="data/help/index/topic3.html"/>
    </entry>
-   <entry keyword="topic4.html">
+   <entry keyword="keyword4">
       <topic href="data/help/index/topic4.html"/>
    </entry>
 </index>
diff --git a/org.eclipse.ua.tests/data/help/index/parser/index.xml b/org.eclipse.ua.tests/data/help/index/parser/index.xml
deleted file mode 100644
index 8c1e5df1a..000000000
--- a/org.eclipse.ua.tests/data/help/index/parser/index.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<index>
-   <entry keyword="keyword1">
-      <topic href="topic1.html" label="label1"/>
-      <topic href="topic2.html"/>
-   </entry>
-   <entry keyword="keyword2">
-      <topic href="topic3.html"/>
-      <entry keyword="keyword3"/>
-      <entry keyword="keyword4">
-         <topic href="topic4.html"/>
-      </entry>
-   </entry>
-</index>
diff --git a/org.eclipse.ua.tests/data/help/manual/dynamic.xhtml b/org.eclipse.ua.tests/data/help/manual/filter.xhtml
index fef3940f2..fef3940f2 100644
--- a/org.eclipse.ua.tests/data/help/manual/dynamic.xhtml
+++ b/org.eclipse.ua.tests/data/help/manual/filter.xhtml
diff --git a/org.eclipse.ua.tests/data/help/manual/manual.xml b/org.eclipse.ua.tests/data/help/manual/manual.xml
index a9d1d89f9..2cc6e067f 100644
--- a/org.eclipse.ua.tests/data/help/manual/manual.xml
+++ b/org.eclipse.ua.tests/data/help/manual/manual.xml
@@ -3,6 +3,6 @@
 
 <toc label="manual.xml" link_to="data/help/toc/root.xml#content">
 	<topic label="manual">
-		<topic label="dynamic xhtml" href="data/help/manual/dynamic.xhtml"/>
+		<topic label="filter" href="data/help/manual/filter.xhtml"/>
 	</topic>
 </toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/a.xml b/org.eclipse.ua.tests/data/help/toc/assembler/a.xml
index 26b25a22d..a4b4bccc1 100644
--- a/org.eclipse.ua.tests/data/help/toc/assembler/a.xml
+++ b/org.eclipse.ua.tests/data/help/toc/assembler/a.xml
@@ -4,4 +4,5 @@
 <toc label="A">
 	<topic filter="ws=invalid" label="A_topic" href="A_topic.html"/>
 	<link toc="data/help/toc/assembler/b.xml"/>
+	<link toc="data/help/toc/assembler/d.xml"/>
 </toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/b.xml b/org.eclipse.ua.tests/data/help/toc/assembler/b.xml
index 2c9daf8c7..c89870c0b 100644
--- a/org.eclipse.ua.tests/data/help/toc/assembler/b.xml
+++ b/org.eclipse.ua.tests/data/help/toc/assembler/b.xml
@@ -6,6 +6,7 @@
 		<topic label="B_topic2" href="B_topic2.html"/>
 		<anchor id="B_anchor"/>
 	</topic>
+	<link toc="data/help/toc/assembler/d.xml"/>
 	<topic label="B_topic3" href="B_topic3.html">
 		<filter name="os" value="!invalid"/>
 	</topic>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/d.xml b/org.eclipse.ua.tests/data/help/toc/assembler/d.xml
new file mode 100644
index 000000000..7847e7da5
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/toc/assembler/d.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="D">
+	<topic label="D_topic" href="D_topic.html"/>
+</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c.xml b/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c.xml
deleted file mode 100644
index 6e4a0259b..000000000
--- a/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="A">
-	<topic label="B_topic1" href="B_topic1.html">
-		<topic label="B_topic2" href="B_topic2.html"/>
-		<topic label="C_topic" href="C_topic.html"/>
-	</topic>
-	<topic label="B_topic3" href="B_topic3.html"/>
-</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c_d.xml b/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c_d.xml
new file mode 100644
index 000000000..b1d73d3a2
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/toc/assembler/result_a_b_c_d.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="A">
+   <topic filter="ws=invalid" href="/org.eclipse.ua.tests/A_topic.html" label="A_topic"/>
+   <topic href="/org.eclipse.ua.tests/B_topic1.html" label="B_topic1">
+      <topic href="/org.eclipse.ua.tests/B_topic2.html" label="B_topic2"/>
+      <topic href="/org.eclipse.ua.tests/C_topic.html" label="C_topic"/>
+   </topic>
+   <topic href="/org.eclipse.ua.tests/D_topic.html" label="D_topic"/>
+   <topic href="/org.eclipse.ua.tests/B_topic3.html" label="B_topic3">
+      <filter value="!invalid" name="os"/>
+   </topic>
+   <topic href="/org.eclipse.ua.tests/D_topic.html" label="D_topic"/>
+</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/assembler/result_b_c.xml b/org.eclipse.ua.tests/data/help/toc/assembler/result_b_c.xml
index 2b3c6a0a0..6f9266b2d 100644
--- a/org.eclipse.ua.tests/data/help/toc/assembler/result_b_c.xml
+++ b/org.eclipse.ua.tests/data/help/toc/assembler/result_b_c.xml
@@ -2,9 +2,11 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 
 <toc label="B">
-	<topic label="B_topic1" href="B_topic1.html">
-		<topic label="B_topic2" href="B_topic2.html"/>
-		<topic label="C_topic" href="C_topic.html"/>
+	<topic label="B_topic1" href="/org.eclipse.ua.tests/B_topic1.html">
+		<topic label="B_topic2" href="/org.eclipse.ua.tests/B_topic2.html"/>
+		<topic label="C_topic" href="/org.eclipse.ua.tests/C_topic.html"/>
+	</topic>
+	<topic label="B_topic3" href="/org.eclipse.ua.tests/B_topic3.html">
+		<filter name="os" value="!invalid"/>
 	</topic>
-	<topic label="B_topic3" href="B_topic3.html"/>
 </toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/otherDir/page3.html b/org.eclipse.ua.tests/data/help/toc/parser/extraDir/otherDir/page3.html
deleted file mode 100644
index 5918e900f..000000000
--- a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/otherDir/page3.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><HTML>
-<HEAD>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<TITLE>Test</TITLE>
-</HEAD>
-
-<p>
-Test
-</p>
-
-</BODY>
-</HTML>
diff --git a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page1.html b/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page1.html
deleted file mode 100644
index 5918e900f..000000000
--- a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><HTML>
-<HEAD>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<TITLE>Test</TITLE>
-</HEAD>
-
-<p>
-Test
-</p>
-
-</BODY>
-</HTML>
diff --git a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page2.html b/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page2.html
deleted file mode 100644
index 5918e900f..000000000
--- a/org.eclipse.ua.tests/data/help/toc/parser/extraDir/page2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><HTML>
-<HEAD>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<TITLE>Test</TITLE>
-</HEAD>
-
-<p>
-Test
-</p>
-
-</BODY>
-</HTML>
diff --git a/org.eclipse.ua.tests/data/help/toc/parser/toc.xml b/org.eclipse.ua.tests/data/help/toc/parser/toc.xml
deleted file mode 100644
index cea8e46b4..000000000
--- a/org.eclipse.ua.tests/data/help/toc/parser/toc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="myToc" topic="myFakeTopic.html" link_to="myOtherToc.xml">
-	<anchor id="myAnchor"/>
-	<topic label="myTopic" href="myTopic.html">
-		<topic label="mySubtopic" href="mySubtopic.html">
-			<filter name="os" value="win32"/>
-		</topic>
-	</topic>
-	<link filter="ws!=gtk" toc="myOtherToc2.xml"/>
-</toc>