You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/04 21:46:39 UTC
svn commit: r227458 - in /incubator/beehive/trunk: ./ docs/ docs/forrest/
docs/forrest/release/src/documentation/content/dtd/
docs/forrest/release/src/documentation/content/xdocs/
docs/forrest/release/src/documentation/content/xdocs/beehive/ docs/forre...
Author: ekoneil
Date: Thu Aug 4 12:46:13 2005
New Revision: 227458
URL: http://svn.apache.org/viewcvs?rev=227458&view=rev
Log:
Separate the site/ and release/ documentation.
This has been done by branching the docs in forrest/ into two sub-directories:
release/
site/
The former contains the documentation for the release that is currently maintained in the given source line (trunk/, in this case) and site/ contains Beehive's Apache website.
This is currently a little funky as the tabs on the release documentation and site contents are different, but they share the same look and feel and should be easily evolvable over time. Also, there are some *hard* references from the site/ docs into the release/ docs that are done by URL as http://incubator.apache.og/beehive. This needs to be fixed going forward, but it's a much easier problem to handle than the current one of having two release doc kits on the stie at once. :)
Haven't published this new site yet -- will probably wait to do that until the infra folks have setup beehive.apache.org.
Also, this changes the documentation that's included in the distribution -- it's now just the docs for a specifc release as opposed to the entire Beehive website.
BB: self
DRT: Beehive / build.dist pass
Added:
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/beehive/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/beehive/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/controls/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/development/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/development/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/glossary.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/glossary.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/pageflow/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/pageflow/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/release_notes.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/samples/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/samples/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/setup.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/setup.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/system-controls/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/system-controls/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tutorial/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/tutorial/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/webservices.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/webservices.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/wsm/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/wsm/
incubator/beehive/trunk/docs/forrest/site/
incubator/beehive/trunk/docs/forrest/site/build.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/build.xml
incubator/beehive/trunk/docs/forrest/site/forrest.properties
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/forrest.properties
incubator/beehive/trunk/docs/forrest/site/src/
incubator/beehive/trunk/docs/forrest/site/src/documentation/
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/dtd/
- copied from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/dtd/
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/building.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/building.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/contributors.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/contributors.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/downloads.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/downloads.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/faq.xml
- copied, changed from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/faq.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/index.xml
- copied, changed from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/license.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/license.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/mailinglists.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/mailinglists.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/reference.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/reference.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/site.xml
- copied, changed from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/tabs.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml
incubator/beehive/trunk/docs/forrest/site/src/documentation/resources/
incubator/beehive/trunk/docs/forrest/site/src/documentation/resources/images/
incubator/beehive/trunk/docs/forrest/site/src/documentation/resources/images/_beehive_logo_wide.gif
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/resources/images/_beehive_logo_wide.gif
incubator/beehive/trunk/docs/forrest/site/src/documentation/resources/images/_incubator-logo.gif
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/resources/images/_incubator-logo.gif
incubator/beehive/trunk/docs/forrest/site/src/documentation/skinconf.xml
- copied unchanged from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/skinconf.xml
Removed:
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/dtd/
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/building.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/contributors.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/downloads.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/faq.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/license.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/mailinglists.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/reference.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release/
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/docs/build.xml
incubator/beehive/trunk/docs/forrest/build.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml
incubator/beehive/trunk/system-controls/ant/javadoc.xml
Modified: incubator/beehive/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Thu Aug 4 12:46:13 2005
@@ -213,7 +213,7 @@
</target>
<target name="build-site" if="forrest.present">
- <ant dir="docs" target="build"/>
+ <ant dir="docs" target="build.site"/>
</target>
<!-- ============================================= -->
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu Aug 4 12:46:13 2005
@@ -327,88 +327,10 @@
</fileset>
</copy>
-
-
<!-- copy samples README.txt -->
<copy tofile="${dist.dir}/samples/README.txt" failOnError="true">
<fileset file="user/samples-README.txt"/>
</copy>
-
- <!-- Build the controls database template app distro -->
-<!-- Removing controls-db from the Beehive samples.
- <copy todir="${dist.dir}/samples/controls-db" failOnError="true">
- <fileset dir="samples/controls-db"/>
- </copy>
--->
-
- <!-- Build the sample: wsm-addressbook -->
-<!-- Removing wsm-addressbook from the samples
- <copy todir="${dist.dir}/samples/wsm-addressbook" failOnError="true">
- <fileset dir="samples/wsm-addressbook">
- <exclude name="WEB-INF/src/build*svn.xml"/>
- </fileset>
- </copy>
--->
- <!--
- sample taken out of distribution; issues around Axis need to be resolved first.
- -->
- <!-- Build the petstore dashboard distro
- <copy todir="${dist.dir}/samples/wsm-petstore-dashboard" failOnError="true">
- <fileset dir="samples/wsm-petstore-dashboard"/>
- </copy>
-
- <deploy-webservice-runtime appdir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- <copy-junit todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- <copy-log4j todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- -->
-
- <!-- Build the sample: wsm-addressbook-fromWSDL -->
- <!--
- needs to be more stable.
- -->
- <!--
- <copy todir="${dist.dir}/samples/wsm-addressbook-fromWSDL" failOnError="true">
- <fileset dir="samples/wsm-addressbook-fromWSDL">
- <exclude name="WEB-INF/build*svn.xml"/>
- </fileset>
- </copy>
- -->
-
-
- <!-- copy README.txt --> <!-- build sample: wsm-employee -->
- <!--
- sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
- -->
- <!--
- <copy todir="${dist.dir}/samples/wsm-employee" failOnError="true">
- <fileset dir="samples/wsm-employee">
- <exclude name="WEB-INF/build*svn.xml"/>
- </fileset>
- </copy>
- -->
-
- <!-- build sample: db-control -->
- <!--
- sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
- -->
- <!--
- <ant
- dir="${dist.dir}/samples/controls-db"
- antfile="build.xml"
- target="build"
- inheritall="false"/>
- <copy todir="${dist.dir}/samples/wsm-employee/WEB-INF/lib" failOnError="true">
- <fileset dir="${dist.dir}/samples/controls-db/build">
- <include name="dbControl.jar"/>
- </fileset>
- </copy>
-
- <ant
- dir="${dist.dir}/samples/controls-db"
- antfile="build.xml"
- target="clean"
- inheritall="false"/>
- -->
</target>
<target name="build.dist.docs" unless="skip.docs" description="Builds documentation for a Beehive distribution">
@@ -426,7 +348,7 @@
</copy>
<copy todir="${dist.dir}/docs" failOnError="true">
- <fileset dir="docs/forrest/build/site"/>
+ <fileset dir="docs/forrest/release/build/site"/>
</copy>
<copy todir="${dist.dir}/docs" failOnError="true">
Modified: incubator/beehive/trunk/docs/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/build.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/build.xml (original)
+++ incubator/beehive/trunk/docs/build.xml Thu Aug 4 12:46:13 2005
@@ -1,123 +1,155 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<!--
- Beehive Docs build file.
-->
-<project name="Beehive Docs Build" default="usage" basedir=".">
+<project name="Beehive/Docs" default="usage" basedir=".">
<import file="../beehive-imports.xml"/>
- <target name="build" depends="build.site"/>
+ <target name="build" depends="build.site,build.release"/>
<target name="build.site">
- <ant dir="forrest" target="build"/>
+ <ant dir="forrest/" target="build.site"/>
+ </target>
+
+ <target name="build.release">
+ <ant dir="forrest/" target="build.release"/>
</target>
<target name="clean">
<delete dir="forrest/build"/>
</target>
-
+
<target name="generate-anno-ref">
- <antcall target="generate-anno-xml"/>
- <antcall target="transform-to-forrestxml"/>
- </target>
-
- <!--
- Before runnng this target you must
- (1) install DocBook Doclet (ver. 0.63.0) on your machine (download: http://www.dbdoclet.org/index.html)
- (2) set these properties below: dbdoclet.home and controls.src.api
- -->
- <target name="generate-anno-xml" description="Generates DocBook XML from the annotation handler classes.">
- <property name="dbdoclet.home" value="C:/Program Files/DocBook Doclet"/>
- <property name="controls.src.api" value="C:/dev-apache/beehive/trunk/controls/src/api/org/apache/beehive/controls/api"/>
- <property name="docbook.xml.dest.dir" value="build/temp/anno_ref/docbook"/>
- <!-- Running with ControlInterface.java included causes DocBook XML validation errors. -->
- <javadoc
- destdir="${docbook.xml.dest.dir}/controls/"
- sourcefiles="${controls.src.api}/bean/AnnotationConstraints.java,
- ${controls.src.api}/bean/AnnotationMemberTypes.java,
- ${controls.src.api}/bean/Control.java,
- ${controls.src.api}/bean/ControlExtension.java,
- ${controls.src.api}/bean/ControlImplementation.java,
- ${controls.src.api}/bean/ControlReferences.java,
- ${controls.src.api}/bean/ExternalPropertySets.java,
- ${controls.src.api}/bean/Threading.java,
- ${controls.src.api}/context/Context.java,
- ${controls.src.api}/context/ControlBeanContext.java,
- ${controls.src.api}/events/Client.java,
- ${controls.src.api}/events/EventHandler.java,
- ${controls.src.api}/events/EventSet.java,
- ${controls.src.api}/packaging/BeanInfo.java,
- ${controls.src.api}/packaging/EventSetInfo.java,
- ${controls.src.api}/packaging/FeatureAttribute.java,
- ${controls.src.api}/packaging/FeatureInfo.java,
- ${controls.src.api}/packaging/ManifestAttribute.java,
- ${controls.src.api}/packaging/PropertyInfo.java,
- ${controls.src.api}/packaging/PropertyInfo.java,
- ${controls.src.api}/properties/AnnotatedElementMap.java,
- ${controls.src.api}/properties/BaseMap.java,
- ${controls.src.api}/properties/BaseProperties.java,
- ${controls.src.api}/properties/BeanPropertyMap.java,
- ${controls.src.api}/properties/PropertyKey.java,
- ${controls.src.api}/properties/PropertyMap.java,
- ${controls.src.api}/properties/PropertySet.java,
- ${controls.src.api}/properties/PropertySetProxy.java,
- ${controls.src.api}/versioning/Version.java,
- ${controls.src.api}/versioning/VersionRequired.java,
- ${controls.src.api}/versioning/VersionSupported.java"
- docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" maxmemory="512m" source="1.5">
- <classpath refid="controls.dependency.path"/>
- <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
- </javadoc>
-
- <javadoc
- destdir="${docbook.xml.dest.dir}/pageflow"
- docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" maxmemory="512m"
- sourcefiles="../netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java">
- <!--<classpath refid="javadoc.classpath"/>-->
- <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
- </javadoc>
-
- <javadoc
- destdir="${docbook.xml.dest.dir}/wsm"
- docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" maxmemory="512m"
- sourcefiles="../wsm/src/api/javax/jws/HandlerChain.java,
- ../wsm/src/api/javax/jws/Oneway.java,
- ../wsm/src/api/javax/jws/WebMethod.java,
- ../wsm/src/api/javax/jws/WebParam.java,
- ../wsm/src/api/javax/jws/WebResult.java,
- ../wsm/src/api/javax/jws/WebService.java,
- ../wsm/src/api/javax/jws/security/SecurityIdentity.java,
- ../wsm/src/api/javax/jws/security/SecurityRoles.java,
- ../wsm/src/api/javax/jws/soap/InitParam.java,
- ../wsm/src/api/javax/jws/soap/SOAPBinding.java,
- ../wsm/src/api/javax/jws/soap/SOAPMessageHandler.java,
- ../wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java">
- <!--<classpath refid="javadoc.classpath"/>-->
- <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
- </javadoc>
- </target>
-
- <target name="transform-to-forrestxml" description="Transforms DocBook XML into Forrest XML.">
- <xslt
- in="build/temp/anno_ref/docbook/controls/Reference.xml"
- out="build/temp/anno_ref/forrest/control_annotations.xml"
- style="tools/xslt/anno_ref.xslt"/>
- <xslt
- in="build/temp/anno_ref/docbook/pageflow/Reference.xml"
- out="build/temp/anno_ref/forrest/pageflow_annotations.xml"
- style="tools/xslt/anno_ref.xslt"/>
- <xslt
- in="build/temp/anno_ref/docbook/wsm/Reference.xml"
- out="build/temp/anno_ref/forrest/wsm_annotations.xml"
- style="tools/xslt/anno_ref.xslt"/>
- </target>
-
+ <antcall target="generate-anno-xml"/>
+ <antcall target="transform-to-forrestxml"/>
+ </target>
+
+ <!--
+ Before runnng this target you must
+ (1) install DocBook Doclet (ver. 0.63.0) on your machine (download: http://www.dbdoclet.org/index.html)
+ (2) set these properties below: dbdoclet.home and controls.src.api
+ -->
+ <target name="generate-anno-xml" description="Generates DocBook XML from the annotation handler classes.">
+
+ <property name="dbdoclet.home" location="C:/Program Files/DocBook Doclet"/>
+ <available file="${dbdoclet.home}" type="dir" property="dbdoclet.available"/>
+ <fail unless="dbdoclet.avaialble" message="Unable to generate annotation reference; is the DocBook Doclet available?"/>
+
+ <property name="controls.src.api" location="${beehive.home}/controls/src/api/org/apache/beehive/controls/api"/>
+ <property name="wsm.src.api" location="${beehive.home}wsm/src/api"/>
+
+ <property name="docbook.xml.dest.dir" location="build/temp/anno_ref/docbook"/>
+
+ <!-- Running with ControlInterface.java included causes DocBook XML validation errors. -->
+ <javadoc destdir="${docbook.xml.dest.dir}/controls/"
+ docencoding="UTF-8"
+ encoding="ISO-8859-15"
+ failonerror="yes"
+ maxmemory="512m"
+ source="1.5"
+ sourcefiles="${controls.src.api}/bean/AnnotationConstraints.java,
+ ${controls.src.api}/bean/AnnotationMemberTypes.java,
+ ${controls.src.api}/bean/Control.java,
+ ${controls.src.api}/bean/ControlExtension.java,
+ ${controls.src.api}/bean/ControlImplementation.java,
+ ${controls.src.api}/bean/ControlReferences.java,
+ ${controls.src.api}/bean/ExternalPropertySets.java,
+ ${controls.src.api}/bean/Threading.java,
+ ${controls.src.api}/context/Context.java,
+ ${controls.src.api}/context/ControlBeanContext.java,
+ ${controls.src.api}/events/Client.java,
+ ${controls.src.api}/events/EventHandler.java,
+ ${controls.src.api}/events/EventSet.java,
+ ${controls.src.api}/packaging/BeanInfo.java,
+ ${controls.src.api}/packaging/EventSetInfo.java,
+ ${controls.src.api}/packaging/FeatureAttribute.java,
+ ${controls.src.api}/packaging/FeatureInfo.java,
+ ${controls.src.api}/packaging/ManifestAttribute.java,
+ ${controls.src.api}/packaging/PropertyInfo.java,
+ ${controls.src.api}/packaging/PropertyInfo.java,
+ ${controls.src.api}/properties/AnnotatedElementMap.java,
+ ${controls.src.api}/properties/BaseMap.java,
+ ${controls.src.api}/properties/BaseProperties.java,
+ ${controls.src.api}/properties/BeanPropertyMap.java,
+ ${controls.src.api}/properties/PropertyKey.java,
+ ${controls.src.api}/properties/PropertyMap.java,
+ ${controls.src.api}/properties/PropertySet.java,
+ ${controls.src.api}/properties/PropertySetProxy.java,
+ ${controls.src.api}/versioning/Version.java,
+ ${controls.src.api}/versioning/VersionRequired.java,
+ ${controls.src.api}/versioning/VersionSupported.java">
+ <classpath refid="controls.dependency.path"/>
+ <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
+ </javadoc>
+
+ <javadoc destdir="${docbook.xml.dest.dir}/pageflow"
+ docencoding="UTF-8"
+ encoding="ISO-8859-15"
+ failonerror="yes"
+ maxmemory="512m"
+ sourcefiles="../netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java">
+ <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
+ </javadoc>
+
+ <javadoc destdir="${docbook.xml.dest.dir}/wsm"
+ docencoding="UTF-8"
+ encoding="ISO-8859-15"
+ failonerror="yes"
+ maxmemory="512m"
+ sourcefiles="${wsm.src.api}/javax/jws/HandlerChain.java,
+ ${wsm.src.api}/javax/jws/Oneway.java,
+ ${wsm.src.api}/javax/jws/WebMethod.java,
+ ${wsm.src.api}/javax/jws/WebParam.java,
+ ${wsm.src.api}/javax/jws/WebResult.java,
+ ${wsm.src.api}/javax/jws/WebService.java,
+ ${wsm.src.api}/javax/jws/security/SecurityIdentity.java,
+ ${wsm.src.api}/javax/jws/security/SecurityRoles.java,
+ ${wsm.src.api}/javax/jws/soap/InitParam.java,
+ ${wsm.src.api}/javax/jws/soap/SOAPBinding.java,
+ ${wsm.src.api}/javax/jws/soap/SOAPMessageHandler.java,
+ ${wsm.src.api}/javax/jws/soap/SOAPMessageHandlers.java">
+ <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
+ </javadoc>
+ </target>
+
+ <target name="transform-to-forrestxml" description="Transforms DocBook XML into Forrest XML.">
+ <xslt
+ in="build/temp/anno_ref/docbook/controls/Reference.xml"
+ out="build/temp/anno_ref/forrest/control_annotations.xml"
+ style="tools/xslt/anno_ref.xslt"/>
+ <xslt
+ in="build/temp/anno_ref/docbook/pageflow/Reference.xml"
+ out="build/temp/anno_ref/forrest/pageflow_annotations.xml"
+ style="tools/xslt/anno_ref.xslt"/>
+ <xslt
+ in="build/temp/anno_ref/docbook/wsm/Reference.xml"
+ out="build/temp/anno_ref/forrest/wsm_annotations.xml"
+ style="tools/xslt/anno_ref.xslt"/>
+ </target>
+
<target name="gen.config.ref.html">
- <xslt in="../netui/src/util/schema/netui-config.xsd"
- out="build/temp/mytest.html"
- style="tools/xslt/configRefHtml.xslt">
- </xslt>
+ <xslt in="../netui/src/util/schema/netui-config.xsd"
+ out="build/temp/mytest.html"
+ style="tools/xslt/configRefHtml.xslt">
+ </xslt>
</target>
<!-- ============================================= -->
Modified: incubator/beehive/trunk/docs/forrest/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/build.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/build.xml (original)
+++ incubator/beehive/trunk/docs/forrest/build.xml Thu Aug 4 12:46:13 2005
@@ -10,19 +10,38 @@
-->
<project name="Beehive Forrest Site Build" default="build">
- <property environment="os"/>
+ <property environment="os"/>
- <target name="build">
+ <target name="build.site">
+ <ant dir="site" target="build" inheritAll="false"/>
+ </target>
+
+ <target name="build.release">
<ant dir="release" target="build" inheritAll="false"/>
+ </target>
+
+ <target name="build">
+ <antcall target="build.release"/>
+ <antcall target="build.site"/>
+<!-- <antcall target="assemble"/> -->
+ </target>
+
+ <target name="assemble">
<mkdir dir="build"/>
+
<copy todir="build/site">
+ <fileset dir="site/build/site"/>
+ </copy>
+
+ <copy todir="build/site/releases/v1.0m1">
<fileset dir="release/build/site"/>
</copy>
</target>
<target name="clean">
<delete dir="site/build"/>
+ <delete dir="release/build"/>
<delete dir="build"/>
</target>
Modified: incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml Thu Aug 4 12:46:13 2005
@@ -1,85 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
- "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
- <header>
- <title>Beehive</title>
- </header>
- <body>
- <section>
- <title>What is Beehive?</title>
- <anchor id="what"/>
-<p> Welcome to Beehive! Our goal is to make J2EE programming easier by building a simple object model on J2EE and Struts.
-Using the new JSR-175 and JSR-181 metadata annotations, Beehive reduces the coding necessary for J2EE.
-The initial Beehive project has three pieces.</p>
-<ul>
- <li>NetUI Page Flow – An annotation-driven web application framework built on Struts that centralizes navigation logic/metadata/state in
-<em>reusable, encapsulated</em> "page flow" controller classes. It provides an integrated set of JSP tags, as well as first-class integration
-with JavaServer Faces and with raw Struts.</li>
- <li> Controls – Lightweight component framework that helps programmers build components that incorporate metadata into their
-programming model. This project comes with a few pre-made controls as well.</li>
- <li>Web Services – An implementation of <a href="http://www.jcp.org/en/jsr/detail?id=181">JSR-181</a>, an annotation-driven programming
-model for web services.</li>
-</ul>
-<p><strong>Notice</strong>: Apache Beehive is an effort undergoing incubation at the Apache Software Foundation. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
-</section>
-<section id="news">
- <title>News</title>
- <ul>
- <li><strong>2005-06-06</strong>: Beehive releases v1.0 milestone 1!
- <a href="http://cvs.apache.org/dist/incubator/beehive/v1.0m1/">http://cvs.apache.org/dist/incubator/beehive/v1.0m1/</a>
- </li>
- <li><strong>2005-05-05</strong>: Nightly builds are now available at
- <a href="http://cvs.apache.org/dist/incubator/beehive/nightlies/">http://cvs.apache.org/dist/incubator/beehive/nightlies/</a>
- </li>
- <li><strong>2005-03-28</strong>: The Beehive Beta <a href="http://cvs.apache.org/dist/incubator/beehive/v1.0-beta/bin/">distribution</a> is now available!
- </li>
- <li>Beehive has a <a class="fork" href="http://wiki.apache.org/beehive">wiki</a>.</li>
- <li>Bugs or feature requests can be filed in our issue tracking system: <a class="fork" href="http://issues.apache.org/jira/browse/BEEHIVE">JIRA</a>.
- </li>
- </ul>
-</section>
-<section id="docs">
-<title>Documentation</title>
- <p>
- <a href="release/index.html">Beehive 1.0 Milestone 1 Documentation</a>
- </p>
- <p>
- <strong>Note:</strong> the documentation provided here is intended to be used with Beehive binary distributions; it is <em>not</em> intended for use with Beehive source from SVN.
- </p>
-</section>
-<section id="beehive2">
- <title>Beehive 2.0 Planning</title>
- <p><strong>Beehive 2.0 planning is in progress!</strong> We want your ideas on features
- or capabilities for our next version. Help Beehive continue to deliver on our promise to make Enterprise App Development easier, and to continue to act as an effective bridge between simple, toolable metadata-driven abstractions and the more complex runtime machinery required to make the abstractions fly!
- </p>
- <p>Please participate by:</p>
- <ul>
- <li>Sending your ideas to the <a href="mailto:beehive-user@incubator.apache.org">beehive-user@incubator.apache.org</a> mailing list. This is the ideal forum for discussion of new ideas -- <a href="mailinglists.html">subscribe</a> and join in! Please preface the subject of your message with <code>"[Feature Idea]"</code> and include a
- short description of the feature and its benefits.</li>
- <li>Add your idea to the <a href="http://wiki.apache.org/beehive/WishList">Beehive WishList</a>. Anyone
- can add an entry, simply click "Login" and enter your name and contact info. Please use
- the wiki only to list ideas -- discussion should take place on the <a href="mailinglists.html">
- mailing lists</a>.</li>
- </ul>
-</section>
-<section id="links">
-<title>Links</title>
-<p>
- <a href="downloads.html">Download Page</a>
-</p>
-<p>
- <a href="http://wiki.apache.org/beehive">Beehive Wiki</a>
-</p>
-<p>
- <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10570">JIRA</a>
-</p>
-<p>
- <a href="http://svn.apache.org/repos/asf/incubator/beehive/trunk">Browse Source in SVN</a>
-</p>
-</section>
-</body>
-<footer>
-<legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/> © 2004-2005, Apache Software Foundation.</legal>
-</footer>
+ <header>
+ <title>Beehive 1.0 Milestone 1 Documentation</title>
+ </header>
+ <body>
+ <p>Beehive documentation contains documentation for all three Beehive sub-projects:</p>
+ <ul>
+ <li><a href="site:control_getting_started">Controls</a></li>
+ <li><a href="site:pageflow_getting_started">Page Flows</a></li>
+ <li><a href="site:wsm_getting_started">Web Services</a></li>
+ </ul>
+ <p>If you are new to Beehive, begin by following the <a href="setup.html">Installation and Startup</a> instructions.
+ </p>
+ <p>See the <strong>user guides</strong> for the Beehive sub-projects:</p>
+ <ul>
+ <li><a href="site:control_overview">Controls Overview</a></li>
+ <li><a href="site:pageflow_overview">Page Flow Overview</a></li>
+ <li><a href="site:wsm_overview">Web Service Overview</a></li>
+ </ul>
+ <p>The following <strong>tutorials</strong> will familiarize you with the basic development cycles for Beehive applications:</p>
+ <ul>
+ <li><a href="site:tutorial_control">Beehive Controls Tutorial</a></li>
+ <li><a href="site:tutorial_pageflow">Beehive Page Flow Tutorial</a></li>
+ <li><a href="site:tutorial_wsm">Beehive Web Service Tutorial</a></li>
+ </ul>
+ <p>Beehive ships with the following <strong>samples</strong>:</p>
+ <ul>
+ <li><a href="site:jpetstore">Petstore Sample</a></li>
+ <li><a href="site:netui-samples">Page Flow Samples</a></li>
+ <li><a href="site:netui-jsf">Page Flow: JSF Integration</a></li>
+ <li><a href="site:address-enhanced">Web Service: AddressBook Enhanced</a></li>
+ <li><a href="site:address-wsdl">Web Service: AddressBook from WSDL</a></li>
+ </ul>
+ <p>The following <strong>project templates</strong> will help you get a project started:</p>
+ <ul>
+ <li><a href="site:netui-blank">Project: Page Flow</a></li>
+ <li><a href="site:control-blank">Project: Control</a></li>
+ <li><a href="site:wsm-blank">Project: Web Service</a></li>
+ <li><a href="site:ws-control-blank">Project: Web Service Control</a></li>
+ </ul>
+ </body>
+ <footer>
+ <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>
+ © 2004, Apache Software Foundation
+ </legal>
+ </footer>
</document>
Modified: incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml Thu Aug 4 12:46:13 2005
@@ -1,119 +1,105 @@
<?xml version="1.0"?>
<site label="Beehive" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="welcome">
- <about label="Project" tab="welcome">
- <introduction label="Beehive" href="index.html"/>
- <license label="License" href="license.html"/>
- <downloads label="Downloads" href="downloads.html"/>
- <mailinglists label="Mailing Lists" href="mailinglists.html"/>
- <contributors label="Contributors" href="contributors.html"/>
- <faq label="FAQ" href="faq.html"/>
- </about>
<docs label="Documentation" tab="welcome">
- <setup label="Installation and Setup" href="release/setup.html" />
+ <setup label="Installation and Setup" href="setup.html" />
<tutorials label="Tutorials">
- <tutorial_pageflow label="Page Flows" href="release/pageflow/tutorial_pageflow.html"/>
- <tutorial_control label="Controls" href="release/controls/tutorial_controls.html"/>
- <tutorial_wsm label="Web Services" href="release/wsm/tutorial_wsm.html"/>
- <!--<tut_dbwebapp label="DB-Driven Web App" href="release/tutorial/tut_dbdrivenwebapp.html" />-->
+ <tutorial_pageflow label="Page Flows" href="pageflow/tutorial_pageflow.html"/>
+ <tutorial_control label="Controls" href="controls/tutorial_controls.html"/>
+ <tutorial_wsm label="Web Services" href="wsm/tutorial_wsm.html"/>
+ <!--<tut_dbwebapp label="DB-Driven Web App" href="tutorial/tut_dbdrivenwebapp.html" />-->
<tutorial_system-controls label="System Controls">
- <control label="EJB Control Tutorial" href="release/system-controls/ejb/ejbControlTutorial.html"/>
- <control label="JDBC Control Tutorial" href="release/system-controls/jdbc/jdbcControlTutorial.html"/>
- <control label="JMS Control Tutorial" href="release/system-controls/jms/jmsControlTutorial.html"/>
- <control label="Webservices Control Tutorial" href="release/system-controls/webservices/webservicesControlTutorial.html"/>
+ <control label="EJB Control Tutorial" href="system-controls/ejb/ejbControlTutorial.html"/>
+ <control label="JDBC Control Tutorial" href="system-controls/jdbc/jdbcControlTutorial.html"/>
+ <control label="JMS Control Tutorial" href="system-controls/jms/jmsControlTutorial.html"/>
+ <control label="Webservices Control Tutorial" href="system-controls/webservices/webservicesControlTutorial.html"/>
</tutorial_system-controls>
</tutorials>
<pageflow label="Page Flows">
- <pageflow_getting_started label="Getting Started" href="release/pageflow/getting_started.html"/>
- <pageflow_overview label="Overview" href="release/pageflow/pageflow_overview.html"/>
- <pageflow_controllers label="Controller Files" href="release/pageflow/pageflow_controllers.html"/>
- <pageflow_jsp label="JSP Files" href="release/pageflow/pageflow_jsp.html"/>
- <pageflow_building label="Building a Web-App" href="release/pageflow/pageflow_building.html"/>
- <pageflow_altering label="Altering a Page Flow" href="release/pageflow/pageflow_altering.html"/>
- <pageflow_databinding label="Databinding" href="release/pageflow/pageflow_databinding.html"/>
- <pageflow_datagrid label="Data Grids" href="release/pageflow/pageflow_datagrid.html"/>
- <pageflow_sharedFlow label="Shared Flow" href="release/pageflow/sharedFlow.html"/>
- <pageflow_popups label="Popup Windows" href="release/pageflow/popupWindows.html"/>
- <pageflow_valid label="Validation" href="release/pageflow/validation.html"/>
- <pageflow_jsf label="Java Server Faces" href="release/pageflow/jsf.html"/>
- <pageflow_servlet_adapter label="Servlet Container Adapters" href="release/pageflow/servlet_container_adapters.html"/>
- <devmode label="Development Mode" href="release/development/dev_mode.html"/>
- <pageflow_faq label="FAQ" href="release/pageflow/faq.html"/>
- <!--<pageflow_programming label="Page Flow Programming" href="release/pageflow/guide.html"/>-->
+ <pageflow_getting_started label="Getting Started" href="pageflow/getting_started.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_databinding label="Databinding" href="pageflow/pageflow_databinding.html"/>
+ <pageflow_datagrid label="Data Grids" href="pageflow/pageflow_datagrid.html"/>
+ <pageflow_sharedFlow label="Shared Flow" href="pageflow/sharedFlow.html"/>
+ <pageflow_popups label="Popup Windows" href="pageflow/popupWindows.html"/>
+ <pageflow_valid label="Validation" href="pageflow/validation.html"/>
+ <pageflow_jsf label="Java Server Faces" href="pageflow/jsf.html"/>
+ <pageflow_servlet_adapter label="Servlet Container Adapters" href="pageflow/servlet_container_adapters.html"/>
+ <devmode label="Development Mode" href="development/dev_mode.html"/>
+ <pageflow_faq label="FAQ" href="pageflow/faq.html"/>
+ <!--<pageflow_programming label="Page Flow Programming" href="pageflow/guide.html"/>-->
</pageflow>
<controls label="Controls">
- <control_getting_started label="Getting Started" href="release/controls/getting_started.html"/>
- <control_overview label="Controls Overview" href="release/controls/controlsOverview.html"/>
- <control_prog label="Control Programming" href="release/controls/controlsProgramming.html"/>
- <control_contain label="Controls Containment" href="release/controls/controlsContainment.html"/>
+ <control_getting_started label="Getting Started" href="controls/getting_started.html"/>
+ <control_overview label="Controls Overview" href="controls/controlsOverview.html"/>
+ <control_prog label="Control Programming" href="controls/controlsProgramming.html"/>
+ <control_contain label="Controls Containment" href="controls/controlsContainment.html"/>
</controls>
<controls label="System Controls">
- <ejb_control label="Ejb Control" href="release/system-controls/ejb/ejbDoc.html"/>
- <jdbc_control label="Jdbc Control" href="release/system-controls/jdbc/jdbcControlDevGuide.html"/>
- <jms_control label="Jms Control" href="release/system-controls/jms/jmsDoc.html"/>
- <webservices_control label="Web Services Control" href="release/system-controls/webservices/webservicesDoc.html"/>
+ <ejb_control label="Ejb Control" href="system-controls/ejb/ejbDoc.html"/>
+ <jdbc_control label="Jdbc Control" href="system-controls/jdbc/jdbcControlDevGuide.html"/>
+ <jms_control label="Jms Control" href="system-controls/jms/jmsDoc.html"/>
+ <webservices_control label="Web Services Control" href="system-controls/webservices/webservicesDoc.html"/>
</controls>
<wsm label="Web Services">
- <wsm_getting_started label="Getting Started" href="release/wsm/getting_started.html"/>
- <wsm_overview label="Web Services Overview" href="release/wsm/wsm_overview.html"/>
- <jws_files label="Java Web Services" href="release/wsm/wsm_JWSFiles.html"/>
- <supported_datatypes label="Supported Data Types" href="release/wsm/datatypes.html"/>
- <jsr181 label="Web Services (JSR 181)" href="release/webservices.html"/>
+ <wsm_getting_started label="Getting Started" href="wsm/getting_started.html"/>
+ <wsm_overview label="Web Services Overview" href="wsm/wsm_overview.html"/>
+ <jws_files label="Java Web Services" href="wsm/wsm_JWSFiles.html"/>
+ <supported_datatypes label="Supported Data Types" href="wsm/datatypes.html"/>
+ <jsr181 label="Web Services (JSR 181)" href="webservices.html"/>
</wsm>
<!--
<howdoi label="How Do I...?">
- <useControl label="How Do I: Invoke a Control?" href="release/how/howInvokeControl.html"/>
+ <useControl label="How Do I: Invoke a Control?" href="how/howInvokeControl.html"/>
</howdoi>
-->
<samples label="Samples">
- <sam_index label="Samples" href="release/samples/index.html"/>
- <jpetstore label="Petstore" href="release/samples/jpetstore.html"/>
- <netui-samples label="Page Flow Samples" href="release/pageflow/netui-samples.html"/>
- <netui-jsf label="Page Flow: JSF Integration" href="release/pageflow/sample_jpf_jsf_integration.html"/>
- <address-enhanced label="Web Service: AddressBook Enhanced" href="release/wsm/sample_AddressBookEnhanced.html"/>
- <address-wsdl label=" Web Service: AddressBook from WSDL" href="release/wsm/sample_AddressBookFromWSDL.html"/>
- <!--<wsm-samples label="Web Service: Annotation Samples" href="release/wsm/sample_wsmAnnoSamples.html"/>-->
- <netui-blank label="Project: Page Flow" href="release/pageflow/sample_netui-blank.html"/>
- <control-blank label="Project: Control" href="release/controls/sample_controls-blank.html"/>
- <wsm-blank label="Project: Web Service" href="release/wsm/sample_wsm-blank.html"/>
- <ws-control-blank label="Project: Web Service Control" href="release/system-controls/webservices/sample-ws-control-blank.html" />
+ <sam_index label="Samples" href="samples/index.html"/>
+ <jpetstore label="Petstore" href="samples/jpetstore.html"/>
+ <netui-samples label="Page Flow Samples" href="pageflow/netui-samples.html"/>
+ <netui-jsf label="Page Flow: JSF Integration" href="pageflow/sample_jpf_jsf_integration.html"/>
+ <address-enhanced label="Web Service: AddressBook Enhanced" href="wsm/sample_AddressBookEnhanced.html"/>
+ <address-wsdl label=" Web Service: AddressBook from WSDL" href="wsm/sample_AddressBookFromWSDL.html"/>
+ <!--<wsm-samples label="Web Service: Annotation Samples" href="wsm/sample_wsmAnnoSamples.html"/>-->
+ <netui-blank label="Project: Page Flow" href="pageflow/sample_netui-blank.html"/>
+ <control-blank label="Project: Control" href="controls/sample_controls-blank.html"/>
+ <wsm-blank label="Project: Web Service" href="wsm/sample_wsm-blank.html"/>
+ <ws-control-blank label="Project: Web Service Control" href="system-controls/webservices/sample-ws-control-blank.html" />
</samples>
<ref label="Reference Docs">
<controls label="Controls">
- <control_anno label="Controls Annotations" href="release/controls/annotations/control_annotations.html"/>
- <control_javadoc label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
+ <control_anno label="Controls Annotations" href="controls/annotations/control_annotations.html"/>
+ <control_javadoc label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
</controls>
<system-controls label="System Controls">
- <sys_control_javadoc label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
- <ejb_control_anno label="Ejb Control Annotations" href="release/system-controls/ejb/ejb-annotations.html"/>
- <db_control_anno label="Jdbc Control Annotations" href="release/system-controls/jdbc/jdbc-annotations.html"/>
- <jms_control_anno label="Jms Control Annotations" href="release/system-controls/jms/jms-annotations.html"/>
- <ws_control_anno label="Webservices Control Annotations" href="release/system-controls/webservices/webservices-annotations.html"/>
+ <sys_control_javadoc label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
+ <ejb_control_anno label="Ejb Control Annotations" href="system-controls/ejb/ejb-annotations.html"/>
+ <db_control_anno label="Jdbc Control Annotations" href="system-controls/jdbc/jdbc-annotations.html"/>
+ <jms_control_anno label="Jms Control Annotations" href="system-controls/jms/jms-annotations.html"/>
+ <ws_control_anno label="Webservices Control Annotations" href="system-controls/webservices/webservices-annotations.html"/>
</system-controls>
<netui label="Page Flows">
- <netui_taglib label="<netui> Tags" href="release/apidocs/taglib/index.html"/>
- <netui_annotations label="Page Flow Annotations" href="release/pageflow/jpf-annotations/pageflow_annotations.html"/>
- <netui_config label="beehive-netui-config.xml" href="release/pageflow/config/beehive-netui-config.html"/>
- <netui_api label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
+ <netui_taglib label="<netui> Tags" href="apidocs/taglib/index.html"/>
+ <netui_annotations label="Page Flow Annotations" href="pageflow/jpf-annotations/pageflow_annotations.html"/>
+ <netui_config label="beehive-netui-config.xml" href="pageflow/config/beehive-netui-config.html"/>
+ <netui_api label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
</netui>
<ws label="Web Services">
- <control label="Web Services Annotations" href="release/wsm/annotations/wsm_annotations.html"/>
- <ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
+ <control label="Web Services Annotations" href="wsm/annotations/wsm_annotations.html"/>
+ <ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
</ws>
</ref>
<javadoc label="Javadoc">
- <javadoc_control label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
- <javadoc_sys_control label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
- <javadoc_netui label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
- <javadoc_ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
+ <javadoc_control label="Controls Javadoc" href="apidocs/classref_controls/index.html"/>
+ <javadoc_sys_control label="System Controls Javadoc" href="apidocs/classref_systemcontrols/index.html"/>
+ <javadoc_netui label="Page Flow Javadoc" href="apidocs/classref_pageflows/index.html"/>
+ <javadoc_ws label="Web Services Javadoc" href="apidocs/classref_wsm/index.html"/>
</javadoc>
- <release_notes label="Release Notes" href="release/release_notes.html"/>
- <gloss label="Glossary" href="release/glossary.html"/>
+ <release_notes label="Release Notes" href="release_notes.html"/>
+ <gloss label="Glossary" href="glossary.html"/>
<!--<dev label="Development"></dev>-->
</docs>
- <links label="Links" tab="welcome">
- <wiki label="Beehive Wiki" href="http://wiki.apache.org/beehive"/>
- <jira label="Beehive JIRA (Bugs and Issues)" href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10570"/>
- <svn label="Browse Source Code (svn)" href="http://svn.apache.org/viewcvs.cgi/incubator/beehive/trunk"/>
- <pollinate label="Pollinate" href="http://www.eclipse.org/pollinate/"/>
- </links>
</site>
Modified: incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml (original)
+++ incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/tabs.xml Thu Aug 4 12:46:13 2005
@@ -2,7 +2,7 @@
<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
<tabs software="Apache Beehive"
- title="Apache Beehive"
+ title="Apache Beehive 1.0m1 Documentation"
copyright="Apache Software Foundation"
xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -17,6 +17,6 @@
be displayed when their parent tab is selected.
-->
- <tab id="welcome" label="Beehive 1.0" dir="" indexfile="index.html"/>
- <!--<tab id="docs" label="Documentation" dir="docs" indexfile="index.html"/>-->
+ <tab id="home" label="Home" dir="" href="http://incubator.apache.org/beehive"/>
+ <tab id="release" label="Beehive 1.0m1" dir="" indexfile=""/>
</tabs>
Copied: incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/faq.xml (from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/faq.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/faq.xml?p2=incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/faq.xml&p1=incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/faq.xml&r1=227415&r2=227458&rev=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/faq.xml (original)
+++ incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/faq.xml Thu Aug 4 12:46:13 2005
@@ -35,7 +35,7 @@
<dd><anchor id="controls" /> Controls are the new component model in Beehive. They are based on
regular JavaBeans, with an enhanced authoring model, an extensibility
model, and a configuration model using JSR 175 annotations. To find
- out more about controls look at <a href="release/controls/controlsOverview.html">Controls Overview</a>.</dd>
+ out more about controls look at <a href="http://incubator.apache.org/beehive/releases/v1m1/controls/controlsOverview.html">Controls Overview</a>.</dd>
</dl>
<dl>
<dt>Does Beehive Support Commons Attributes?</dt>
Copied: incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/index.xml (from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/index.xml?p2=incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/index.xml&p1=incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml&r1=227415&r2=227458&rev=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/index.xml Thu Aug 4 12:46:13 2005
@@ -42,7 +42,7 @@
<section id="docs">
<title>Documentation</title>
<p>
- <a href="release/index.html">Beehive 1.0 Milestone 1 Documentation</a>
+ <a href="ext:beehive/releases/v10m1/">Beehive 1.0 Milestone 1 Documentation</a>
</p>
<p>
<strong>Note:</strong> the documentation provided here is intended to be used with Beehive binary distributions; it is <em>not</em> intended for use with Beehive source from SVN.
Copied: incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/site.xml (from r227415, incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/site.xml?p2=incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/site.xml&p1=incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml&r1=227415&r2=227458&rev=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ incubator/beehive/trunk/docs/forrest/site/src/documentation/content/xdocs/site.xml Thu Aug 4 12:46:13 2005
@@ -9,106 +9,7 @@
<faq label="FAQ" href="faq.html"/>
</about>
<docs label="Documentation" tab="welcome">
- <setup label="Installation and Setup" href="release/setup.html" />
- <tutorials label="Tutorials">
- <tutorial_pageflow label="Page Flows" href="release/pageflow/tutorial_pageflow.html"/>
- <tutorial_control label="Controls" href="release/controls/tutorial_controls.html"/>
- <tutorial_wsm label="Web Services" href="release/wsm/tutorial_wsm.html"/>
- <!--<tut_dbwebapp label="DB-Driven Web App" href="release/tutorial/tut_dbdrivenwebapp.html" />-->
- <tutorial_system-controls label="System Controls">
- <control label="EJB Control Tutorial" href="release/system-controls/ejb/ejbControlTutorial.html"/>
- <control label="JDBC Control Tutorial" href="release/system-controls/jdbc/jdbcControlTutorial.html"/>
- <control label="JMS Control Tutorial" href="release/system-controls/jms/jmsControlTutorial.html"/>
- <control label="Webservices Control Tutorial" href="release/system-controls/webservices/webservicesControlTutorial.html"/>
- </tutorial_system-controls>
- </tutorials>
- <pageflow label="Page Flows">
- <pageflow_getting_started label="Getting Started" href="release/pageflow/getting_started.html"/>
- <pageflow_overview label="Overview" href="release/pageflow/pageflow_overview.html"/>
- <pageflow_controllers label="Controller Files" href="release/pageflow/pageflow_controllers.html"/>
- <pageflow_jsp label="JSP Files" href="release/pageflow/pageflow_jsp.html"/>
- <pageflow_building label="Building a Web-App" href="release/pageflow/pageflow_building.html"/>
- <pageflow_altering label="Altering a Page Flow" href="release/pageflow/pageflow_altering.html"/>
- <pageflow_databinding label="Databinding" href="release/pageflow/pageflow_databinding.html"/>
- <pageflow_datagrid label="Data Grids" href="release/pageflow/pageflow_datagrid.html"/>
- <pageflow_sharedFlow label="Shared Flow" href="release/pageflow/sharedFlow.html"/>
- <pageflow_popups label="Popup Windows" href="release/pageflow/popupWindows.html"/>
- <pageflow_valid label="Validation" href="release/pageflow/validation.html"/>
- <pageflow_jsf label="Java Server Faces" href="release/pageflow/jsf.html"/>
- <pageflow_servlet_adapter label="Servlet Container Adapters" href="release/pageflow/servlet_container_adapters.html"/>
- <devmode label="Development Mode" href="release/development/dev_mode.html"/>
- <pageflow_faq label="FAQ" href="release/pageflow/faq.html"/>
- <!--<pageflow_programming label="Page Flow Programming" href="release/pageflow/guide.html"/>-->
- </pageflow>
- <controls label="Controls">
- <control_getting_started label="Getting Started" href="release/controls/getting_started.html"/>
- <control_overview label="Controls Overview" href="release/controls/controlsOverview.html"/>
- <control_prog label="Control Programming" href="release/controls/controlsProgramming.html"/>
- <control_contain label="Controls Containment" href="release/controls/controlsContainment.html"/>
- </controls>
- <controls label="System Controls">
- <ejb_control label="Ejb Control" href="release/system-controls/ejb/ejbDoc.html"/>
- <jdbc_control label="Jdbc Control" href="release/system-controls/jdbc/jdbcControlDevGuide.html"/>
- <jms_control label="Jms Control" href="release/system-controls/jms/jmsDoc.html"/>
- <webservices_control label="Web Services Control" href="release/system-controls/webservices/webservicesDoc.html"/>
- </controls>
- <wsm label="Web Services">
- <wsm_getting_started label="Getting Started" href="release/wsm/getting_started.html"/>
- <wsm_overview label="Web Services Overview" href="release/wsm/wsm_overview.html"/>
- <jws_files label="Java Web Services" href="release/wsm/wsm_JWSFiles.html"/>
- <supported_datatypes label="Supported Data Types" href="release/wsm/datatypes.html"/>
- <jsr181 label="Web Services (JSR 181)" href="release/webservices.html"/>
- </wsm>
- <!--
- <howdoi label="How Do I...?">
- <useControl label="How Do I: Invoke a Control?" href="release/how/howInvokeControl.html"/>
- </howdoi>
- -->
- <samples label="Samples">
- <sam_index label="Samples" href="release/samples/index.html"/>
- <jpetstore label="Petstore" href="release/samples/jpetstore.html"/>
- <netui-samples label="Page Flow Samples" href="release/pageflow/netui-samples.html"/>
- <netui-jsf label="Page Flow: JSF Integration" href="release/pageflow/sample_jpf_jsf_integration.html"/>
- <address-enhanced label="Web Service: AddressBook Enhanced" href="release/wsm/sample_AddressBookEnhanced.html"/>
- <address-wsdl label=" Web Service: AddressBook from WSDL" href="release/wsm/sample_AddressBookFromWSDL.html"/>
- <!--<wsm-samples label="Web Service: Annotation Samples" href="release/wsm/sample_wsmAnnoSamples.html"/>-->
- <netui-blank label="Project: Page Flow" href="release/pageflow/sample_netui-blank.html"/>
- <control-blank label="Project: Control" href="release/controls/sample_controls-blank.html"/>
- <wsm-blank label="Project: Web Service" href="release/wsm/sample_wsm-blank.html"/>
- <ws-control-blank label="Project: Web Service Control" href="release/system-controls/webservices/sample-ws-control-blank.html" />
- </samples>
- <ref label="Reference Docs">
- <controls label="Controls">
- <control_anno label="Controls Annotations" href="release/controls/annotations/control_annotations.html"/>
- <control_javadoc label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
- </controls>
- <system-controls label="System Controls">
- <sys_control_javadoc label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
- <ejb_control_anno label="Ejb Control Annotations" href="release/system-controls/ejb/ejb-annotations.html"/>
- <db_control_anno label="Jdbc Control Annotations" href="release/system-controls/jdbc/jdbc-annotations.html"/>
- <jms_control_anno label="Jms Control Annotations" href="release/system-controls/jms/jms-annotations.html"/>
- <ws_control_anno label="Webservices Control Annotations" href="release/system-controls/webservices/webservices-annotations.html"/>
- </system-controls>
- <netui label="Page Flows">
- <netui_taglib label="<netui> Tags" href="release/apidocs/taglib/index.html"/>
- <netui_annotations label="Page Flow Annotations" href="release/pageflow/jpf-annotations/pageflow_annotations.html"/>
- <netui_config label="beehive-netui-config.xml" href="release/pageflow/config/beehive-netui-config.html"/>
- <netui_api label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
- </netui>
- <ws label="Web Services">
- <control label="Web Services Annotations" href="release/wsm/annotations/wsm_annotations.html"/>
- <ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
- </ws>
- </ref>
- <javadoc label="Javadoc">
- <javadoc_control label="Controls Javadoc" href="release/apidocs/classref_controls/index.html"/>
- <javadoc_sys_control label="System Controls Javadoc" href="release/apidocs/classref_systemcontrols/index.html"/>
- <javadoc_netui label="Page Flow Javadoc" href="release/apidocs/classref_pageflows/index.html"/>
- <javadoc_ws label="Web Services Javadoc" href="release/apidocs/classref_wsm/index.html"/>
- </javadoc>
- <release_notes label="Release Notes" href="release/release_notes.html"/>
- <gloss label="Glossary" href="release/glossary.html"/>
- <!--<dev label="Development"></dev>-->
+ <release-v10m1 href="ext:beehive/releases/v10m1/" label="1.0 Milestone 1"/>
</docs>
<links label="Links" tab="welcome">
<wiki label="Beehive Wiki" href="http://wiki.apache.org/beehive"/>
@@ -116,4 +17,11 @@
<svn label="Browse Source Code (svn)" href="http://svn.apache.org/viewcvs.cgi/incubator/beehive/trunk"/>
<pollinate label="Pollinate" href="http://www.eclipse.org/pollinate/"/>
</links>
+ <external-refs>
+ <beehive href="http://incubator.apache.org/beehive/">
+ <releases href="releases/">
+ <v10m1 href="v1.0m1"/>
+ </releases>
+ </beehive>
+ </external-refs>
</site>
Modified: incubator/beehive/trunk/system-controls/ant/javadoc.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/ant/javadoc.xml?rev=227458&r1=227457&r2=227458&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/ant/javadoc.xml (original)
+++ incubator/beehive/trunk/system-controls/ant/javadoc.xml Thu Aug 4 12:46:13 2005
@@ -16,7 +16,7 @@
<path refid="ejb.dependency.path"/>
<pathelement path="${classes.dir}/ejb-control-xbean"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
+ <path refid="commons-logging.dependency.path"/>
<path refid="servlet.dependency.path"/>
<path refid="controls.dependency.path"/>
<path refid="tools.dependency.path"/>