--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties.bak	2012-11-05 14:15:46.379557112 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties	2012-11-05 14:16:38.473928155 +0100
@@ -10,3 +10,8 @@
 ###############################################################################
 # use provided build.xml
 custom=true
+
+bin.includes = META-INF/,\
+               plugin.properties,\
+               *.xml, *.zip,*.html,*.htm,*.png,book.css,guide/,META-INF/,porting/,questions/,reference/,index/
+bin.excludes = build.properties,build.xml,buildDoc.xml,.m2
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.xml	2012-11-05 14:18:07.805566686 +0100
@@ -39,6 +39,7 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+		<property name="basedir.properties" value="pde_basedirs.properties" />
 		<ant antfile="buildDoc.xml" />
 		<mkdir dir="${destination.temp.folder}/${full.name}" />
 		<copy todir="${destination.temp.folder}/${full.name}">
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml	2012-11-05 14:23:14.218775753 +0100
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Jdt Doc Isv Build" default="all"  basedir="." >
-
+    
+	<property file="${basedir.properties}"/>
+	
 	<target name="init">
 		<available file="${basedir}/index" property="index.present"/>
 	</target>
@@ -21,15 +23,15 @@
 		<property name="dest" value="reference/extension-points" />
 		<record name="${basedir}/jdtconvert.txt" action="start"/>
 
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.apt.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core.manipulation/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.launching/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.jdt.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.core}/org.eclipse.jdt.apt.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.core}/org.eclipse.jdt.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.debug}/org.eclipse.jdt.debug/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.jdt.junit/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.debug}/org.eclipse.jdt.launching/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.jdt.ui/plugin.xml" destination="${dest}" />
 
 		<record name="${basedir}/jdtconvert.txt" action="stop"/>
 	</target>
@@ -60,7 +62,10 @@
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
 		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${baseLocation}" />
-
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.core@" value="${eclipse.jdt.core}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.debug@" value="${eclipse.jdt.debug}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
 		
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
@@ -0,0 +1,19 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
+eclipse.jdt.core=../../../eclipse.jdt.core
+eclipse.jdt.ui=../../../eclipse.jdt.ui
+eclipse.jdt.debug=../../../eclipse.jdt.debug
+eclipse.platform.ant=../../../eclipse.platform/ant
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt.bak	2012-11-05 14:11:11.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt	2012-11-05 14:26:56.445392861 +0100
@@ -1,92 +1,92 @@
 -quiet
 -encoding "iso-8859-1"
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.jdt.annotation/src
-;../org.eclipse.ant.launching/src
-;../org.eclipse.ant.ui/Ant Editor
-;../org.eclipse.ant.ui/Ant Tools Support
-;../org.eclipse.jdt.apt.core/src
-;../org.eclipse.jdt.core/antadapter
-;../org.eclipse.jdt.core/batch
-;../org.eclipse.jdt.core/codeassist
-;../org.eclipse.jdt.core/compiler
-;../org.eclipse.jdt.core/dom
-;../org.eclipse.jdt.core/eval
-;../org.eclipse.jdt.core/formatter
-;../org.eclipse.jdt.core/model
-;../org.eclipse.jdt.core/search
-;../org.eclipse.jdt.core.manipulation/common
-;../org.eclipse.jdt.core.manipulation/refactoring
-;../org.eclipse.jdt.debug/eval
-;../org.eclipse.jdt.debug/jdi
-;../org.eclipse.jdt.debug/model
-;../org.eclipse.jdt.debug.ui/ui
-;../org.eclipse.jdt.junit/src
-;../org.eclipse.jdt.junit.core/src
-;../org.eclipse.jdt.junit.runtime/src
-;../org.eclipse.jdt.launching/launching
-;../org.eclipse.jdt.ui/core extension
-;../org.eclipse.jdt.ui/core refactoring
-;../org.eclipse.jdt.ui/internal compatibility
-;../org.eclipse.jdt.ui/ui
-;../org.eclipse.jdt.ui/ui refactoring"
+-sourcepath "@eclipse.jdt.core@/org.eclipse.jdt.annotation/src
+;@eclipse.platform.ant@/org.eclipse.ant.launching/src
+;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Editor
+;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Tools Support
+;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/src
+;@eclipse.jdt.core@/org.eclipse.jdt.core/antadapter
+;@eclipse.jdt.core@/org.eclipse.jdt.core/batch
+;@eclipse.jdt.core@/org.eclipse.jdt.core/codeassist
+;@eclipse.jdt.core@/org.eclipse.jdt.core/compiler
+;@eclipse.jdt.core@/org.eclipse.jdt.core/dom
+;@eclipse.jdt.core@/org.eclipse.jdt.core/eval
+;@eclipse.jdt.core@/org.eclipse.jdt.core/formatter
+;@eclipse.jdt.core@/org.eclipse.jdt.core/model
+;@eclipse.jdt.core@/org.eclipse.jdt.core/search
+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/common
+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/refactoring
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/eval
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/model
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/ui
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/src
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/src
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.runtime/src
+;@eclipse.jdt.debug@/org.eclipse.jdt.launching/launching
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core extension
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core refactoring
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/internal compatibility
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui refactoring"
 -d reference/api
 -classpath @rt@
