Author: steveh
Date: Tue Apr 12 14:02:10 2005
New Revision: 161119
URL: http://svn.apache.org/viewcvs?view=rev&rev=161119
Log:
(1) Adding build targets for netui-samples.
(2) Fixing a bug in the build for jpetstoreWeb sample. (build-dist.xml was
being copied to the dist directory, as well as the renamed version.)
Modified:
incubator/beehive/trunk/distribution.xml
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=161118&r2=161119
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Tue Apr 12 14:02:10 2005
@@ -435,7 +435,7 @@
<fileset dir="samples/petstoreWeb">
<exclude name="WEB-INF/src/build.xml"/>
<exclude name="WEB-INF/src/build-dist.xml"/>
- <exclude name="WEB-INF/src/build-dist.properties.xml"/>
+ <exclude name="WEB-INF/src/build-dist.properties"/>
<exclude name="WEB-INF/lib/*.jar"/>
</fileset>
</copy>
@@ -447,6 +447,29 @@
<!-- rename build-dist.properties to build.properties -->
<copy
tofile="${dist.dir}/samples/petstoreWeb/WEB-INF/src/build.properties"
file="${beehive.home}/samples/petstoreWeb/WEB-INF/src/build-dist.properties"
failOnError="true"/>
+
+
+ <!-- Build the netui-samples distro -->
+ <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean">
+ <property name="webapp.dir"
location="${beehive.home}/samples/netui-samples"/>
+ </ant>
+
+ <copy todir="${dist.dir}/samples/netui-samples" failOnError="true">
+ <fileset dir="samples/netui-samples">
+ <exclude name="WEB-INF/src/build.xml"/>
+ <exclude name="WEB-INF/src/build-dist.xml"/>
+ <exclude name="WEB-INF/src/build-dist.properties"/>
+ <exclude name="WEB-INF/lib/*.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- rename build-dist.xml to build.xml -->
+ <copy tofile="${dist.dir}/samples/netui-samples/WEB-INF/src/build.xml"
+
file="${beehive.home}/samples/netui-samples/WEB-INF/src/build-dist.xml"
failOnError="true"/>
+
+ <!-- rename build-dist.properties to build.properties -->
+ <copy
tofile="${dist.dir}/samples/netui-samples/WEB-INF/src/build.properties"
+
file="${beehive.home}/samples/netui-samples/WEB-INF/src/build-dist.properties"
failOnError="true"/>
<!-- Build the controls blank template app distro -->
<copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
