dynamic content across all UA

10 files changed, 29 insertions, 68 deletions

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>