-;../com.ibm.icu_*.jar
-;../org.apache.ant_*/lib/ant.jar
-;../org.eclipse.ant.core/@dot
-;../org.eclipse.compare/@dot
-;../org.eclipse.compare.core/@dot
-;../org.eclipse.core.commands/@dot
-;../org.eclipse.core.contenttype/@dot
-;../org.eclipse.core.expressions/@dot
-;../org.eclipse.core.externaltools/@dot
-;../org.eclipse.core.filebuffers/@dot
-;../org.eclipse.core.filesystem/@dot
-;../org.eclipse.core.jobs/@dot
-;../org.eclipse.core.resources/@dot
-;../org.eclipse.core.runtime/@dot
-;../org.eclipse.core.runtime.content/@dot
-;../org.eclipse.core.runtime.jobs/@dot
-;../org.eclipse.core.runtime.preferences/@dot
-;../org.eclipse.core.variables/@dot
-;../org.eclipse.debug.core/@dot
-;../org.eclipse.debug.ui/@dot
-;../org.eclipse.equinox.app/@dot
-;../org.eclipse.equinox.common/@dot
-;../org.eclipse.equinox.preferences/@dot
-;../org.eclipse.equinox.registry/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help/@dot
-;../org.eclipse.help.ui/@dot
-;../org.eclipse.jdt.apt.core/mirrorapi.jar
-;../org.eclipse.jdt.core.manipulation/@dot
-;../org.eclipse.jdt.debug/jdi.jar
-;../org.eclipse.jdt.junit/@dot
-;../org.eclipse.jdt.junit.core/@dot
-;../org.eclipse.jface/@dot
-;../org.eclipse.jface.text/@dot
-;../org.eclipse.ltk.core.refactoring/@dot
-;../org.eclipse.ltk.ui.refactoring/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi.util/@dot
-;../org.eclipse.search/@dot
-;../org.eclipse.swt.win32.win32.x86/@dot
-;../org.eclipse.team.core/@dot
-;../org.eclipse.team.ui/@dot
-;../org.eclipse.text/@dot
-;../org.eclipse.ui/@dot
-;../org.eclipse.ui.console/@dot
-;../org.eclipse.ui.editors/@dot
-;../org.eclipse.ui.externaltools/@dot
-;../org.eclipse.ui.forms/@dot
-;../org.eclipse.ui.ide/@dot
-;../org.eclipse.ui.navigator/@dot
-;../org.eclipse.ui.views/@dot
-;../org.eclipse.ui.workbench/@dot
-;../org.eclipse.ui.workbench.texteditor/@dot
-;../org.junit/junit.jar
+;@dependency.dir@/com.ibm.icu_*.jar
+;@dependency.dir@/@org.apache.ant.jar@
+;@eclipse.platform.ant@/org.eclipse.ant.core/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.externaltools/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.core.filebuffers/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
+;@eclipse.equinox.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
+;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/mirrorapi.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.swt.win32.win32.x86/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.team.core/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.team.ui/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.ui.console/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.ui.externaltools/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
+;@dependency.dir@/org.junit/junit.jar
 -breakiterator
 -use
 -splitIndex
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties
@@ -0,0 +1,19 @@
+dot.classes=@dot
+dependency.dir=..
+
+eclipse.jdt.core=..
+eclipse.jdt.ui=..
+eclipse.jdt.debug=..
+eclipse.platform.ant=..
+eclipse.platform.debug=..
+eclipse.platform.resources.bundles=..
+eclipse.platform.runtime.bundles=..
+eclipse.platform.team.bundles=..
+eclipse.platform.text=..
+eclipse.platform.ua=..
+eclipse.platform.ui.bundles=..
+rt.equinox.bundles.bundles=..
+rt.equinox.framework.bundles=..
+
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
+org.apache.ant.jar=org.apache.ant_*/lib/ant.jar
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak	2012-11-05 14:11:23.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml	2012-11-05 14:30:47.057081369 +0100
@@ -23,4 +23,64 @@
   <artifactId>org.eclipse.jdt.doc.isv</artifactId>
   <version>3.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+	<profiles>
+		<profile>
+			<id>builddoc</id>
+			<activation>
+				<property>
+					<name>builddoc</name>
+					<value>1</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<!-- this is actually present in any 0.14+ version -->
+						<version>${tycho.version}</version>
+						<configuration>
+							<!-- this is to fix some lucene 3.x compatibility issue -->
+							<argLine>-Dhelp.lucene.tokenizer=standard</argLine>
+							<!-- actuall indexer call -->
+							<appArgLine>-application org.eclipse.ant.core.antRunner \
+								-buildfile buildDoc.xml \
+								-Dbasedir.properties=cbi_basedirs.properties</appArgLine>
+							<dependencies>
+								<!-- list of bundles that we need -->
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.help.base</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.build</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>compile</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties.bak	2012-11-05 14:11:22.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties	2012-11-05 14:33:50.018427096 +0100
@@ -9,4 +9,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 # use provided build.xml
-custom=true
\ No newline at end of file
+custom=true
+
+bin.includes=*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/,index/,concepts/, gettingStarted/, images/, reference/, tasks/, tips/, whatsNew/
+bin.excludes=build.properties,build.xml,workspace,.m2
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml.bak	2012-11-05 14:11:23.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml	2012-11-05 14:36:12.039445921 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012 Eclipse Foundation.
+  Copyright (c) 2012 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -23,4 +23,52 @@
   <artifactId>org.eclipse.jdt.doc.user</artifactId>
   <version>3.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+	<profiles>
+		<profile>
+			<id>builddoc</id>
+			<activation>
+				<property>
+					<name>builddoc</name>
+					<value>1</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<argLine>-Dhelp.lucene.tokenizer=standard</argLine>
+							<appArgLine>-application org.eclipse.ant.core.antRunner \
+								-buildfile build.xml build.index</appArgLine>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.help.base</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>compile</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml	2012-11-05 14:39:07.247699156 +0100
@@ -12,6 +12,8 @@
 
 <project name="PDE Doc ISV Build" default="all"  basedir="." >
 
+	<property file="${basedir.properties}"/>
+	
 	<target name="init">
 		<available file="${basedir}/index" property="index.present"/>
 	</target>
@@ -31,10 +33,10 @@
 		<property name="dest" value="reference/extension-points" />
 		<record name="${basedir}/pdeconvert.txt" action="start"/>
 
-		<pde.convertSchemaToHTML manifest="../org.eclipse.pde.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.pde.build/plugin.xml" destination="${dest}" />
-    	<pde.convertSchemaToHTML manifest="../org.eclipse.pde.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.pde.launching/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.pde.ui.ui}/org.eclipse.pde.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.pde.build}/org.eclipse.pde.build/plugin.xml" destination="${dest}" />
+    	<pde.convertSchemaToHTML manifest="${eclipse.pde.ui.ui}/org.eclipse.pde.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.pde.ui.ui}/org.eclipse.pde.launching/plugin.xml" destination="${dest}" />
 
 		<record name="${basedir}/pdeconvert.txt" action="stop"/>
 	</target>
@@ -61,6 +63,9 @@
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
 		
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.ui.ui@" value="${eclipse.pde.ui.ui}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde.build@" value="${eclipse.pde.build}" />
+		
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
 		<fileset dir="${basedir}/.." id="fileSet">
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
@@ -0,0 +1,2 @@
+eclipse.pde.ui.ui=../../../eclipse.pde.ui/ui
+eclipse.pde.build=../../../eclipse.pde.build
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/customBuildCallbacks.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/customBuildCallbacks.xml	2012-11-05 14:40:35.008330410 +0100
@@ -18,6 +18,7 @@
 	<!--  feature.directory - the directory containing the resulting feature   -->
 	<!-- ===================================================================== -->
 	<target name="pre.gather.bin.parts">
