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/05/11 17:35:40 UTC
svn commit: r169647 - in /incubator/beehive/trunk: build.xml
distribution.xml samples/README.txt samples/build.xml
samples/controls-blank/build.xml
samples/netui-samples/WEB-INF/src/build.xml user/samples-README.txt
Author: ekoneil
Date: Wed May 11 08:35:39 2005
New Revision: 169647
URL: http://svn.apache.org/viewcvs?rev=169647&view=rev
Log:
Add a build file for the samples. This addresses two problems:
- the distribution occasionally contains files generated by building the samples (.class files and such)
- we need a way to verify that the samples do build before spinning a distribution
This isn't wired into the main "build.dist" target, but it will be shortly.
BB: self
DRT: none, but the samples build
Added:
incubator/beehive/trunk/samples/build.xml (with props)
incubator/beehive/trunk/user/samples-README.txt
- copied unchanged from r169632, incubator/beehive/trunk/samples/README.txt
Removed:
incubator/beehive/trunk/samples/README.txt
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?rev=169647&r1=169646&r2=169647&view=diff
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Wed May 11 08:35:39 2005
@@ -63,6 +63,14 @@
<ant dir="system-controls" target="build" inheritAll="false"/>
</target>
+ <target name="build.samples" description="Build the Beehive samples">
+ <ant dir="samples" target="build" inheritAll="false"/>
+ </target>
+
+ <target name="clean.samples" description="Clean the Beehive samples">
+ <ant dir="samples" target="clean" inheritAll="false"/>
+ </target>
+
<target name="revision.label" description="Creates svn revision label file">
<mkdir dir="${beehive.home}/build"/>
<exec executable="svnversion" outputproperty="svn.revision" failifexecutionfails="false">
@@ -73,6 +81,8 @@
<target name="scrub" description="Scrub the Beehive directory of downloaded files">
<delete dir="installed"/>
+ <antcall target="clean"/>
+ <antcall target="clean.samples"/>
</target>
<!-- ============================================= -->
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=169647&r1=169646&r2=169647&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Wed May 11 08:35:39 2005
@@ -1,5 +1,23 @@
<?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 distribution build file.
@@ -52,7 +70,7 @@
<antcall target="build.dist.samples"/>
<antcall target="build.dist.docs"/>
- <update-dist-readme/> <!-- system controls have been downloaded incl their revs, update the binary dist's readme file -->
+ <update-dist-readme/>
</target>
<macrodef name="update-dist-readme">
@@ -382,7 +400,7 @@
<!-- copy README.txt -->
<copy todir="${dist.dir}/samples" failOnError="true">
- <fileset file="samples/README.txt"/>
+ <fileset file="user/samples-README.txt"/>
</copy>
</target>
Added: incubator/beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/build.xml?rev=169647&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/build.xml (added)
+++ incubator/beehive/trunk/samples/build.xml Wed May 11 08:35:39 2005
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2005 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:$
+ -->
+
+<project name="Beehive/SVN/Samples" default="build" basedir=".">
+
+ <import file="../beehive-imports.xml"/>
+
+ <target name="clean" description="Clean the Beehive samples">
+ <ant dir="petstoreWeb" target="scrub" inheritAll="false"/>
+ <ant dir="netui-samples/WEB-INF/src" target="clean" inheritAll="false"/>
+ <ant dir="controls-blank" target="clean" inheritAll="false"/>
+ <ant dir="wsm-addressbook-enhanced/WEB-INF" antfile="build-svn.xml" target="clean" inheritAll="false"/>
+ <ant dir="wsm-addressbook/WEB-INF" target="clean" inheritAll="false"/>
+ <ant dir="wsm-blank/WEB-INF" target="clean" inheritAll="false"/>
+ <ant dir="wsm-employee/WEB-INF" target="clean" inheritAll="false"/>
+ <ant dir="wsm-samples/WEB-INF" target="clean" inheritAll="false"/>
+
+ <!-- <ant dir="wsm-petstore-dashboard/WEB-INF" target="clean" inheritAll="false"/> -->
+ <!-- <ant dir="controls-spring/WEB-INF/src" target="clean" inheritAll="false"/> -->
+ </target>
+
+ <target name="build" description="Build the Beehive samples">
+ <ant dir="petstoreWeb" target="deploy-beehive" inheritAll="false"/>
+ <ant dir="petstoreWeb" target="build" inheritAll="false"/>
+
+ <ant dir="netui-samples/WEB-INF/src" target="build" inheritAll="false"/>
+ <ant dir="controls-blank" target="build" inheritAll="false"/>
+ <ant dir="wsm-addressbook-enhanced/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
+ <ant dir="wsm-addressbook/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
+ <ant dir="wsm-blank/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
+
+ <ant dir="wsm-samples/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
+
+ <!-- <ant dir="wsm-employee/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/> -->
+ <!-- <ant dir="wsm-petstore-dashboard/WEB-INF" target="build" inheritAll="false"/> -->
+ <!-- <ant dir="controls-spring/WEB-INF/src" target="build" inheritAll="false"/> -->
+ </target>
+
+</project>
\ No newline at end of file
Propchange: incubator/beehive/trunk/samples/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?rev=169647&r1=169646&r2=169647&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Wed May 11 08:35:39 2005
@@ -46,7 +46,7 @@
<delete file="velocity.log"/>
</target>
- <target name="build" depends="dirs" description="Build control sources">
+ <target name="build" description="Build control sources">
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.beansrc}"/>
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml?rev=169647&r1=169646&r2=169647&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml Wed May 11 08:35:39 2005
@@ -18,7 +18,7 @@
$Header:$
-->
-<project name="Beehive petstoreWeb sample" default="build" basedir="../..">
+<project name="Beehive/Samples/NetUI-Samples" default="build" basedir="../..">
<import file="../../../../beehive-imports.xml" />