Author: rich
Date: Tue Apr 26 02:03:57 2005
New Revision: 164768
URL: http://svn.apache.org/viewcvs?rev=164768&view=rev
Log:
In revision 164185, which added/changed attributes in the <build-*> macros, I
missed several things:
- The attributes for <build-webservices> need to line up with the
attributes from the rest of the macros.
- The netui-blank/build.xml script was updated, but I missed 'destdir' on
<build-pageflows>, which was split into 'weboutputdir' and 'classoutputdir'.
- The netui-samples/WEB-INF/src/build-dist.xml wasn't updated at all.
This change fixes all of the above.
tests: drt in trunk, run.test.dist (and build.dist.full) in trunk (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/ant/beehive-tools.xml
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build-dist.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml
incubator/beehive/trunk/user/netui-blank/build.xml
Modified: incubator/beehive/trunk/ant/beehive-tools.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/beehive-tools.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/ant/beehive-tools.xml (original)
+++ incubator/beehive/trunk/ant/beehive-tools.xml Tue Apr 26 02:03:57 2005
@@ -134,10 +134,10 @@
<!-- This macrodef is intended for the compilation of the *web services"
portions of a web application. -->
<macrodef name="build-webservices">
- <attribute name="sourceDir"/>
- <attribute name="destDir"/>
- <attribute name="tmpDir"/>
- <attribute name="classpathRef"/>
+ <attribute name="srcdir"/>
+ <attribute name="destdir"/>
+ <attribute name="tempdir"/>
+ <attribute name="classpathref"/>
<sequential>
<taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
@@ -145,12 +145,12 @@
onerror="fail" />
<path id="_webservices.build.classpath">
- <path refid="@{classpathRef}"/>
+ <path refid="@{classpathref}"/>
</path>
- <apt srcdir="@{sourceDir}"
- destdir="@{destDir}"
- gendir="@{tmpDir}"
+ <apt srcdir="@{srcdir}"
+ destdir="@{destdir}"
+ gendir="@{tempdir}"
classpathref="_webservices.build.classpath"
compileByExtension="true"
srcExtensions="*.java,*.jcx,*.jcs,*.jws"
Modified:
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build-dist.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build-dist.xml
Tue Apr 26 02:03:57 2005
@@ -62,19 +62,20 @@
<mkdir dir="${webapp.dir}/WEB-INF/classes"/>
<!-- compile XSDs -->
- <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas"
destDir="${webapp.dir}/WEB-INF/classes"/>
+ <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas"
destdir="${webapp.dir}/WEB-INF/classes"/>
<!-- compile controls -->
- <build-controls sourceDir="${webapp.dir}/WEB-INF/src"
+ <build-controls srcdir="${webapp.dir}/WEB-INF/src"
destdir="${webapp.dir}/WEB-INF/classes"
- tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathRef="webapp.build.classpath"/>
+ tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.build.classpath"/>
<!-- compile JPFs -->
- <build-pageflows sourceDir="${webapp.dir}"
- destdir="${webapp.dir}/WEB-INF/classes"
- tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathRef="webapp.build.classpath"/>
+ <build-pageflows srcdir="${webapp.dir}"
+ weboutputdir="${webapp.dir}"
+ classoutputdir="${webapp.dir}/WEB-INF/classes"
+ tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.build.classpath"/>
<!-- copy resources -->
<echo>Copy all .properties and .xml files</echo>
@@ -118,4 +119,4 @@
</java>
</target>
-</project>
\ No newline at end of file
+</project>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
Tue Apr 26 02:03:57 2005
@@ -79,10 +79,10 @@
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
Tue Apr 26 02:03:57 2005
@@ -77,10 +77,10 @@
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
</jar>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml Tue Apr
26 02:03:57 2005
@@ -79,10 +79,10 @@
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml Tue Apr 26
02:03:57 2005
@@ -78,10 +78,10 @@
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
</jar>
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml Tue Apr 26
02:03:57 2005
@@ -74,10 +74,10 @@
</copy>
<antcall target="compile"/>
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}">
@@ -140,4 +140,4 @@
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml Tue Apr 26
02:03:57 2005
@@ -78,10 +78,10 @@
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices sourceDir="${src.dir}"
- destDir="${classes.dir}"
- tmpDir="${gen.dir}"
- classPathRef="build.classpath"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
</jar>
@@ -120,4 +120,4 @@
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/user/netui-blank/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.xml?rev=164768&r1=164767&r2=164768&view=diff
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.xml (original)
+++ incubator/beehive/trunk/user/netui-blank/build.xml Tue Apr 26 02:03:57 2005
@@ -72,7 +72,8 @@
<!-- compile JPFs -->
<build-pageflows srcdir="${webapp.dir}"
- destdir="${webapp.dir}/WEB-INF/classes"
+ weboutputdir="${webapp.dir}"
+ classoutputdir="${webapp.dir}/WEB-INF/classes"
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.build.classpath"/>