+		<property name="basedir.properties" value="pde_basedirs.properties"/>
 		<antcall target="build.index"/>	
 	</target>
 	
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt.bak	2012-11-05 14:11:11.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt	2012-11-05 14:43:01.694390097 +0100
@@ -1,9 +1,9 @@
 -quiet
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.pde.core/src
-;../org.eclipse.pde.ui/src
-;../org.eclipse.pde.build/src
-;../org.eclipse.pde.launching/src"
+-sourcepath "@eclipse.pde.ui.ui@/org.eclipse.pde.core/src
+;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/src
+;@eclipse.pde.build@/org.eclipse.pde.build/src
+;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
 -d reference/api
 -classpath @rt@
 ;../org.eclipse.compare/@dot
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
@@ -0,0 +1,2 @@
+eclipse.pde.ui.ui=..
+eclipse.pde.build=..
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml.bak	2012-11-05 14:11:23.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml	2012-11-05 14:45:46.377585808 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012 Eclipse Foundation.
+  Copyright (c) 2012 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -23,4 +23,61 @@
   <artifactId>org.eclipse.pde.doc.user</artifactId>
   <version>3.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+	<profiles>
+		<profile>
+			<id>builddoc</id>
+			<activation>
+				<property>
+					<name>builddoc</name>
+					<value>1</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<argLine>-Dhelp.lucene.tokenizer=standard</argLine>
+							<appArgLine>-application org.eclipse.ant.core.antRunner \
+								-buildfile buildDoc.xml \
+								-Dbasedir.properties=cbi_basedirs.properties</appArgLine>
+							<dependencies>
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.help.base</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.build</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>compile</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml	2012-11-05 14:50:56.839854132 +0100
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Platform Doc Isv Build" default="all"  basedir="." >
 
+	<property file="${basedir.properties}"/>
+	
 	<target name="init">
 		<available file="${basedir}/index" property="index.present"/>
 	</target>
@@ -22,76 +24,75 @@
 		<property name="dest" value="reference/extension-points" />
 
 		<record name="${basedir}/platformconvert.txt" action="start"/>
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ant.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ant.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.compare/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.contenttype/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.expressions/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.filebuffers/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.filesystem/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.resources/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.runtime/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.core.variables/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.debug.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.debug.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.e4.ui.workbench/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.equinox.preferences/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.equinox.app/plugin.xml" destination="${dest}" />
-        <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.bidi/plugin.xml" destination="${dest}" /> 
-		<pde.convertSchemaToHTML manifest="../org.eclipse.equinox.http.registry/plugin.xml" destination="${dest}" />
-        <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.registry/plugin.xml" destination="${dest}" /> 
-        <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.security/plugin.xml" destination="${dest}" /> 
-		<pde.convertSchemaToHTML manifest="../org.eclipse.help/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.help.base/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.help.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.help.webapp/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ltk.core.refactoring/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ltk.ui.refactoring/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.search/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.team.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.team.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.browser/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.cheatsheets/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ant}/org.eclipse.ant.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ant}/org.eclipse.ant.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.team.bundles}/org.eclipse.compare/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.runtime.bundles}/org.eclipse.core.contenttype/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.runtime.bundles}/org.eclipse.core.expressions/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.text}/org.eclipse.core.filebuffers/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.resources.bundles}/org.eclipse.core.filesystem/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.resources.bundles}/org.eclipse.core.resources/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.runtime.bundles}/org.eclipse.core.runtime/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.debug}/org.eclipse.core.variables/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.debug}/org.eclipse.debug.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.debug}/org.eclipse.debug.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.e4.ui.workbench/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.preferences/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.app/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.bidi/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.http.registry/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.registry/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${rt.equinox.bundles.bundles}/org.eclipse.equinox.security/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.help/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.help.base/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.help.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.help.webapp/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.ltk.core.refactoring/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.jdt.ui}/org.eclipse.ltk.ui.refactoring/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.text}/org.eclipse.search/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.team.bundles}/org.eclipse.team.core/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.team.bundles}/org.eclipse.team.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.ui/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.ui.browser/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/plugin.xml" destination="${dest}" />
 		<!--copy extra files linked to by generated extension point doc-->
-		<copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html" todir="${dest}"/>
-		<copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.exsd" todir="${dest}"/>
-		<copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.html" todir="${dest}"/>
-		<copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd" todir="${dest}"/>
+		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html" todir="${dest}"/>
+		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.exsd" todir="${dest}"/>
+		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html" todir="${dest}"/>
+		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd" todir="${dest}"/>
 		
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.console/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.editors/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.externaltools/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.ide/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.intro/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.debug}/org.eclipse.ui.console/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.text}/org.eclipse.ui.editors/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.debug}/org.eclipse.ui.externaltools/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.ui.ide/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ua}/org.eclipse.ui.intro/plugin.xml" destination="${dest}" />
 		<!--copy extra HTML file linked to by generated extension point doc-->
-		<copy file="../org.eclipse.ui.intro/schema/introContentFileSpec.html" todir="${dest}"/>
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.navigator/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.views.properties.tabbed/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ui.workbench.texteditor/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.update.core/plugin.xml" destination="${dest}" />
+		<copy file="${eclipse.platform.ua}/org.eclipse.ui.intro/schema/introContentFileSpec.html" todir="${dest}"/>
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.ui.navigator/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.ui.bundles}/org.eclipse.ui.views.properties.tabbed/plugin.xml" destination="${dest}" />
+		<pde.convertSchemaToHTML manifest="${eclipse.platform.text}/org.eclipse.ui.workbench.texteditor/plugin.xml" destination="${dest}" />
 		<record name="${basedir}/platformconvert.txt" action="stop"/>
 	</target>
 
 	<target name="examplesDocCopy" >
 		<copy todir="samples">
