You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2004/12/09 23:05:02 UTC
svn commit: r111439 - in incubator/beehive/trunk: . controls docs docs/forrest docs/forrest/src/documentation docs/forrest/src/documentation/content/xdocs netui/ant wsm
Author: steveh
Date: Thu Dec 9 14:05:02 2004
New Revision: 111439
URL: http://svn.apache.org/viewcvs?view=rev&rev=111439
Log:
Changing references to "reference" to "apidocs".
(This change makes the Forrest build cleaner and more error tolerant, since Forrest skips validation of paths which include the string "apidocs".)
DRT passed.
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/controls/build.xml
incubator/beehive/trunk/docs/build.xml
incubator/beehive/trunk/docs/forrest/build.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml
incubator/beehive/trunk/netui/ant/javadoc.xml
incubator/beehive/trunk/wsm/build.xml
Modified: incubator/beehive/trunk/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/build.xml&r1=111438&p2=incubator/beehive/trunk/build.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Thu Dec 9 14:05:02 2004
@@ -168,17 +168,7 @@
<!-- Copying xml-commons-resolver-1.1.jar into the Ant lib dir is necessary for Ant to call Forrest targets. -->
<copy file="${beehive.installed.dir}/apache-forrest-0.6/lib/core/xml-commons-resolver-1.1.jar" todir="${beehive.installed.dir}/apache-ant-1.6.2/lib"/>
<chmod dir="${beehive.installed.dir}/apache-forrest-0.6/src/core/bin" perm="755" includes="**/*.sh"/>
- </target>
-
- <!--
-
- <copy todir="site\src\documentation\content\reference" overwrite="true">
- <fileset dir="controls\build\docs\reference"/>
- <fileset dir="netui\build\docs\reference"/>
- <fileset dir="wsm\build\docs\reference"/>
- </copy>
- -->
-
+ </target>
<!-- ============================================= -->
<!-- -->
@@ -420,13 +410,10 @@
<target name="build.dist.docs" depends="docs" description="Builds documentation for a Beehive distribution">
<mkdir dir="${dist.dir}"/>
<!-- copy javadocs to dist -->
- <copy todir="${dist.dir}/docs/javadoc" failOnError="true">
- <fileset dir="controls/build/docs/reference"/>
- <fileset dir="netui/build/docs/reference"/>
- <fileset dir="wsm/build/docs/reference"/>
- </copy>
- <copy todir="${dist.dir}/docs" failOnError="true">
- <fileset file="netui/docs/index.html"/>
+ <copy todir="${dist.dir}/docs/apidocs" failOnError="true">
+ <fileset dir="controls/build/docs/apidocs"/>
+ <fileset dir="netui/build/docs/apidocs"/>
+ <fileset dir="wsm/build/docs/apidocs"/>
</copy>
<copy todir="${dist.dir}/docs" failOnError="">
<fileset dir="docs/forrest/build/site"/>
Modified: incubator/beehive/trunk/controls/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/build.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/controls/build.xml&r1=111438&p2=incubator/beehive/trunk/controls/build.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/controls/build.xml (original)
+++ incubator/beehive/trunk/controls/build.xml Thu Dec 9 14:05:02 2004
@@ -206,7 +206,7 @@
<!-- docs -->
<!-- ==================================================================== -->
<target name="docs" if="isJDKOver5">
- <javadoc destdir="${docs.dir}/reference/classref_controls" maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp" useexternalfile="true" classpathref="runtime.classpath">
+ <javadoc destdir="${docs.dir}/apidocs/classref_controls" maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp" useexternalfile="true" classpathref="runtime.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes">
<include name="org/apache/beehive/controls/**/*"/>
</packageset>
@@ -214,7 +214,7 @@
<include name="org/apache/beehive/controls/**/*"/>
</packageset>
</javadoc>
- <fixcrlf srcDir="${build.dir}/docs/reference" includes="**/*.html"/>
+ <fixcrlf srcDir="${build.dir}/docs/apidocs" includes="**/*.html"/>
</target>
<!-- ==================================================================== -->
<!-- drt -->
Modified: incubator/beehive/trunk/docs/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/build.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/docs/build.xml&r1=111438&p2=incubator/beehive/trunk/docs/build.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/docs/build.xml (original)
+++ incubator/beehive/trunk/docs/build.xml Thu Dec 9 14:05:02 2004
@@ -6,10 +6,16 @@
<project name="Beehive Docs Build" default="usage" basedir=".">
<property environment="os"/>
- <property file="beehive.properties"/>
+ <property file="../beehive.properties"/>
+
<target name="site">
<ant dir="forrest" target="site"/>
+ </target>
+
+ <target name="clean">
+ <ant dir="forrest" target="clean"/>
+ <delete dir="forrest/build"/>
</target>
</project>
Modified: incubator/beehive/trunk/docs/forrest/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/build.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/docs/forrest/build.xml&r1=111438&p2=incubator/beehive/trunk/docs/forrest/build.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/docs/forrest/build.xml (original)
+++ incubator/beehive/trunk/docs/forrest/build.xml Thu Dec 9 14:05:02 2004
@@ -1,5 +1,13 @@
-<!-- 'site', the default target, is a target imported from forrest.build.xml -->
-<project name="myproject" default="site">
+<project name="Forrest Site Build" default="site" basedir=".">
+
+<!-- ============================================================ -->
+<!-- | |-->
+<!-- | This build file is merely a placeholder for the importation of the forrest.build.xml file. |-->
+<!-- | | -->
+<!-- | 'site', the default target here, is a target imported from forrest.build.xml |-->
+<!-- | | -->
+<!-- ============================================================-->
+
<property environment="os"/>
<property name="forrest.home" value="${os.FORREST_HOME}"/>
<import file="${os.FORREST_HOME}/forrest.build.xml"/>
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml&r1=111438&p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml Thu Dec 9 14:05:02 2004
@@ -12,13 +12,13 @@
<guide label="Putting the Pieces Together" href="beehive/guide.html"/>
</beehive>-->
<pageflow label="Page Flows">
- <pageflow_overview label="Page Flow Overview" href="pageflow/pageflow_overview.html"/>
- <pageflow_controllers label="Page Flow Controllers" href="pageflow/pageflow_controllers.html"/>
- <pageflow_jsp label="Page Flow JSP" href="pageflow/pageflow_jsp.html"/>
- <pageflow_building label="Building a Page Flow Web-App" href="pageflow/pageflow_building.html"/>
+ <pageflow_overview label="Overview" href="pageflow/pageflow_overview.html"/>
+ <pageflow_controllers label="Controller Files" href="pageflow/pageflow_controllers.html"/>
+ <pageflow_jsp label="JSP Files" href="pageflow/pageflow_jsp.html"/>
+ <pageflow_building label="Building a Web-App" href="pageflow/pageflow_building.html"/>
<pageflow_altering label="Altering a Page Flow" href="pageflow/pageflow_altering.html"/>
<pageflow_programming label="Page Flow Programming" href="pageflow/guide.html"/>
- <tutorial_pageflow label="Page Flow Tutorial" href="pageflow/tutorial_pageflow.html"/>
+ <tutorial_pageflow label="Tutorial" href="pageflow/tutorial_pageflow.html"/>
</pageflow>
<controls label="Controls">
<control_overview label="Controls Overview" href="controls/controlsOverview.html"/>
@@ -39,7 +39,19 @@
<control-blank label="Control Project" href="controls/sample_controls-blank.html"/>
<wsm-blank label="Web Service Project" href="wsm/sample_wsm-blank.html"/>
</samples>
- <ref label="Reference Docs" href="reference.html"/>
+ <ref label="Reference Docs">
+ <controls label="Controls">
+ <control label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
+ </controls>
+ <netui label="Page Flows">
+ <netui label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
+ <netui label="<netui> Tags" href="apidocs/taglib/index.html"/>
+ <netui label="netui-config.xml" href="pageflow/config/netui-config.html"/>
+ </netui>
+ <ws label="Web Services">
+ <ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
+ </ws>
+ </ref>
<!--<gloss label="Glossary" href="glossary.html"/>-->
<!--<source label="Beehive Source">
<building label="Building Beehive" href="building.html"/>
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml&r1=111438&p2=incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml Thu Dec 9 14:05:02 2004
@@ -14,103 +14,89 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!--
Skin configuration file. This file contains details of your project,
which will be used to configure the chosen Forrest skin.
-->
-
<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN" "http://forrest.apache.org/dtd/skinconfig-v06-3.dtd">
<skinconfig>
- <!-- To enable lucene search add provider="lucene" (default is google).
+ <!-- To enable lucene search add provider="lucene" (default is google).
Add box-location="alt" to move the search box to an alternate location
(if the skin supports it) and box-location="all" to show it in all
available locations on the page. Remove the <search> element to show
no search box. @domain will enable sitesearch for the specific domain with google.
In other words google will search the @domain for the query string.
-->
- <search name="MyProject" domain="mydomain" provider="google"/>
-
- <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
- <disable-print-link>true</disable-print-link>
- <!-- Disable the PDF link? -->
- <disable-pdf-link>false</disable-pdf-link>
- <!-- Disable the POD link? -->
- <disable-pod-link>true</disable-pod-link>
- <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
- <disable-txt-link>true</disable-txt-link>
- <!-- Disable the xml source link? -->
- <!-- The xml source link makes it possible to access the xml rendition
+ <search name="Beehive" domain="apache" provider="google"/>
+ <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
+ <disable-print-link>true</disable-print-link>
+ <!-- Disable the PDF link? -->
+ <disable-pdf-link>false</disable-pdf-link>
+ <!-- Disable the POD link? -->
+ <disable-pod-link>true</disable-pod-link>
+ <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
+ <disable-txt-link>true</disable-txt-link>
+ <!-- Disable the xml source link? -->
+ <!-- The xml source link makes it possible to access the xml rendition
of the source frim the html page, and to have it generated statically.
This can be used to enable other sites and services to reuse the
xml format for their uses. Keep this disabled if you don't want other
sites to easily reuse your pages.-->
- <disable-xml-link>true</disable-xml-link>
-
- <!-- Disable navigation icons on all external links? -->
- <disable-external-link-image>false</disable-external-link-image>
-
- <!-- Disable w3c compliance links?
+ <disable-xml-link>true</disable-xml-link>
+ <!-- Disable navigation icons on all external links? -->
+ <disable-external-link-image>false</disable-external-link-image>
+ <!-- Disable w3c compliance links?
Use e.g. align="center" to move the compliance links logos to
an alternate location default is left.
(if the skin supports it) -->
- <disable-compliance-links>false</disable-compliance-links>
-
- <!-- Render mailto: links unrecognisable by spam harvesters? -->
- <obfuscate-mail-links>true</obfuscate-mail-links>
- <obfuscate-mail-value>.at.</obfuscate-mail-value>
-
- <!-- Disable the javascript facility to change the font size -->
- <disable-font-script>true</disable-font-script>
-
- <!-- mandatory project logo
+ <disable-compliance-links>false</disable-compliance-links>
+ <!-- Render mailto: links unrecognisable by spam harvesters? -->
+ <obfuscate-mail-links>true</obfuscate-mail-links>
+ <obfuscate-mail-value>.at.</obfuscate-mail-value>
+ <!-- Disable the javascript facility to change the font size -->
+ <disable-font-script>true</disable-font-script>
+ <!-- mandatory project logo
default skin: renders it at the top -->
- <project-name>Apache Beehive</project-name>
- <project-description>MyProject Description</project-description>
- <project-url>http://incubator.apache.org/beehive</project-url>
- <project-logo>images/_beehive_logo_wide.gif</project-logo>
- <!-- Alternative static image:
+ <project-name>Apache Beehive</project-name>
+ <project-description>MyProject Description</project-description>
+ <project-url>http://incubator.apache.org/beehive</project-url>
+ <project-logo>images/_beehive_logo_wide.gif</project-logo>
+ <!-- Alternative static image:
<project-logo>images/project-logo.gif</project-logo> -->
-
- <!-- optional group logo
+ <!-- optional group logo
default skin: renders it at the top-left corner -->
- <group-name>Apache Incubato</group-name>
- <group-description>MyGroup Description</group-description>
- <group-url>http://incubator.apache.org/</group-url>
- <group-logo>images/_incubator-logo.gif</group-logo>
- <!-- Alternative static image:
+ <group-name>Apache Incubator</group-name>
+ <group-description>MyGroup Description</group-description>
+ <group-url>http://incubator.apache.org/</group-url>
+ <group-logo>images/_incubator-logo.gif</group-logo>
+ <!-- Alternative static image:
<group-logo>images/group-logo.gif</group-logo> -->
-
- <!-- optional host logo (e.g. sourceforge logo)
+ <!-- optional host logo (e.g. sourceforge logo)
default skin: renders it at the bottom-left corner -->
- <host-url></host-url>
- <host-logo></host-logo>
-
- <!-- relative url of a favicon file, normally favicon.ico -->
- <favicon-url></favicon-url>
-
- <!-- The following are used to construct a copyright statement -->
- <year>2004</year>
- <vendor>The Acme Software Foundation.</vendor>
- <!-- The optional copyright-link URL will be used as a link in the
+ <host-url/>
+ <host-logo/>
+ <!-- relative url of a favicon file, normally favicon.ico -->
+ <favicon-url></favicon-url>
+ <!-- The following are used to construct a copyright statement -->
+ <year>2004</year>
+ <vendor>The Apache Software Foundation.</vendor>
+ <!-- The optional copyright-link URL will be used as a link in the
copyright statement
- <copyright-link>http://www.apache.org/licenses/</copyright-link>
-->
-
- <!-- Some skins use this to form a 'breadcrumb trail' of links.
+ <copyright-link>http://www.apache.org/licenses/</copyright-link>
+ <!-- Some skins use this to form a 'breadcrumb trail' of links.
Use location="alt" to move the trail to an alternate location
(if the skin supports it).
Omit the location attribute to display the trail in the default location.
Use location="none" to not display the trail (if the skin supports it).
For some skins just set the attributes to blank.
-->
- <trail>
- <link1 name="myGroup" href="http://www.apache.org/"/>
- <link2 name="myProject" href="http://forrest.apache.org/"/>
- <link3 name="" href=""/>
- </trail>
-
- <!-- Configure the TOC, i.e. the Table of Contents.
+ <trail>
+ <link1 name="Incubator" href="http://incubator.apache.org/"/>
+ <link2 name="Beehive" href="http://incubator.apache.org/beehive"/>
+ <link3 name="" href=""/>
+ </trail>
+ <!-- Configure the TOC, i.e. the Table of Contents.
@max-depth
how many "section" levels need to be included in the
generated Table of Contents (TOC).
@@ -119,27 +105,24 @@
@location ("page","menu","page,menu", "none")
Where to show the TOC.
-->
- <toc max-depth="2" min-sections="1" location="page"/>
-
- <!-- Heading types can be clean|underlined|boxed -->
- <headings type="boxed"/>
-
- <!-- The optional feedback element will be used to construct a
+ <toc max-depth="2" min-sections="1" location="page"/>
+ <!-- Heading types can be clean|underlined|boxed -->
+ <headings type="boxed"/>
+ <!-- The optional feedback element will be used to construct a
feedback link in the footer with the page pathname appended:
<a href="@href">{@to}</a>
-->
- <feedback to="webmaster@foo.com"
- href="mailto:webmaster@foo.com?subject=Feedback " >
+ <feedback to="webmaster@foo.com" href="mailto:webmaster@foo.com?subject=Feedback ">
Send feedback about the website to:
</feedback>
- <!--
+ <!--
extra-css - here you can define custom css-elements that are
a. overriding the fallback elements or
b. adding the css definition from new elements that you may have
used in your documentation.
-->
- <extra-css>
- <!--Example of b.
+ <extra-css>
+ <!--Example of b.
To define the css definition of a new element that you may have used
in the class attribute of a <p> node.
e.g. <p class="quote"/>
@@ -149,14 +132,40 @@
padding: .5em;
background-color: #f0f0f0;
font-family: monospace;
+ }
+ pre.code {
+ margin-left: 2em;
+ padding: .5em;
+ background-color: #f0f0f0;
+ font-family: monospace;
}
</extra-css>
-
- <colors>
- <!-- These values are used for the generated CSS files. -->
-
- <!-- Krysalis -->
-<!--
+ <colors>
+ <!-- These values are used for the generated CSS files. -->
+ <!-- Forrest -->
+ <color name="header" value="#294563"/>
+ <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="heading" value="#294563"/>
+ <color name="subheading" value="#cedfef"/>
+ <color name="navstrip" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="toolbox" value="#4a6d8c"/>
+ <color name="border" value="#294563"/>
+ <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
+ <color name="dialog" value="#4a6d8c"/>
+ <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+ <color name="table" value="#7099C5"/>
+ <color name="table-cell" value="#f0f0ff"/>
+ <color name="highlight" value="#ffff00"/>
+ <color name="fixme" value="#cc6600"/>
+ <color name="note" value="#006699"/>
+ <color name="warning" value="#990000"/>
+ <color name="code" value="#CFDCED"/>
+ <color name="footer" value="#cedfef"/>
+ <!-- Krysalis -->
+ <!--
<color name="header" value="#FFFFFF"/>
<color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
@@ -186,41 +195,8 @@
<color name="footer" value="#a5b6c6"/>
-->
-
- <!-- Forrest -->
-<!--
- <color name="header" value="#294563"/>
-
- <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-
- <color name="heading" value="#294563"/>
- <color name="subheading" value="#4a6d8c"/>
-
- <color name="navstrip" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="toolbox" value="#4a6d8c"/>
- <color name="border" value="#294563"/>
-
- <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
- <color name="dialog" value="#4a6d8c"/>
-
- <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-
- <color name="table" value="#7099C5"/>
- <color name="table-cell" value="#f0f0ff"/>
- <color name="highlight" value="#ffff00"/>
- <color name="fixme" value="#cc6600"/>
- <color name="note" value="#006699"/>
- <color name="warning" value="#990000"/>
- <color name="code" value="#CFDCED"/>
-
- <color name="footer" value="#cedfef"/>
--->
-
- <!-- Collabnet -->
-<!--
+ <!-- Collabnet -->
+ <!--
<color name="header" value="#003366"/>
<color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/>
@@ -250,8 +226,8 @@
<color name="footer" value="#ffffff"/>
-->
- <!-- Lenya using pelt-->
-<!--
+ <!-- Lenya using pelt-->
+ <!--
<color name="header" value="#ffffff"/>
<color name="tab-selected" value="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
@@ -285,20 +261,18 @@
<color name="footer" value="#E5E4D9"/>
-->
- </colors>
-
- <!-- Settings specific to PDF output. -->
- <pdf>
- <!--
+ </colors>
+ <!-- Settings specific to PDF output. -->
+ <pdf>
+ <!--
Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
folio, legal, ledger, letter, quarto, tabloid (default letter).
Supported page orientations are portrait, landscape (default
portrait).
Supported text alignments are left, right, justify (default left).
-->
- <page size="letter" orientation="portrait" text-align="left"/>
-
- <!--
+ <page size="letter" orientation="portrait" text-align="left"/>
+ <!--
Margins can be specified for top, bottom, inner, and outer
edges. If double-sided="false", the inner edge is always left
and the outer is always right. If double-sided="true", the
@@ -306,49 +280,45 @@
the outer edge vice versa.
Specified below are the default settings.
-->
- <margins double-sided="false">
- <top>1in</top>
- <bottom>1in</bottom>
- <inner>1.25in</inner>
- <outer>1in</outer>
- </margins>
-
- <!--
+ <margins double-sided="false">
+ <top>1in</top>
+ <bottom>1in</bottom>
+ <inner>1.25in</inner>
+ <outer>1in</outer>
+ </margins>
+ <!--
Print the URL text next to all links going outside the file
-->
- <show-external-urls>false</show-external-urls>
-
- <!--
+ <show-external-urls>false</show-external-urls>
+ <!--
Disable the copyright footer on each page of the PDF.
A footer is composed for each page. By default, a "credit" with role=pdf
will be used, as explained below. Otherwise a copyright statement
will be generated. This latter can be disabled.
-->
- <disable-copyright-footer>false</disable-copyright-footer>
- </pdf>
-
- <!-- Credits are typically rendered as a set of small clickable
+ <disable-copyright-footer>false</disable-copyright-footer>
+ </pdf>
+ <!-- Credits are typically rendered as a set of small clickable
images in the page footer.
Use box-location="alt" to move the credit to an alternate location
(if the skin supports it).
-->
- <credits>
- <credit box-location="alt">
- <name>Built with Apache Forrest</name>
- <url>http://forrest.apache.org/</url>
- <image>images/built-with-forrest-button.png</image>
- <width>88</width>
- <height>31</height>
- </credit>
- <!-- A credit with @role="pdf" will be used to compose a footer
+ <credits>
+ <credit box-location="alt">
+ <name>Built with Apache Forrest</name>
+ <url>http://forrest.apache.org/</url>
+ <image>images/built-with-forrest-button.png</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ <!-- A credit with @role="pdf" will be used to compose a footer
for each page in the PDF, using either "name" or "url" or both.
-->
- <!--
+ <!--
<credit role="pdf">
<name>Built with Apache Forrest</name>
<url>http://forrest.apache.org/</url>
</credit>
-->
- </credits>
-
+ </credits>
</skinconfig>
Modified: incubator/beehive/trunk/netui/ant/javadoc.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/javadoc.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/netui/ant/javadoc.xml&r1=111438&p2=incubator/beehive/trunk/netui/ant/javadoc.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/netui/ant/javadoc.xml (original)
+++ incubator/beehive/trunk/netui/ant/javadoc.xml Thu Dec 9 14:05:02 2004
@@ -45,7 +45,7 @@
<antcall target="clean"/>
<antcall target="generate-class-ref"/>
<antcall target="generate-taglib-ref"/>
- <fixcrlf srcDir="${build.dir}/docs/reference" includes="**/*.html"/>
+ <fixcrlf srcDir="${build.dir}/docs/apidocs" includes="**/*.html"/>
<!--<antcall target="copy-to-forrest"/>-->
</target>
<target name="clean">
@@ -58,7 +58,7 @@
Track the bug at: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5055723
When the fix arrives in JDK5, set use="true". -->
<target name="generate-class-ref">
- <javadoc destdir="${build.dir}/docs/reference/classref_pageflows" maxmemory="256M" windowtitle="Page Flow API Documentation" doctitle="Page Flow API Documentation" version="true" author="false" use="false" additionalparam="-breakiterator -noqualifier all -notimestamp" useexternalfile="true" classpathref="javadoc.classpath" source="1.5">
+ <javadoc destdir="${build.dir}/docs/apidocs/classref_pageflows" maxmemory="256M" windowtitle="Page Flow API Documentation" doctitle="Page Flow API Documentation" version="true" author="false" use="false" additionalparam="-breakiterator -noqualifier all -notimestamp" useexternalfile="true" classpathref="javadoc.classpath" source="1.5">
<tag name="example" description="Example"/>
<tag name="xdoclet.taghandler" enabled="false" description=""/>
<tag name="doc\:tag" enabled="false" description=""/>
@@ -91,8 +91,8 @@
</target>
<target name="generate-taglib-ref" description="Uses a custom doclet to generate HTML topics from Java source files.">
<delete dir="${docs.temp}" failonerror="false"/>
- <delete dir="${build.dir}/docs/reference/taglib" failonerror="false"/>
- <mkdir dir="${build.dir}/docs/reference/taglib"/>
+ <delete dir="${build.dir}/docs/apidocs/taglib" failonerror="false"/>
+ <mkdir dir="${build.dir}/docs/apidocs/taglib"/>
<mkdir dir="${docs.temp}/tld"/>
<mkdir dir="${docs.temp}/xml/tagref"/>
<mkdir dir="${docs.temp}/html/tagref"/>
@@ -102,7 +102,7 @@
<param name="-source" value="1.5"/>
<param name="-tlddir" value="${docs.temp}/tld"/>
<param name="-xmldir" value="${docs.temp}/xml/tagref"/>
- <param name="-htmldir" value="${build.dir}/docs/reference/taglib"/>
+ <param name="-htmldir" value="${build.dir}/docs/apidocs/taglib"/>
<param name="-breakiterator"/>
</doclet>
<!-- <link href="http://feverhouse.com" offline="true" packagelistLoc="../build/docs/java-class"/> -->
@@ -129,8 +129,8 @@
<include name="org/apache/beehive/netui/tags/template"/>
</packageset>
</javadoc>
- <delete file="${docs.build.dir}/reference/taglib/taglib-frame-ignore.html" failonerror="false"/>
- <delete file="${docs.build.dir}/reference/taglib/taglib-summary-ignore.html" failonerror="false"/>
+ <delete file="${docs.build.dir}/apidocs/taglib/taglib-frame-ignore.html" failonerror="false"/>
+ <delete file="${docs.build.dir}/apidocs/taglib/taglib-summary-ignore.html" failonerror="false"/>
<delete dir="${docs.temp}" failonerror="false"/>
</target>
<!-- Get the latest TLD files and unzip them to a temp folder. From there, they'll be grabbed by
@@ -143,8 +143,8 @@
</copy>
</target>
<target name="copy-to-forrest" description="">
- <copy todir="${beehive.dir}/site/src/documentation/content/reference" overwrite="true">
- <fileset dir="${docs.build.dir}/reference"/>
+ <copy todir="${beehive.dir}/site/src/documentation/content/apidocs" overwrite="true">
+ <fileset dir="${docs.build.dir}/apidocs"/>
</copy>
</target>
<target name="make-doclet-jar" description="Utiltiy function that re-JARs jsptagrefdoclet.jar. Use this target if you make changes to the XSLT files, or other files, imbedded in jsptagrefdoclet.jar">
Modified: incubator/beehive/trunk/wsm/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?view=diff&rev=111439&p1=incubator/beehive/trunk/wsm/build.xml&r1=111438&p2=incubator/beehive/trunk/wsm/build.xml&r2=111439
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Thu Dec 9 14:05:02 2004
@@ -296,11 +296,11 @@
<!-- docs -->
<!-- ==================================================================== -->
<target name="docs" if="isJDKOver5">
- <javadoc destdir="${docs.dir}/reference/classref_wsm" maxmemory="256M" windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp " useexternalfile="true" classpathref="axis.classpath">
+ <javadoc destdir="${docs.dir}/apidocs/classref_wsm" maxmemory="256M" windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp " useexternalfile="true" classpathref="axis.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes"/>
<packageset dir="${runtime.dir}" defaultexcludes="yes"/>
</javadoc>
- <fixcrlf srcDir="${docs.dir}/reference/classref_wsm" includes="**/*.html"/>
+ <fixcrlf srcDir="${docs.dir}/apidocs/classref_wsm" includes="**/*.html"/>
</target>
<!-- ==================================================================== -->
<!-- drt -->