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 2006/11/25 04:59:45 UTC
svn commit: r479079 - in /beehive/trunk: distribution.xml
user/samples-README.txt
Author: ekoneil
Date: Fri Nov 24 19:59:45 2006
New Revision: 479079
URL: http://svn.apache.org/viewvc?view=rev&rev=479079
Log:
Update the distribution build and samples README.
Modified:
beehive/trunk/distribution.xml
beehive/trunk/user/samples-README.txt
Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/distribution.xml?view=diff&rev=479079&r1=479078&r2=479079
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Fri Nov 24 19:59:45 2006
@@ -33,7 +33,6 @@
<project name="Beehive/Distribution" default="usage" basedir=".">
<import file="beehive-imports.xml"/>
- <import file="ant/axis-import.xml"/>
<property name="dist.src.name" value="${dist.name}-src"/>
<property name="dist.lib.name" value="${dist.name}-lib"/>
@@ -85,7 +84,6 @@
</target>
<target name="verify.dist.samples" unless="skip.samples.verify" description="Verify the builds for the samples for a Beehive distribution">
-
<property name="samples.verify.dir" location="${dist.tmp.dir}/samples-build-verification"/>
<copy todir="${samples.verify.dir}">
<fileset dir="${dist.dir}"/>
@@ -131,9 +129,7 @@
<exclude name="web/WEB-INF/lib/commons-discovery-0.2.jar"/>
<exclude name="web/WEB-INF/lib/commons-logging.jar"/>
<exclude name="web/WEB-INF/lib/beehive-controls.jar"/>
- <exclude name="web/WEB-INF/lib/beehive-jdbc-control.jar"/>
- <exclude name="web/WEB-INF/lib/beehive-ejb-control.jar"/>
- <exclude name="web/WEB-INF/lib/beehive-jms-control.jar"/>
+ <exclude name="web/WEB-INF/lib/beehive-*-control.jar"/>
<exclude name="web/WEB-INF/lib/log4j*.jar"/>
</fileset>
</copy>
@@ -185,12 +181,7 @@
<include name="system-controls/src/ejb/**"/>
<include name="system-controls/src/jms/**"/>
<include name="system-controls/src/jdbc/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/build/**"/>
- <exclude name="**/*.log"/>
<exclude name="**/build.xml"/>
- <exclude name="**/*.jar"/>
- <exclude name="system-controls/src/webservice/**"/>
<exclude name="netui/src/bootstrap/**"/>
<exclude name="netui/src/compiler-xdoclet/**"/>
<exclude name="netui/src/jar-assembly/**"/>
@@ -201,7 +192,10 @@
<exclude name="netui/src/tomcat-*/**"/>
<exclude name="netui/src/webapp-template/**"/>
</fileset>
- <!-- this fileset is separate from the previous one because the previous one omits all **/build/** directories -->
+ <!--
+ this fileset is separate from the previous one because the previous one omits
+ all **/build/** directories which skips the generated Control JavaBean source files
+ -->
<fileset dir="${beehive.home}">
<include name="system-controls/build/gensrc/ejb-control/**"/>
<include name="system-controls/build/gensrc/jdbc-control/**"/>
@@ -241,9 +235,7 @@
<copy file="${dist.readme.template}" tofile="${dist.dir}/README.txt" overwrite="true" verbose="true"/>
</target>
- <target name="build.dist.samples">
-
- <!-- clean / build / clean the distribution samples -->
+ <target name="build.dist.samples" description="Build the samples for the distribution">
<ant dir="samples" antfile="build.xml" target="clean" inheritAll="false"/>
<ant dir="samples" antfile="build.xml" target="build" inheritAll="false"/>
<ant dir="samples" antfile="build.xml" target="clean" inheritAll="false"/>
@@ -252,6 +244,7 @@
<fileset dir="samples/petstoreWeb">
<exclude name="build"/>
<exclude name="build.properties"/>
+ <exclude name="build-dist.properties"/>
</fileset>
</copy>
@@ -263,28 +256,22 @@
<antcall target="create.netui-blank"/>
<copy todir="${dist.dir}/samples/netui-samples" failOnError="true">
- <fileset dir="samples/netui-samples">
- <exclude name="WEB-INF/lib/*.jar"/>
- </fileset>
+ <fileset dir="samples/netui-samples"/>
</copy>
<copy todir="${dist.dir}/samples/netui-jsf" failOnError="true">
<fileset dir="samples/netui-jsf"/>
</copy>
- <!-- Copy the controls blank template app distro -->
<copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
<fileset dir="samples/controls-blank"/>
</copy>
- <!-- Copy the controls + Spring sample -->
<copy todir="${dist.dir}/samples/controls-spring" failOnError="true">
- <fileset dir="samples/controls-spring">
- <exclude name="web/WEB-INF/src/build*svn.xml"/>
- </fileset>
+ <fileset dir="samples/controls-spring"/>
</copy>
- <!-- copy samples README.txt -->
+ <!-- Create the samples/README.txt file from the user/samples-README.txt file -->
<copy tofile="${dist.dir}/samples/README.txt" failOnError="true">
<fileset file="user/samples-README.txt"/>
</copy>
@@ -362,10 +349,12 @@
</copy>
</target>
- <!-- Took off the long depends list so this can be called in a chain without reinvoking all the targets it depends on.
- prereq: Now you manually have to ensure that build.dist, build.dist.lib and build.dist.src are done before calling this.
+ <!--
+ Took off the long depends list so this can be called in a chain without reinvoking all the targets it depends on.
+
+ prereq: Now you manually have to ensure that build.dist, build.dist.lib and build.dist.src are done before calling this.
-->
- <target name="build.dist.archives" description="Builds all Beehive distribution archives (.zip, .tar.gz, src, etc)">
+ <target name="build.dist.archives" description="Builds all Beehive distribution archives in .zip and .tar.gz formats">
<fail unless="beehive.version" message="Could not build distribution archives; beehive.version property not specified!"/>
<check-exists file="${dist.dir}" type="dir"/>
<check-exists file="${dist.lib.dir}" type="dir"/>
@@ -394,7 +383,7 @@
<!-- -->
<!-- ============================================= -->
- <target name="build.dist.zip" description="Builds a Beehive distribution zipfile">
+ <target name="build.dist.zip" description="Builds a distribution zip archive">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
@@ -412,7 +401,7 @@
</zip>
</target>
- <target name="build.dist.tgz" description="Builds a Beehive distribution tarball (.tar.gz)">
+ <target name="build.dist.tgz" description="Builds a distribution .tar.gz archive">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
@@ -550,13 +539,6 @@
</tar>
</target>
- <target name="build.dist.docs.jar" depends="build.dist" description="Builds a Beehive distribution docs JAR">
- <fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
-
- <mkdir dir="${dist.archives.dir}"/>
- <jar destfile="${dist.archives.dir}/${dist.docs.name}.jar" basedir="${dist.dir}/docs"/>
- </target>
-
<!-- prereq: you must have built the archives with build.dist.archives already -->
<target name="verify.dist.archives" description="Verifies all Beehive distribution archives (.zip, .tar.gz, src, etc)">
<verify-archive filebase="${dist.name}"/>
@@ -565,10 +547,6 @@
<verify-archive filebase="${dist.src.name}"/>
</target>
- <target name="build.dist.untgz">
- <untar src="${tgz.file}" dest="${tgz.dest.dir}" compression="gzip"/>
- </target>
-
<target name="build.livesite" description="Builds a zipfile of the current live site.">
<property name="tmpdocsdir" location="${dist.tmp.dir}/${dist.docs.name}" />
<copy todir="${tmpdocsdir}">
@@ -625,23 +603,24 @@
<target name="rat" description="Run the RAT tool to verify a distribution">
<fail unless="os.RAT_HOME" message="To run RAT, set the RAT_HOME environment variable"/>
+ <property name="rat.jar" location="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar"/>
<echo>Run RAT on ${dist.base.dir}/${dist.lib.name}. Output in build/rat-${dist.lib.name}.txt</echo>
- <java jar="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar" fork="true" output="build/rat-${dist.lib.name}.txt">
+ <java jar="${rat.jar}" fork="true" output="build/rat-${dist.lib.name}.txt">
<arg line="${dist.base.dir}/${dist.lib.name}"/>
</java>
<echo>Run RAT on ${dist.base.dir}/${dist.name}. Output in build/rat-${dist.name}.txt</echo>
- <java jar="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar" fork="true" output="build/rat-${dist.name}.txt">
+ <java jar="${rat.jar}" fork="true" output="build/rat-${dist.name}.txt">
<arg line="${dist.base.dir}/${dist.name}"/>
</java>
<echo>Run RAT on ${dist.base.dir}/${dist.src.name}. Output in build/rat-${dist.src.name}.txt</echo>
- <java jar="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar" fork="true" output="build/rat-${dist.src.name}.txt">
+ <java jar="${rat.jar}" fork="true" output="build/rat-${dist.src.name}.txt">
<arg line="${dist.base.dir}/${dist.src.name}"/>
</java>
<echo>Run RAT on ${dist.base.dir}/${dist.docs.name}. Output in build/rat-${dist.docs.name}.txt</echo>
- <java jar="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar" fork="true" output="build/rat-${dist.docs.name}.txt">
+ <java jar="${rat.jar}" fork="true" output="build/rat-${dist.docs.name}.txt">
<arg line="${dist.base.dir}/${dist.docs.name}"/>
</java>
</target>
@@ -719,14 +698,11 @@
<check-exists file="${dist.tmp.dir}/@{filebase}/README.txt"/>
<delete dir="${dist.tmp.dir}/@{filebase}"/>
- <!-- check the .tar.gz file -->
+ <!-- check .tar.gz archives -->
<echo message="${line.separator}Verifying archive @{filebase}.tar.gz"/>
<mkdir dir="${dist.tmp.dir}/@{filebase}"/>
- <antcall target="build.dist.untgz">
- <param name="tgz.file" value="${dist.archives.dir}/@{filebase}.tar.gz"/>
- <param name="tgz.dest.dir" value="${dist.tmp.dir}"/>
- </antcall>
+ <untar src="${dist.archives.dir}/@{filebase}.tar.gz" dest="${dist.tmp.dir}" compression="gzip"/>
<check-exists file="${dist.tmp.dir}/@{filebase}/LICENSE.txt"/>
<check-exists file="${dist.tmp.dir}/@{filebase}/NOTICE.txt"/>
Modified: beehive/trunk/user/samples-README.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/user/samples-README.txt?view=diff&rev=479079&r1=479078&r2=479079
==============================================================================
--- beehive/trunk/user/samples-README.txt (original)
+++ beehive/trunk/user/samples-README.txt Fri Nov 24 19:59:45 2006
@@ -1,10 +1,11 @@
+======================
Apache Beehive Samples
======================
This directory contains:
-- samples that demonstrate the capabilities of Beehive Controls and Page Flows
-- application templates you can use as development starting points
+ - project templates that can be used as development starting points
+ - samples that demonstrate the capabilities of Beehive Controls and Page Flows
Instructions for running these samples are located at:
@@ -12,7 +13,7 @@
and locally at:
- <BeehiveRoot>/docs/samples/index.html
+ BEEHIVE_HOME/docs/samples/index.html
The following list describes the function of each sample.
@@ -35,7 +36,5 @@
A web project containing various NetUI samples.
petstoreWeb
- This sample demonstrates all three Beehive sub-projects: controls,
- Page Flows, and web services. Petstore includes (1) a Page Flow based web site,
- (2) controls for managing state and data retrieval, and (3) a web service
- interface for inventory management.
+ This sample demonstrates Beehive Controls and NetUI. The Petstore is built with
+ Page Flows and uses Controls for accessing and updating data.