-			<fileset dir="..">
-				<include name="org.eclipse.compare.examples/doc-html/"/>
-				<include name="org.eclipse.compare.examples.xml/doc-html/"/>				
-				<include name="org.eclipse.swt.examples/doc-html/"/>
-				<include name="org.eclipse.swt.examples.browser/doc-html/"/>
-				<include name="org.eclipse.swt.examples.controls/doc-html/"/>
-				<include name="org.eclipse.swt.examples.launcher/doc-html/"/>
-				<include name="org.eclipse.swt.examples.layouts/doc-html/"/>
-				<include name="org.eclipse.swt.examples.ole.win32/doc-html/"/>
-				<include name="org.eclipse.swt.examples.paint/doc-html/"/>
-				<include name="org.eclipse.ui.examples.fieldassist/doc-html/"/>
-				<include name="org.eclipse.ui.examples.javaeditor/doc-html/"/>
-				<include name="org.eclipse.ui.examples.multipageeditor/doc-html/"/>
-				<include name="org.eclipse.ui.examples.propertysheet/doc-html/"/>
-				<include name="org.eclipse.ui.examples.readmetool/doc-html/"/>
-				<include name="org.eclipse.ui.examples.undo/doc-html/"/>
-				<include name="org.eclipse.team.examples.filesystem/doc-html/"/>
+			<fileset dir=".">
+			    <include name="${eclipse.platform.team.examples}/org.eclipse.compare.examples/doc-html/"/>
+			    <include name="${eclipse.platform.team.examples}/org.eclipse.compare.examples.xml/doc-html/"/>              
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.browser/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.controls/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.launcher/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.layouts/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.ole.win32/doc-html/"/>
+			    <include name="${eclipse.platform.swt.examples}/org.eclipse.swt.examples.paint/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.fieldassist/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.javaeditor/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.multipageeditor/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.propertysheet/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.readmetool/doc-html/"/>
+			    <include name="${eclipse.platform.ui.examples}/org.eclipse.ui.examples.undo/doc-html/"/>
+			    <include name="${eclipse.platform.team.examples}/org.eclipse.team.examples.filesystem/doc-html/"/>
 			</fileset>
 		</copy>
 	</target>
