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/14 16:26:56 UTC
svn commit: r170140 - in /incubator/beehive/trunk: distribution.xml
samples/build.xml samples/controls-spring/web/WEB-INF/src/build.xml
Author: ekoneil
Date: Sat May 14 07:26:55 2005
New Revision: 170140
URL: http://svn.apache.org/viewcvs?rev=170140&view=rev
Log:
Complete distribution samples wireup.
- remove controls-db
- add controls-spring
- add controls-spring to dist samples build
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/build.xml
incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=170140&r1=170139&r2=170140&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sat May 14 07:26:55 2005
@@ -54,7 +54,7 @@
<property name="dist.readme.toplvl.trailer" location="${beehive.home}/docs/dist-docs/toplvl-readme-trailer.txt"/>
<!-- Properties used by the "build.dist*.{tgz,zip}" targets for translating end-of-line characters in text files -->
- <property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.jws,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.tldx,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
+ <property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.jws,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
<property name="text.file.includes.dos" value="**/*.bat,**/*.cmd,${text.file.includes.unix}"/>
@@ -69,7 +69,6 @@
<!-- -->
<!-- ============================================= -->
<target name="build.dist" description="Builds a Beehive distribution">
-
<mkdir dir="${dist.dir}"/>
<antcall target="build.dist.core"/>
@@ -82,22 +81,22 @@
<copy todir="${samples.verify.dir}">
<fileset dir="${dist.dir}"/>
</copy>
+ <ant antfile="${samples.verify.dir}/samples/wsm-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/netui-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/controls-blank/build.xml" target="build" inheritAll="false"/>
+
<ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false">
<property name="derby.jar" location="${beehive.home}/external/derby/derby_46005.jar"/>
</ant>
<ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/netui-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/controls-blank/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/wsm-addressbook/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/wsm-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+
+ <ant antfile="${samples.verify.dir}/samples/netui-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/wsm-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/controls-webservices-blank/build.xml" target="build" inheritAll="false"/>
-<!--
- <ant antfile="${samples.verify.dir}/controls-spring/integration/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
--->
+ <ant antfile="${samples.verify.dir}/samples/controls-webservices-blank/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/controls-spring/integration/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
</target>
<macrodef name="update-dist-readme">
@@ -126,7 +125,6 @@
<fileset refid="xbean.fileset"/>
<fileset refid="jsr173.fileset"/>
<fileset refid="velocity.fileset"/>
-
</copy>
<copy todir="${lib.dir}/controls" failOnError="true">
@@ -157,14 +155,13 @@
<exclude name="WEB-INF/lib/commons-logging.jar"/>
<exclude name="WEB-INF/lib/apache-xbean.jar"/>
<exclude name="WEB-INF/lib/beehive-controls.jar"/>
- <exclude name="WEB-INF/lib/jdbc-control.jar"/>
- <exclude name="WEB-INF/lib/ejb-control.jar"/>
- <exclude name="WEB-INF/lib/wsm-control.jar"/>
- <exclude name="WEB-INF/lib/jms-control.jar"/>
+ <exclude name="WEB-INF/lib/beehive-jdbc-control.jar"/>
+ <exclude name="WEB-INF/lib/beehive-ejb-control.jar"/>
+ <exclude name="WEB-INF/lib/beehive-wsm-control.jar"/>
+ <exclude name="WEB-INF/lib/beehive-jms-control.jar"/>
<exclude name="WEB-INF/lib/jsr173*.jar"/>
<exclude name="WEB-INF/lib/log4j*.jar"/>
<include name="WEB-INF/*.tld"/>
- <include name="WEB-INF/*.tldx"/>
</fileset>
</copy>
@@ -280,10 +277,12 @@
</copy>
<!-- rename build-dist.xml to build.xml -->
- <copy tofile="${dist.dir}/samples/petstoreWeb/build.xml" file="${beehive.home}/samples/petstoreWeb/build-dist.xml" failOnError="true"/>
+ <copy tofile="${dist.dir}/samples/petstoreWeb/build.xml"
+ file="${beehive.home}/samples/petstoreWeb/build-dist.xml" failOnError="true"/>
<!-- rename build-dist.properties to build.properties -->
- <copy tofile="${dist.dir}/samples/petstoreWeb/build.properties" file="${beehive.home}/samples/petstoreWeb/build-dist.properties" failOnError="true"/>
+ <copy tofile="${dist.dir}/samples/petstoreWeb/build.properties"
+ file="${beehive.home}/samples/petstoreWeb/build-dist.properties" failOnError="true"/>
<!-- Build the netui-blank distro -->
<copy todir="${dist.tmp.dir}/netui-blank">
@@ -310,14 +309,16 @@
</fileset>
</copy>
- <!-- Build the controls blank template app distro -->
+ <!-- Copy the controls blank template app distro -->
<copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
<fileset dir="samples/controls-blank"/>
</copy>
- <!-- Build the controls database template app distro -->
- <copy todir="${dist.dir}/samples/controls-db" failOnError="true">
- <fileset dir="samples/controls-db"/>
+ <!-- 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>
</copy>
<!-- Build the sample: wsm-blank -->
@@ -327,7 +328,6 @@
</fileset>
</copy>
-
<!-- Build the sample: controls-webservices-blank -->
<copy todir="${dist.dir}/samples/controls-webservices-blank" failOnError="true">
<fileset dir="samples/controls-webservices-blank">
@@ -335,15 +335,6 @@
<exclude name="systemcontrols-imports.xml"/>
</fileset>
</copy>
-
-
-
- <!-- Build the sample: wsm-addressbook -->
- <copy todir="${dist.dir}/samples/wsm-addressbook" failOnError="true">
- <fileset dir="samples/wsm-addressbook">
- <exclude name="WEB-INF/src/build*svn.xml"/>
- </fileset>
- </copy>
<!-- Build the sample: wsm-addressbook-enhanced -->
<copy todir="${dist.dir}/samples/wsm-addressbook-enhanced" failOnError="true">
@@ -364,8 +355,23 @@
<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>
+-->
<!--
- mmerz@bea.com (3/4/04): sample taken out of distribution; issues around Axis need to be resolved first.
+ 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">
@@ -379,7 +385,7 @@
<!-- Build the sample: wsm-addressbook-fromWSDL -->
<!--
- mmerz@apache.org (3/9/04): needs to be more stable.
+ needs to be more stable.
-->
<!--
<copy todir="${dist.dir}/samples/wsm-addressbook-fromWSDL" failOnError="true">
@@ -392,7 +398,7 @@
<!-- copy README.txt --> <!-- build sample: wsm-employee -->
<!--
- mmerz@apache.org (3/9/04): sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
+ sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
-->
<!--
<copy todir="${dist.dir}/samples/wsm-employee" failOnError="true">
@@ -404,7 +410,7 @@
<!-- build sample: db-control -->
<!--
- mmerz@apache.org (3/11/04): sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
+ sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
-->
<!--
<ant
Modified: incubator/beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/build.xml?rev=170140&r1=170139&r2=170140&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/build.xml (original)
+++ incubator/beehive/trunk/samples/build.xml Sat May 14 07:26:55 2005
@@ -27,18 +27,22 @@
<echo>Cleaning distribution samples</echo>
<echo>---------------------------------------------------------</echo>
- <ant antfile="controls-webservices-blank/build-svn.xml" target="clean" inheritAll="false"/>
<ant antfile="petstoreWeb/build.xml" target="scrub" inheritAll="false"/>
- <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="clean" inheritAll="false"/>
+
<ant antfile="controls-blank/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+
<ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
- <ant antfile="wsm-addressbook/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="wsm-blank/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="wsm-employee/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
- <ant antfile="wsm-samples/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-addressbook/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-employee/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+
+ <ant antfile="wsm-samples/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+ <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="clean" inheritAll="false"/>
+
<ant antfile="controls-spring/integration/build.xml" target="clean" inheritAll="false"/>
<ant antfile="controls-spring/web/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
- <!-- <ant antfile="wsm-petstore-dashboard/WEB-INF" target="clean" inheritAll="false"/> -->
+ <ant antfile="controls-webservices-blank/build-svn.xml" target="clean" inheritAll="false"/>
+ <!-- <ant antfile="wsm-petstore-dashboard/WEB-INF/build-svn.xml" target="clean" inheritAll="false"/> -->
</target>
<target name="build" description="Build the Beehive samples">
@@ -46,18 +50,22 @@
<echo>Building distribution samples</echo>
<echo>---------------------------------------------------------</echo>
- <ant antfile="controls-webservices-blank/build-svn.xml" target="build" inheritAll="false"/>
- <ant antfile="petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false"/>
<ant antfile="petstoreWeb/build.xml" target="build" inheritAll="false"/>
- <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="build" inheritAll="false"/>
+
<ant antfile="controls-blank/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+
<ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
<ant antfile="wsm-addressbook/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
- <ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+
<ant antfile="wsm-samples/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="build" inheritAll="false"/>
+
<ant antfile="controls-spring/integration/build.xml" target="build" inheritAll="false"/>
<ant antfile="controls-spring/web/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="controls-webservices-blank/build-svn.xml" target="build" inheritAll="false"/>
<!-- <ant antfile="wsm-employee/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/> -->
+ <!-- <ant antfile="wsm-petstore-dashboard/WEB-INF/build-svn.xml" target="clean" inheritAll="false"/> -->
</target>
</project>
Modified: incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml?rev=170140&r1=170139&r2=170140&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml Sat May 14 07:26:55 2005
@@ -32,6 +32,8 @@
<!-- ========================================= -->
<target name="build" description="Build the webapp">
<mkdir dir="${webapp.dir}/WEB-INF/lib"/>
+ <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
+
<deploy-controls destDir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true">