diff --git a/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
index c16d39345f539da0220e2b442f72be2162a9440f..709c708534463832fbdd60d1279dee1fb11bdcb3 100644
--- a/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
@@ -6,4 +6,3 @@ Bundle-SymbolicName: org.eclipse.wst.doc.isv; singleton:=true
Bundle-Version: 1.0.304.qualifier
Bundle-Localization: plugin
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.properties b/docs/org.eclipse.wst.doc.isv/javadoc.properties
index fd91fb4897bd22c7ab8f8b9dd949125faf1fdcf8..96606d11fde2154118208b354384b780fb582957 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.properties
@@ -1,6 +1,5 @@
-eclipse.home=${osgi.install.area}
-plugin.basedir=.
+
plugin.sourcefolders=../org.eclipse.wst.common.modulecore/modulecore-src;\
../org.eclipse.wst.common.frameworks/src;\
../org.eclipse.wst.common.frameworks.ui/wtp_ui;\
@@ -67,149 +66,7 @@ org.eclipse.wst.xml.ui.views.contentoutline,\
org.eclipse.wst.xml.ui.views.properties
-api.packages.old=org.eclipse.wst.common.componentcore,\
-org.eclipse.wst.common.componentcore.resources,\
-org.eclipse.wst.common.componentcore.datamodel.properties\
-org.eclipse.wst.common.frameworks.datamodel,\
-org.eclipse.wst.common.frameworks.datamodel.properties,\
-org.eclipse.wst.common.emf.utilities,\
-org.eclipse.wst.common.uriresolver.internal.provisional,\
-org.eclipse.wst.validation.core,\
-org.eclipse.wst.internet.monitor.core,\
-org.eclipse.wst.internet.monitor.ui,\
-org.eclipse.wst.server.core,\
-org.eclipse.wst.server.core.model,\
-org.eclipse.wst.server.core.util,\
-org.eclipse.wst.server.ui.actions,\
-org.eclipse.wst.server.ui,\
-org.eclipse.wst.server.ui.editor,\
-org.eclipse.wst.server.ui.wizard,\
-org.eclipse.wst.css.core.contenttype,\
-org.eclipse.wst.css.core.parser,\
-org.eclipse.wst.css.core.document,\
-org.eclipse.wst.dtd.core.contenttype,\
-org.eclipse.wst.dtd.core.document,\
-org.eclipse.wst.dtd.ui,\
-org.eclipse.wst.dtd.ui.views.contentoutline,\
-org.eclipse.wst.html.core,\
-org.eclipse.wst.html.core.contenttype,\
-org.eclipse.wst.sse.core,\
-org.eclipse.wst.sse.core.events,\
-org.eclipse.wst.sse.core.text,\
-org.eclipse.wst.sse.core.filebuffers,\
-org.eclipse.wst.sse.core.format,\
-org.eclipse.wst.sse.core.preferences,\
-org.eclipse.wst.common.snippets.core,\
-org.eclipse.wst.common.snippets.editors,\
-org.eclipse.wst.common.snippets.insertions,\
-org.eclipse.wst.sse.ui.preferences,\
-org.eclipse.wst.sse.ui,\
-org.eclipse.wst.sse.ui.contentassist,\
-org.eclipse.wst.sse.ui.edit,\
-org.eclipse.wst.sse.ui.format,\
-org.eclipse.wst.sse.ui.style,\
-org.eclipse.wst.sse.ui.views.contentoutline,\
-org.eclipse.wst.sse.ui.views.properties,\
-org.eclipse.wst.sse.ui.extensions.breakpoint,\
-org.eclipse.wst.sse.ui.contentproperties,\
-org.eclipse.wst.xml.core,\
-org.eclipse.wst.xml.core.contenttype,\
-org.eclipse.wst.xml.core.document,\
-org.eclipse.wst.xml.core.parser,\
-org.eclipse.wst.xml.uriresolver,\
-org.eclipse.wst.xml.uriresolver.ui,\
-org.eclipse.wst.wsdl,\
-org.eclipse.wst.wsdl.util,\
-org.eclipse.wst.wsdl.binding.soap
api.title=Web Tools Platform: Web Standards Tools
-classpath=../org.eclipse.wst.common.emf/bin;\
-../org.eclipse.wst.common.emfworkbench.integration/bin;\
-../org.eclipse.wst.common.modulecore/bin;\
-../org.eclipse.wst.common.frameworks.ui/bin;\
-../org.eclipse.wst.common.frameworks/bin;\
-../org.eclipse.wst.common.emf/bin;\
-../org.eclipse.wst.validation/bin;\
-../org.eclipse.wst.internet.monitor.core/bin;\
-../org.eclipse.wst.internet.monitor.ui/bin;\
-../org.eclipse.wst.server.core/bin;\
-../org.eclipse.wst.server.ui/bin;\
-../org.eclipse.wst.css.core/bin;\
-../org.eclipse.wst.css.ui/bin;\
-../org.eclipse.wst.dtd.core/bin;\
-../org.eclipse.wst.html.core/bin;\
-../org.eclipse.wst.html.ui/bin;\
-../org.eclipse.wst.javascript.core/bin;\
-../org.eclipse.wst.javascript.ui/bin;\
-../org.eclipse.wst.sse.core/bin;\
-../org.eclipse.wst.common.snippets/bin;\
-../org.eclipse.wst.sse.ui/bin;\
-../org.eclipse.wst.xml.core/bin;\
-../org.eclipse.wst.xml.ui/bin;\
-../org.eclipse.wst.wsdl/bin;\
-${eclipse.home}/plugins/org.eclipse.ant.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ant.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.compare_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.core.boot_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.commands_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.expressions_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.filebuffers_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.resources.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.runtime_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.core.runtime.compatibility_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.core.variables_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.debug.core_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.debug.ui_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.appserver_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.base_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.help.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.debug.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.launching_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.jdt.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jface_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.jface.text_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ltk.ui.refactoring_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi.services_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.osgi.util_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.runtime_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.pde.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.rcp_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.search_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.swt_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.team.cvs.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.team.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.text_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.browser_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.cheatsheets_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.console_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.editors_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.externaltools_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.forms_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.ide_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.intro_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.views_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.workbench_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.ui.workbench.texteditor_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.update.configurator_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.core_3.1.1.jar;\
-${eclipse.home}/plugins/org.eclipse.update.core.win32_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.scheduler_3.1.0.jar;\
-${eclipse.home}/plugins/org.eclipse.update.ui_3.1.1.jar;
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index fbfa0d893921b2e46630c1520be5009aed746c22..d6a1c8cbc6ca728fce31cad3c924a5f49fd97d18 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -2,6 +2,8 @@
<project default="main" basedir=".">
+ <property environment="env" />
+
<property file="javadoc.properties" />
<property name="outputDir" value="${basedir}"/>
@@ -16,9 +18,10 @@
/>
</target>
- <target name="javadoc">
- <echo message="========= ${eclipse.home}"/>
- <echo message="Classpath: ${classpath}" />
+ <target name="javadoc">
+ <echo message="classpath: ${J2SE15}" />
+ <echo message="buildDirectory: ${buildDirectory}" />
+ <echo message="JAVADOC_COMMAND: ${env.JAVADOC_COMMAND}" />
<mkdir dir="${outputDir}/reference/api/overview" />
@@ -26,10 +29,10 @@
<fileset dir="${basedir}/api-overview/overview/"/>
<fileset dir="${basedir}/.." includes="*/javadoc-images/*.jpg"/>
</copy>
- <javadoc
+ <javadoc executable="${env.JAVADOC_COMMAND}"
access="public"
author="false"
- classpath="${classpath}"
+
destdir="${outputDir}/reference/api"
doctitle="${api.title}"
nodeprecated="false"
@@ -46,7 +49,22 @@
breakiterator="yes"
verbose="false"
failonerror="false"
- />
+ >
+
+ <classpath>
+ <pathelement path="${classpath}"/>
+ <fileset dir="${buildDirectory}/../eclipse/plugins">
+ <include name="**/*.jar"/>
+ </fileset>
+ <dirset dir="${buildDirectory}">
+ <include name="**/@dot/**/*.class"/>
+ </dirset>
+ <dirset dir="${buildDirectory}">
+ <include name="**/bin/**/*"/>
+ </dirset>
+ </classpath>
+
+ </javadoc>
</target>
<target name="packagetoc">
<loadfile