@@ -117,7 +118,25 @@
 		
 		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
 		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-		
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.jdt.ui@" value="${eclipse.jdt.ui}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.pde@" value="${eclipse.pde}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ant@" value="${eclipse.platform.ant}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.debug@" value="${eclipse.platform.debug}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.platform@" value="${eclipse.platform.platform}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.resources.bundles@" value="${eclipse.platform.resources.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.runtime.bundles@" value="${eclipse.platform.runtime.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.bundles@" value="${eclipse.platform.swt.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.bundles@" value="${eclipse.platform.team.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.text@" value="${eclipse.platform.text}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ua@" value="${eclipse.platform.ua}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.bundles@" value="${eclipse.platform.ui.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.update@" value="${eclipse.platform.update}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.bundles.bundles@" value="${rt.equinox.bundles.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.framework.bundles@" value="${rt.equinox.framework.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt.equinox.p2.bundles@" value="${rt.equinox.p2.bundles}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.team.examples@" value="${eclipse.platform.team.examples}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.swt.examples@" value="${eclipse.platform.swt.examples}" />
+		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.examples@" value="${eclipse.platform.ui.examples}" />
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
 		<fileset dir="${basedir}/.." id="fileSet">
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -0,0 +1,20 @@
+eclipse.jdt.ui=../../../eclipse.jdt.ui
+eclipse.pde=../../../eclipse.pde
+eclipse.platform.ant=../../../eclipse.platform/ant
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.platform=../../../eclipse.platform/platform
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.swt.bundles=../../../eclipse.platform.swt/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+eclipse.platform.update=../../../eclipse.platform/update
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
+eclipse.platform.team.examples=../../../eclipse.platform.team/examples
+eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
+eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
+
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/customBuildCallbacks.xml.bak	2012-10-01 11:24:28.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/customBuildCallbacks.xml	2012-11-05 14:53:19.830847656 +0100
@@ -26,6 +26,7 @@
 	<!--   build.result.folder - folder to contain the build results           -->
 	<!-- ===================================================================== -->
 	<target name="post.build.jars">
+		<property name="basedir.properties" value="pde_basedirs.properties"/>
 		<ant antfile="buildDoc.xml" />
 	</target>
 	
--- /dev/null
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
@@ -0,0 +1,19 @@
+eclipse.jdt.ui=..
+eclipse.pde=..
+eclipse.platform.ant=..
+eclipse.platform.debug=..
+eclipse.platform.platform=..
+eclipse.platform.resources.bundles=..
+eclipse.platform.runtime.bundles=..
+eclipse.platform.swt.bundles=..
+eclipse.platform.team.bundles=..
+eclipse.platform.text=..
+eclipse.platform.ua=..
+eclipse.platform.ui.bundles=..
+eclipse.platform.update=..
+rt.equinox.bundles.bundles=..
+rt.equinox.framework.bundles=..
+rt.equinox.p2.bundles=..
+eclipse.platform.team.examples=..
+eclipse.platform.swt.examples=..
+eclipse.platform.ui.examples=..
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt.bak	2012-11-05 14:11:11.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt	2012-11-05 14:56:21.958102851 +0100
@@ -2,133 +2,133 @@
 -encoding "iso-8859-1"
 -charset "iso-8859-1"
 -sourcepath "
-;../org.eclipse.ant.core/src
-;../org.eclipse.compare.core/src
-;../org.eclipse.compare/compare
-;../org.eclipse.core.commands/src
-;../org.eclipse.core.contenttype/src
-;../org.eclipse.core.databinding.beans/src
-;../org.eclipse.core.databinding.observable/src
-;../org.eclipse.core.databinding.property/src
-;../org.eclipse.core.databinding/src
-;../org.eclipse.core.expressions/src
-;../org.eclipse.core.filebuffers/src
-;../org.eclipse.core.filesystem/src
-;../org.eclipse.core.jobs/src
-;../org.eclipse.core.net/src
-;../org.eclipse.core.resources/src
-;../org.eclipse.core.runtime.compatibility/src-model
-;../org.eclipse.core.runtime.compatibility/src-runtime
-;../org.eclipse.core.runtime/src
-;../org.eclipse.core.variables/src
-;../org.eclipse.debug.core/core
-;../org.eclipse.debug.ui/ui
-;../org.eclipse.equinox.app/src
-;../org.eclipse.e4.core.commands/src
-;../org.eclipse.e4.core.contexts/src
-;../org.eclipse.e4.core.di/src
-;../org.eclipse.e4.core.services/src
-;../org.eclipse.e4.ui.bindings/src
-;../org.eclipse.e4.ui.css.core/src
-;../org.eclipse.e4.ui.css.swt/src
-;../org.eclipse.e4.ui.css.swt.theme/src
-;../org.eclipse.e4.ui.di/src
-;../org.eclipse.e4.ui.model.workbench/src
-;../org.eclipse.e4.ui.services/src
-;../org.eclipse.e4.ui.widgets/src
-;../org.eclipse.e4.ui.workbench.renderers.swt/src
-;../org.eclipse.e4.ui.workbench.swt/src
-;../org.eclipse.e4.ui.workbench/src
-;../org.eclipse.e4.ui.workbench3/src
-;../org.eclipse.equinox.bidi/src
-;../org.eclipse.equinox.ds/src
-;../org.eclipse.equinox.common/src
-;../org.eclipse.equinox.frameworkadmin/src
-;../org.eclipse.equinox.http.jetty_*/src
-;../org.eclipse.equinox.http.registry/src
-;../org.eclipse.equinox.http.servlet/src
-;../org.eclipse.equinox.jsp.jasper.registry/src
-;../org.eclipse.equinox.jsp.jasper/src
-;../org.eclipse.equinox.preferences/src
-;../org.eclipse.equinox.p2.core/src
-;../org.eclipse.equinox.p2.director/src
-;../org.eclipse.equinox.p2.engine/src
-;../org.eclipse.equinox.p2.metadata/src
-;../org.eclipse.equinox.p2.metadata.repository/src
-;../org.eclipse.equinox.p2.operations/src
-;../org.eclipse.equinox.p2.ql/src
-;../org.eclipse.equinox.p2.repository/src
-;../org.eclipse.equinox.p2.touchpoint.eclipse/src
-;../org.eclipse.equinox.p2.ui/src
-;../org.eclipse.equinox.registry/src
-;../org.eclipse.equinox.security/src
-;../org.eclipse.help.base/src
-;../org.eclipse.help.base/src_demo
-;../org.eclipse.help.ui/src
-;../org.eclipse.help.webapp/src
-;../org.eclipse.help/src
-;../org.eclipse.jface.databinding/src
-;../org.eclipse.jface.text/projection
-;../org.eclipse.jface.text/src
-;../org.eclipse.jface/src
-;../org.eclipse.jsch.core/src
-;../org.eclipse.jsch.ui/src
-;../org.eclipse.ltk.core.refactoring/src
-;../org.eclipse.ltk.ui.refactoring/src
-;../org.eclipse.osgi/core/adaptor
-;../org.eclipse.osgi/core/framework
-;../org.eclipse.osgi/eclipseAdaptor/src
-;../org.eclipse.osgi/security/src
-;../org.eclipse.osgi/supplement/src
-;../org.eclipse.pde/src
-;../org.eclipse.platform/src
-;../org.eclipse.search/new search
-;../org.eclipse.search/search
-;../org.eclipse.swt/Eclipse SWT Accessibility/common/
-;../org.eclipse.swt/Eclipse SWT Accessibility/win32/
-;../org.eclipse.swt/Eclipse SWT AWT/common/
-;../org.eclipse.swt/Eclipse SWT AWT/win32/
-;../org.eclipse.swt/Eclipse SWT Browser/common/
-;../org.eclipse.swt/Eclipse SWT Browser/win32/
-;../org.eclipse.swt/Eclipse SWT Custom Widgets/common/
-;../org.eclipse.swt/Eclipse SWT Drag and Drop/common/
-;../org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
-;../org.eclipse.swt/Eclipse SWT OLE Win32/win32/
-;../org.eclipse.swt/Eclipse SWT OpenGL/common
-;../org.eclipse.swt/Eclipse SWT OpenGL/emulated
-;../org.eclipse.swt/Eclipse SWT OpenGL/glx
-;../org.eclipse.swt/Eclipse SWT OpenGL/win32
-;../org.eclipse.swt/Eclipse SWT PI/common/
-;../org.eclipse.swt/Eclipse SWT PI/common_j2se/
-;../org.eclipse.swt/Eclipse SWT PI/win32/
-;../org.eclipse.swt/Eclipse SWT Printing/common/
-;../org.eclipse.swt/Eclipse SWT Printing/win32/
-;../org.eclipse.swt/Eclipse SWT Program/common/
-;../org.eclipse.swt/Eclipse SWT Program/win32/
-;../org.eclipse.swt/Eclipse SWT/common/
-;../org.eclipse.swt/Eclipse SWT/common_j2se/
-;../org.eclipse.swt/Eclipse SWT/win32/
-;../org.eclipse.team.core/src
-;../org.eclipse.team.ui/src
-;../org.eclipse.text/projection
-;../org.eclipse.text/src
-;../org.eclipse.ui.cheatsheets/src
-;../org.eclipse.ui.console/src
-;../org.eclipse.ui.editors/src
-;../org.eclipse.ui.forms/src
-;../org.eclipse.ui.ide/extensions
-;../org.eclipse.ui.ide/src
-;../org.eclipse.ui.intro.universal/src
-;../org.eclipse.ui.intro/src
-;../org.eclipse.ui.navigator.resources/src
-;../org.eclipse.ui.navigator/src
-;../org.eclipse.ui.views.properties.tabbed/src
-;../org.eclipse.ui.views/src
-;../org.eclipse.ui.workbench.texteditor/src
-;../org.eclipse.ui.workbench/Eclipse UI
-;../org.eclipse.ui.workbench/Eclipse UI Editor Support
-;../org.eclipse.ui/src
-;../org.eclipse.update.configurator/src
+;@eclipse.platform.ant@/org.eclipse.ant.core/src
+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/src
+;@eclipse.platform.team.bundles@/org.eclipse.compare/compare
+;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/src
+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.beans/src
+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.observable/src
+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.property/src
+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/src
+;@eclipse.platform.text@/org.eclipse.core.filebuffers/src
+;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/src
+;@eclipse.platform.team.bundles@/org.eclipse.core.net/src
+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-model
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-runtime
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/src
+;@eclipse.platform.debug@/org.eclipse.core.variables/src
+;@eclipse.platform.debug@/org.eclipse.debug.core/core
+;@eclipse.platform.debug@/org.eclipse.debug.ui/ui
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.core.commands/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.contexts/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.di/src
+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.services/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.bindings/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.core/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt.theme/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.di/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.model.workbench/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.services/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.widgets/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.renderers.swt/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.swt/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench/src
+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench3/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.bidi/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.ds/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.jetty_*/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.registry/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.servlet/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper.registry/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.core/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.engine/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.operations/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ql/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.repository/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.touchpoint.eclipse/src
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ui/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/src
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.security/src
+;@eclipse.platform.ua@/org.eclipse.help.base/src
+;@eclipse.platform.ua@/org.eclipse.help.base/src_demo
+;@eclipse.platform.ua@/org.eclipse.help.ui/src
+;@eclipse.platform.ua@/org.eclipse.help.webapp/src
+;@eclipse.platform.ua@/org.eclipse.help/src
+;@eclipse.platform.ui.bundles@/org.eclipse.jface.databinding/src
+;@eclipse.platform.text@/org.eclipse.jface.text/projection
+;@eclipse.platform.text@/org.eclipse.jface.text/src
+;@eclipse.platform.ui.bundles@/org.eclipse.jface/src
+;@eclipse.platform.team.bundles@/org.eclipse.jsch.core/src
+;@eclipse.platform.team.bundles@/org.eclipse.jsch.ui/src
+;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/src
+;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/src
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/adaptor
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/framework
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/security/src
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/supplement/src
+;@eclipse.pde@/org.eclipse.pde/src
+;@eclipse.platform.platform@/org.eclipse.platform/src
+;@eclipse.platform.text@/org.eclipse.search/new search
+;@eclipse.platform.text@/org.eclipse.search/search
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Custom Widgets/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OLE Win32/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/common
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/emulated
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/glx
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/win32
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common_j2se/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/win32/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common_j2se/
+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/win32/
+;@eclipse.platform.team.bundles@/org.eclipse.team.core/src
+;@eclipse.platform.team.bundles@/org.eclipse.team.ui/src
+;@eclipse.platform.text@/org.eclipse.text/projection
+;@eclipse.platform.text@/org.eclipse.text/src
+;@eclipse.platform.ua@/org.eclipse.ui.cheatsheets/src
+;@eclipse.platform.debug@/org.eclipse.ui.console/src
+;@eclipse.platform.text@/org.eclipse.ui.editors/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/extensions
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/src
+;@eclipse.platform.ua@/org.eclipse.ui.intro.universal/src
+;@eclipse.platform.ua@/org.eclipse.ui.intro/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator.resources/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views.properties.tabbed/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/src
+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/src
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI Editor Support
+;@eclipse.platform.ui.bundles@/org.eclipse.ui/src
+;@eclipse.platform.update@/org.eclipse.update.configurator/src
 -d reference/api
 -classpath @rt@
 ;../com.ibm.icu_*.jar
@@ -194,7 +194,7 @@
 -link http://www.osgi.org/javadoc/r5/core
 -link http://www.osgi.org/javadoc/r4v42
 
-../org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
 
 org.eclipse.ant.core
 org.eclipse.compare
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.bak	2012-11-05 14:11:23.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2012-11-05 14:59:00.216219487 +0100
@@ -23,4 +23,69 @@
   <artifactId>org.eclipse.platform.doc.isv</artifactId>
   <version>4.2.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+	<profiles>
+		<profile>
+			<id>builddoc</id>
+			<activation>
+				<property>
+					<name>builddoc</name>
+					<value>1</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-eclipserun-plugin</artifactId>
+						<!-- this is actually present in any 0.14+ version -->
+						<version>${tycho.version}</version>
+						<configuration>
+							<!-- this is to fix some lucene 3.x compatibility issue -->
+							<argLine>-Dhelp.lucene.tokenizer=standard</argLine>
+							<!-- actuall indexer call -->
+							<appArgLine>-application org.eclipse.ant.core.antRunner \
+								-buildfile buildDoc.xml \
+								-Dbasedir.properties=cbi_basedirs.properties</appArgLine>
+							<dependencies>
+								<!-- list of bundles that we need -->
+								<dependency>
+									<artifactId>org.eclipse.ant.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.apache.ant</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.help.base</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.build</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.pde.core</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+								<dependency>
+									<artifactId>org.eclipse.equinox.launcher</artifactId>
+									<type>eclipse-plugin</type>
+								</dependency>
+							</dependencies>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>eclipse-run</goal>
+								</goals>
+								<phase>compile</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml.bak	2012-11-05 15:04:34.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml	2012-11-05 15:08:14.818242506 +0100
@@ -69,10 +69,10 @@
 		
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
-		<fileset dir="${basedir}/.." id="fileSet">
+		<fileset dir="${basedir}/${dependency.dir}" id="fileSet">
 			<include name="*"/>
 		</fileset>
-		<dirset dir="${basedir}/.." id="dirSet">
+		<dirset dir="${basedir}/${dependency.dir}" id="dirSet">
 			<include name="*"/>
 		</dirset>
 		<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
@@ -1,4 +1,19 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
 eclipse.jdt.core=../../../eclipse.jdt.core
 eclipse.jdt.ui=../../../eclipse.jdt.ui
 eclipse.jdt.debug=../../../eclipse.jdt.debug
 eclipse.platform.ant=../../../eclipse.platform/ant
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak	2012-11-05 15:04:40.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml	2012-11-05 15:23:21.574964609 +0100
@@ -34,6 +34,49 @@
 			</activation>
 			<build>
 				<plugins>
+	<plugin>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>target-platform-configuration</artifactId>
+		<configuration>
+			<dependency-resolution>
+				<extraRequirements>
+					<requirement>
+						<type>eclipse-plugin</type>
+						<id>com.ibm.icu</id>
+						<versionRange>0.0.0</versionRange>
+					</requirement>
+					<requirement>
+						<type>eclipse-plugin</type>
+						<id>org.apache.ant</id>
+						<versionRange>0.0.0</versionRange>
+					</requirement>
+					<requirement>
+						<type>eclipse-plugin</type>
+						<id>org.junit</id>
+						<versionRange>0.0.0</versionRange>
+					</requirement>
+				</extraRequirements>
+			</dependency-resolution>
+		</configuration>
+	</plugin>
+	<plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-dependency-plugin</artifactId>
+		<version>2.5.1</version>
+		<executions>
+			<execution>
+				<id>copy</id>
+				<phase>process-resources</phase>
+				<goals>
+					<goal>copy-dependencies</goal>
+				</goals>
+				<configuration>
+					<overwriteReleases>true</overwriteReleases>
+					<overwriteSnapshots>true</overwriteSnapshots>
+				</configuration>
+			</execution>
+		</executions>
+	</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho.extras</groupId>
 						<artifactId>tycho-eclipserun-plugin</artifactId>
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml.bak	2012-11-05 15:04:34.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml	2012-11-05 15:25:46.479044371 +0100
@@ -68,10 +68,10 @@
 		
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
-		<fileset dir="${basedir}/.." id="fileSet">
+		<fileset dir="${basedir}/${dependency.dir}" id="fileSet">
 			<include name="*"/>
 		</fileset>
-		<dirset dir="${basedir}/.." id="dirSet">
+		<dirset dir="${basedir}/${dependency.dir}" id="dirSet">
 			<include name="*"/>
 		</dirset>
 		<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
@@ -1,2 +1,22 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
+eclipse.jdt.core=../../../eclipse.jdt.core
+eclipse.jdt.debug=../../../eclipse.jdt.debug
+eclipse.jdt.ui=../../../eclipse.jdt.ui
 eclipse.pde.ui.ui=../../../eclipse.pde.ui/ui
 eclipse.pde.build=../../../eclipse.pde.build
+eclipse.platform.debug=../../../eclipse.platform.debug
+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
+eclipse.platform.swt.binaries.bundles=../../../eclipse.platform.swt.binaries/bundles
+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
+eclipse.platform.text=../../../eclipse.platform.text
+eclipse.platform.ua=../../../eclipse.platform.ua
+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
+eclipse.platform.update=../../../eclipse.platform/update
+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
+rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
+
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt.bak	2012-11-05 15:04:35.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt	2012-11-05 15:28:43.250369597 +0100
@@ -6,55 +6,55 @@
 ;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
 -d reference/api
 -classpath @rt@
-;../org.eclipse.compare/@dot
-;../org.eclipse.compare.core/@dot
-;../org.eclipse.core.boot/@dot
-;../org.eclipse.core.contenttype/@dot
-;../org.eclipse.core.jobs/@dot
-;../org.eclipse.core.resources/@dot
-;../org.eclipse.core.runtime/@dot
-;../org.eclipse.core.runtime.content/@dot
-;../org.eclipse.core.runtime.jobs/@dot
-;../org.eclipse.core.runtime.preferences/@dot
-;../org.eclipse.core.variables/@dot
-;../org.eclipse.debug.core/@dot
-;../org.eclipse.debug.ui/@dot
-;../org.eclipse.equinox.common/@dot
-;../org.eclipse.equinox.frameworkadmin/@dot
-;../org.eclipse.equinox.p2.metadata/@dot
-;../org.eclipse.equinox.p2.publisher.eclipse/@dot
-;../org.eclipse.equinox.preferences/@dot
-;../org.eclipse.equinox.registry/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help/@dot
-;../org.eclipse.help.ui/@dot
-;../org.eclipse.jdt.core/@dot
-;../org.eclipse.jdt.debug/jdi.jar
-;../org.eclipse.jdt.debug.ui/@dot
-;../org.eclipse.jdt.junit/@dot
-;../org.eclipse.jdt.junit/junitsupport.jar
-;../org.eclipse.jdt.junit.core/@dot
-;../org.eclipse.jdt.launching/@dot
-;../org.eclipse.jdt.ui/@dot
-;../org.eclipse.jface/@dot
-;../org.eclipse.jface.text/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi.util/@dot
-;../org.eclipse.pde.core/@dot
-;../org.eclipse.pde.ui/@dot
-;../org.eclipse.pde.build/@dot
-;../org.eclipse.pde.launching/@dot
-;../org.eclipse.search/@dot
-;../org.eclipse.swt.win32.win32.x86/@dot
-;../org.eclipse.text/@dot
-;../org.eclipse.ui/@dot
-;../org.eclipse.ui.editors/@dot
-;../org.eclipse.ui.ide/@dot
-;../org.eclipse.ui.views/@dot
-;../org.eclipse.ui.workbench/@dot
-;../org.eclipse.ui.workbench.texteditor/@dot
-;../org.eclipse.update.configurator/@dot
+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.boot/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher.eclipse/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
+;@eclipse.equinox.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
+;@eclipse.jdt.core@/org.eclipse.jdt.core/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
+;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/junitsupport.jar
+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
+;@eclipse.jdt.debug@/org.eclipse.jdt.launching/@dot.classes@
+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.core/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/@dot.classes@
+;@eclipse.pde.build@/org.eclipse.pde.build/@dot.classes@
+;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
+;@eclipse.platform.swt.binaries.bundles@/org.eclipse.swt.win32.win32.x86/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
+;@eclipse.platform.update@/org.eclipse.update.configurator/@dot.classes@
 -breakiterator
 -use
 -splitIndex
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
@@ -1,2 +1,21 @@
+dot.classes=@dot
+dependency.dir=..
+
+eclipse.jdt.core=..
+eclipse.jdt.debug=..
+eclipse.jdt.ui=..
 eclipse.pde.ui.ui=..
 eclipse.pde.build=..
+eclipse.platform.debug=..
+eclipse.platform.resources.bundles=..
+eclipse.platform.runtime.bundles=..
+eclipse.platform.team.bundles=..
+eclipse.platform.text=..
+eclipse.platform.ua=..
+eclipse.platform.ui=..
+eclipse.platform.update=..
+rt.equinox.bundles.bundles=..
+rt.equinox.framework.bundles=..
+rt.equinox.p2.bundles=..
+
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml.bak	2012-11-05 15:04:34.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml	2012-11-05 15:31:21.715559191 +0100
@@ -139,10 +139,10 @@
 		<replace file="${basedir}/${optionsFile}" token="@eclipse.platform.ui.examples@" value="${eclipse.platform.ui.examples}" />
 		<!-- expand _* to actual version -->
 			<!-- prepare ${replaceFile} with all files and folders from workspace -->
-		<fileset dir="${basedir}/.." id="fileSet">
+		<fileset dir="${basedir}/${dependency.dir}" id="fileSet">
 			<include name="*"/>
 		</fileset>
-		<dirset dir="${basedir}/.." id="dirSet">
+		<dirset dir="${basedir}/${dependency.dir}" id="dirSet">
 			<include name="*"/>
 		</dirset>
 		<pathconvert property="fileList" refid="fileSet" dirsep="/" pathsep="&#xA;"/>
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
@@ -1,3 +1,6 @@
+dot.classes=target/classes
+dependency.dir=target/dependency
+
 eclipse.jdt.ui=../../../eclipse.jdt.ui
 eclipse.pde=../../../eclipse.pde
 eclipse.platform.ant=../../../eclipse.platform/ant
@@ -18,3 +21,4 @@ eclipse.platform.team.examples=../../../eclipse.platform.team/examples
 eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
 eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
 
+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
@@ -1,3 +1,6 @@
+dot.classes=@dot
+dependency.dir=..
+
 eclipse.jdt.ui=..
 eclipse.pde=..
 eclipse.platform.ant=..
@@ -17,3 +20,5 @@ rt.equinox.p2.bundles=..
 eclipse.platform.team.examples=..
 eclipse.platform.swt.examples=..
 eclipse.platform.ui.examples=..
+
+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.bak	2012-11-05 15:04:40.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2012-11-05 15:35:51.721585656 +0100
@@ -35,6 +35,199 @@
 			</activation>
 			<build>
 				<plugins>
+				<plugin> 
+        <groupId>org.eclipse.tycho</groupId> 
+        <artifactId>target-platform-configuration</artifactId> 
+        <configuration> 
+          <dependency-resolution> 
+            <extraRequirements> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>com.ibm.icu</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>com.jcraft.jsch</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>javax.el</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>javax.inject</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>javax.servlet</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>javax.servlet.jsp</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.ant</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.batik.css</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.glassfish.web.javax.servlet.jsp</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.lucene.analysis</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.apache.lucene.core</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.provider.filetransfer</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.filetransfer</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.ssl</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.identity</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.provider.filetransfer.ssl</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.provider.filetransfer.httpclient</id>
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.ecf.provider.filetransfer.httpclient.ssl</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.emf.common</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.emf.ecore</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.emf.ecore.xmi</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement> 
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.continuation</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.http</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.io</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.security</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.server</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.servlet</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.eclipse.jetty.util</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.sat4j.core</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.sat4j.pb</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+              <requirement> 
+                <type>eclipse-plugin</type> 
+                <id>org.w3c.css.sac</id> 
+                <versionRange>0.0.0</versionRange> 
+              </requirement>
+            </extraRequirements> 
+          </dependency-resolution> 
+        </configuration> 
+      </plugin> 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.5.1</version>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <overwriteReleases>true</overwriteReleases>
+              <overwriteSnapshots>true</overwriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho.extras</groupId>
 						<artifactId>tycho-eclipserun-plugin</artifactId>
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt.bak	2012-11-05 17:19:09.000000000 +0100
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt	2012-11-05 17:25:46.971519416 +0100
@@ -131,50 +131,49 @@
 ;@eclipse.platform.update@/org.eclipse.update.configurator/src
 -d reference/api
 -classpath @rt@
-;../com.ibm.icu_*.jar
-;../com.jcraft.jsch_*.jar
-;../javax.annotation_*.jar
-;../javax.el_*.jar
-;../javax.inject_*.jar
-;../javax.servlet_*.jar
-;../javax.servlet.jsp_*.jar
-;../org.apache.ant_*/lib/ant.jar
-;../org.apache.batik.css_*.jar
-;../org.apache.jasper.glassfish_*.jar
-;../org.apache.lucene.analysis_*.jar
-;../org.apache.lucene.core_*.jar
-;../org.eclipse.core.runtime.compatibility.auth/@dot
-;../org.eclipse.ecf.provider.filetransfer_*.jar
-;../org.eclipse.ecf.filetransfer_*.jar
-;../org.eclipse.ecf_*.jar
-;../org.eclipse.ecf.ssl_*.jar
-;../org.eclipse.ecf.identity_*.jar
-;../org.eclipse.ecf.provider.filetransfer.ssl_*.jar
-;../org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
-;../org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
-;../org.eclipse.emf.common_*.jar
-;../org.eclipse.emf.ecore_*.jar
-;../org.eclipse.emf.ecore.xmi_*.jar
-;../org.eclipse.equinox.p2.director/@dot
-;../org.eclipse.equinox.p2.garbagecollector/@dot
-;../org.eclipse.equinox.p2.metadata.repository/@dot
-;../org.eclipse.equinox.p2.publisher/@dot
-;../org.eclipse.equinox.simpleconfigurator/@dot
-;../org.eclipse.equinox.supplement/@dot
-;../org.eclipse.help.appserver/@dot
-;../org.eclipse.osgi.services/@dot
-;../org.eclipse.osgi/@dot
-;../org.eclipse.update.ui/@dot
-;../org.eclipse.jetty.continuation_*.jar
-;../org.eclipse.jetty.http_*.jar
-;../org.eclipse.jetty.io_*.jar
-;../org.eclipse.jetty.security_*.jar
-;../org.eclipse.jetty.server_*.jar
-;../org.eclipse.jetty.servlet_*.jar
-;../org.eclipse.jetty.util_*.jar
-;../org.sat4j.core_*.jar
-;../org.sat4j.pb_*.jar
-;../org.w3c.css.sac_*.jar
+;@dependency.dir@/com.ibm.icu_*.jar
+;@dependency.dir@/com.jcraft.jsch_*.jar
+;@dependency.dir@/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*.jar
+;@dependency.dir@/javax.el_*.jar
+;@dependency.dir@/javax.inject_*.jar
+;@dependency.dir@/javax.servlet_*.jar
+;@dependency.dir@/javax.servlet.jsp_*.jar
+;@dependency.dir@/org.apache.ant_*/lib/ant.jar
+;@dependency.dir@/org.apache.batik.css_*.jar
+;@dependency.dir@/org.glassfish.web.javax.servlet.jsp_*.jar
+;@dependency.dir@/org.apache.lucene.analysis_*.jar
+;@dependency.dir@/org.apache.lucene.core_*.jar
+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility.auth/@dot.classes@
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer_*.jar
+;@dependency.dir@/org.eclipse.ecf.filetransfer_*.jar
+;@dependency.dir@/org.eclipse.ecf_*.jar
+;@dependency.dir@/org.eclipse.ecf.ssl_*.jar
+;@dependency.dir@/org.eclipse.ecf.identity_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
+;@dependency.dir@/org.eclipse.emf.common_*.jar
+;@dependency.dir@/org.eclipse.emf.ecore_*.jar
+;@dependency.dir@/org.eclipse.emf.ecore.xmi_*.jar
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.garbagecollector/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher/@dot.classes@
+;@rt.equinox.p2.bundles@/org.eclipse.equinox.simpleconfigurator/@dot.classes@
+;@eclipse.platform.supplement@/@dot.classes@
+;@eclipse.platform.ua@/org.eclipse.help.appserver/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
+;@dependency.dir@/org.eclipse.jetty.continuation_*.jar
+;@dependency.dir@/org.eclipse.jetty.http_*.jar
+;@dependency.dir@/org.eclipse.jetty.io_*.jar
+;@dependency.dir@/org.eclipse.jetty.security_*.jar
+;@dependency.dir@/org.eclipse.jetty.server_*.jar
+;@dependency.dir@/org.eclipse.jetty.servlet_*.jar
+;@dependency.dir@/org.eclipse.jetty.util_*.jar
+;@dependency.dir@/org.sat4j.core_*.jar
+;@dependency.dir@/org.sat4j.pb_*.jar
+;@dependency.dir@/org.w3c.css.sac_*.jar
 -breakiterator
 -use
 -splitIndex