[117755] Updated JavaDoc packages, corrected stylesheet, and created generated toc of listing of packages.
diff --git a/docs/org.eclipse.jst.doc.isv/api-overview/overview/apistyles.css b/docs/org.eclipse.jst.doc.isv/api-overview/overview/apistyles.css
deleted file mode 100644
index 9fe9102..0000000
--- a/docs/org.eclipse.jst.doc.isv/api-overview/overview/apistyles.css
+++ /dev/null
@@ -1,66 +0,0 @@
-
-p, table, td, th {
- font-family: arial, helvetica, geneva;
- font-size: 10pt
-}
-pre {
- font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 {
- font-family: arial, helvetica, geneva;
- font-size: 18pt;
- font-weight: bold ;
- line-height: 14px
-}
-code {
- font-family: "Courier New", Courier, mono;
- font-size: 10pt
-}
-sup {
- font-family: arial,helvetica,geneva;
- font-size: 10px
-}
-h3 {
- font-family: arial, helvetica, geneva;
- font-size: 14pt;
- font-weight: bold
-}
-li {
- font-family: arial, helvetica, geneva;
- font-size: 10pt
-}
-h1 {
- font-family: arial, helvetica, geneva;
- font-size: 28px;
- font-weight: bold
-}
-body {
- font-family: arial, helvetica, geneva;
- font-size: 10pt;
- clip: rect( );
- margin-top: 5mm;
- margin-left: 3mm;
- color: rgb(0, 0, 0);
- background-color: rgb(255, 255, 255);
- alink="#ff0000";
- link="#0000ee";
- vlink="#551a8b";
-}
-.indextop {
- font-size: x-large;;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-weight: bold
-}
-.indexsub {
- font-size: xx-small;;
- font-family: Arial, Helvetica, sans-serif;
- color: #8080FF
-}
-a:link {
- color: #0000ee;
-}
-a:visited {
- color: #551a8b;
-}
-a:active {
- color: #ff0000;
-}
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.properties b/docs/org.eclipse.jst.doc.isv/javadoc.properties
index eeb6cbe..1cebe34 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.properties
@@ -54,7 +54,23 @@
../org.eclipse.jst.server.generic.serverdefinitions/src;\
../org.eclipse.jst.server.generic.ui/src;\
-api.packages=org.eclipse.jst.j2ee.webservice.jaxrpcmap,\
+api.packages=org.eclipse.jst.j2ee.application,\
+org.eclipse.jst.j2ee.client,\
+org.eclipse.jst.j2ee.common,\
+org.eclipse.jst.j2ee.ejb,\
+org.eclipse.jst.j2ee.jca,\
+org.eclipse.jst.j2ee.jsp,\
+org.eclipse.jst.j2ee.webapplication,\
+org.eclipse.jst.j2ee.webservice.jaxrpcmap,\
+org.eclipse.jst.j2ee.webservice.wsclient,\
+org.eclipse.jst.j2ee.webservice.wscommon,\
+org.eclipse.jst.j2ee.webservice.wsdd,\
+org.eclipse.jst.jsp.core.taglib,\
+org.eclipse.jst.jsp.ui,\
+org.eclipse.jst.jsp.ui.views.contentoutline
+
+
+api.packages.old=org.eclipse.jst.j2ee.webservice.jaxrpcmap,\
org.eclipse.jst.j2ee.webapplication,\
org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl,\
org.eclipse.jst.j2ee.webservice.wsdd,\
@@ -71,10 +87,6 @@
org.eclipse.jst.jsp.core.taglib.ITaglibIndexListener,\
org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP,\
org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration
-!possibly not
-!org.eclipse.jst.jsp.core.taglib,\
-!org.eclipse.jst.jsp.ui,\
-!org.eclipse.jst.jsp.ui.views.contentoutline
api.title=Web Tools Platform: J2EE Standards Tools
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index bcd65ab..cd4d220 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -5,7 +5,7 @@
<property file="javadoc.properties" />
<property name="outputDir" value="${basedir}"/>
- <target name="main" depends="prephtml, javadoc" description="Builds Plugin Javadoc" />
+ <target name="main" depends="prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
<target name="prephtml" description="Transforms XML to HTML.">
<xslt style="javadoc.xsl"
@@ -39,15 +39,32 @@
packagenames="${api.packages}"
sourcepath="${plugin.sourcefolders}"
splitindex="true"
- stylesheetfile="${basedir}/api-overview/overview/apistyles.css"
use="true"
version="true"
breakiterator="yes"
verbose="false"
failonerror="false"
/>
- <zip destfile="${basedir}/doc.zip">
- <fileset dir="${outputDir}"/>
- </zip>
</target>
+
+ <target name="packagetoc">
+ <loadfile
+ property="wtp.packages"
+ srcFile="${outputDir}/reference/api/package-list">
+ <filterchain>
+ <filterreader classname="org.apache.tools.ant.filters.PrefixLines">
+ <param name="prefix" value="</package><package>"/>
+ </filterreader>
+ <striplinebreaks/>
+ </filterchain>
+ </loadfile>
+
+ <!-- Create packages.xml file -->
+ <echo file="packages.xml"><packages><package>${wtp.packages}</package></packages></echo>
+
+ <xslt basedir="${basedir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
+ <outputproperty name="method" value="xml"/>
+ <outputproperty name="indent" value="yes"/>
+ </xslt>
+ </target>
</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.doc.isv/javadocToc.xsl b/docs/org.eclipse.jst.doc.isv/javadocToc.xsl
new file mode 100644
index 0000000..ad71795
--- /dev/null
+++ b/docs/org.eclipse.jst.doc.isv/javadocToc.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:xalan="http://xml.apache.org/xslt"
+ exclude-result-prefixes="xalan">
+
+ <xsl:template match="packages">
+ <xsl:text disable-output-escaping="yes">
+<?NLS TYPE="org.eclipse.help.toc"?>
+ </xsl:text>
+ <toc label="Javadoc Packages Reference">
+ <xsl:for-each select="package">
+ <xsl:sort select="text()"/>
+ <xsl:if test="text() != ''">
+ <topic label="{text()}" href="reference/api/{translate(text(),'.','/')}/package-summary.html"/>
+ </xsl:if>
+ </xsl:for-each>
+
+ </toc>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/docs/org.eclipse.wst.doc.isv/api-overview/overview/apistyles.css b/docs/org.eclipse.wst.doc.isv/api-overview/overview/apistyles.css
deleted file mode 100644
index 9fe9102..0000000
--- a/docs/org.eclipse.wst.doc.isv/api-overview/overview/apistyles.css
+++ /dev/null
@@ -1,66 +0,0 @@
-
-p, table, td, th {
- font-family: arial, helvetica, geneva;
- font-size: 10pt
-}
-pre {
- font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 {
- font-family: arial, helvetica, geneva;
- font-size: 18pt;
- font-weight: bold ;
- line-height: 14px
-}
-code {
- font-family: "Courier New", Courier, mono;
- font-size: 10pt
-}
-sup {
- font-family: arial,helvetica,geneva;
- font-size: 10px
-}
-h3 {
- font-family: arial, helvetica, geneva;
- font-size: 14pt;
- font-weight: bold
-}
-li {
- font-family: arial, helvetica, geneva;
- font-size: 10pt
-}
-h1 {
- font-family: arial, helvetica, geneva;
- font-size: 28px;
- font-weight: bold
-}
-body {
- font-family: arial, helvetica, geneva;
- font-size: 10pt;
- clip: rect( );
- margin-top: 5mm;
- margin-left: 3mm;
- color: rgb(0, 0, 0);
- background-color: rgb(255, 255, 255);
- alink="#ff0000";
- link="#0000ee";
- vlink="#551a8b";
-}
-.indextop {
- font-size: x-large;;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-weight: bold
-}
-.indexsub {
- font-size: xx-small;;
- font-family: Arial, Helvetica, sans-serif;
- color: #8080FF
-}
-a:link {
- color: #0000ee;
-}
-a:visited {
- color: #551a8b;
-}
-a:active {
- color: #ff0000;
-}
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.properties b/docs/org.eclipse.wst.doc.isv/javadoc.properties
index f50dd5b..14f6370 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.properties
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.properties
@@ -5,6 +5,7 @@
../org.eclipse.wst.common.frameworks/src;\
../org.eclipse.wst.common.frameworks.ui/wtp_ui;\
../org.eclipse.wst.common.emf/wtpemf;\
+../org.eclipse.wst.common.environment/src;\
../org.eclipse.wst.common.navigator.views/src-navigator;\
../org.eclipse.wst.common.snippets/src;\
../org.eclipse.wst.common.uriresolver/src;\
@@ -25,6 +26,8 @@
../org.eclipse.wst.javascript.core/src;\
../org.eclipse.wst.javascript.ui/src;\
../org.eclipse.wst.javascript.ui/src-commonui;\
+../org.eclipse.wst.server.core/servercore;\
+../org.eclipse.wst.server.ui/serverui;\
../org.eclipse.wst.sse.core/src;\
../org.eclipse.wst.sse.core/src-encoding;\
../org.eclipse.wst.sse.ui/src;\
@@ -37,7 +40,35 @@
../org.eclipse.wst.wsdl/src-wsdl;\
../org.eclipse.wst.wsdl/src-soap
-api.packages=org.eclipse.wst.common.componentcore,\
+api.packages=org.eclipse.wst.common.environment ,\
+org.eclipse.wst.common.environment.uri,\
+org.eclipse.wst.common.frameworks.datamodel,\
+org.eclipse.wst.common.snippets.core,\
+org.eclipse.wst.common.snippets.ui,\
+org.eclipse.wst.css.ui,\
+org.eclipse.wst.css.ui.views.contentoutline,\
+org.eclipse.wst.css.ui.views.properties,\
+org.eclipse.wst.dtd.ui,\
+org.eclipse.wst.dtd.ui.views.contentoutline,\
+org.eclipse.wst.html.ui,\
+org.eclipse.wst.html.ui.views.contentoutline,\
+org.eclipse.wst.server.core,\
+org.eclipse.wst.server.core.model,\
+org.eclipse.wst.server.core.util,\
+org.eclipse.wst.server.ui,\
+org.eclipse.wst.server.ui.editor,\
+org.eclipse.wst.server.ui.wizard,\
+org.eclipse.wst.sse.ui,\
+org.eclipse.wst.sse.ui.views.contentoutline,\
+org.eclipse.wst.sse.ui.views.properties,\
+org.eclipse.wst.wsdl,\
+org.eclipse.wst.wsdl.util,\
+org.eclipse.wst.xml.ui,\
+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,\
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index 9817c26..3b796bb 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -5,7 +5,7 @@
<property file="javadoc.properties" />
<property name="outputDir" value="${basedir}"/>
- <target name="main" depends="prephtml, javadoc" description="Builds Plugin Javadoc" />
+ <target name="main" depends="prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
<target name="prephtml" description="Transforms XML to HTML.">
<xslt style="javadoc.xsl"
@@ -41,12 +41,31 @@
packagenames="${api.packages}"
sourcepath="${plugin.sourcefolders}"
splitindex="true"
- stylesheetfile="${basedir}/api-overview/overview/apistyles.css"
use="true"
version="true"
breakiterator="yes"
verbose="false"
failonerror="false"
- />
+ />
</target>
+ <target name="packagetoc">
+ <loadfile
+ property="wtp.packages"
+ srcFile="${outputDir}/reference/api/package-list">
+ <filterchain>
+ <filterreader classname="org.apache.tools.ant.filters.PrefixLines">
+ <param name="prefix" value="</package><package>"/>
+ </filterreader>
+ <striplinebreaks/>
+ </filterchain>
+ </loadfile>
+
+ <!-- Create packages.xml file -->
+ <echo file="packages.xml"><packages><package>${wtp.packages}</package></packages></echo>
+
+ <xslt basedir="${basedir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
+ <outputproperty name="method" value="xml"/>
+ <outputproperty name="indent" value="yes"/>
+ </xslt>
+ </target>
</project>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/javadocToc.xsl b/docs/org.eclipse.wst.doc.isv/javadocToc.xsl
new file mode 100644
index 0000000..ad71795
--- /dev/null
+++ b/docs/org.eclipse.wst.doc.isv/javadocToc.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:xalan="http://xml.apache.org/xslt"
+ exclude-result-prefixes="xalan">
+
+ <xsl:template match="packages">
+ <xsl:text disable-output-escaping="yes">
+<?NLS TYPE="org.eclipse.help.toc"?>
+ </xsl:text>
+ <toc label="Javadoc Packages Reference">
+ <xsl:for-each select="package">
+ <xsl:sort select="text()"/>
+ <xsl:if test="text() != ''">
+ <topic label="{text()}" href="reference/api/{translate(text(),'.','/')}/package-summary.html"/>
+ </xsl:if>
+ </xsl:for-each>
+
+ </toc>
+ </xsl:template>
+</xsl:stylesheet>