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/11/30 17:36:23 UTC
svn commit: r349980 - in /beehive/trunk/netui/test/webapps: jsf/build.xml
urlTemplates/build.xml
Author: ekoneil
Date: Wed Nov 30 08:36:19 2005
New Revision: 349980
URL: http://svn.apache.org/viewcvs?rev=349980&view=rev
Log:
Couple of build tweaks to these Ant files to use a "new" way to call the <build-pageflows> macro. This simply sets the srcdir to the list of source directories and doesn't require the sourcepathref <path> element.
BB: self
Test: JSF and URLTemplate tests pass
Modified:
beehive/trunk/netui/test/webapps/jsf/build.xml
beehive/trunk/netui/test/webapps/urlTemplates/build.xml
Modified: beehive/trunk/netui/test/webapps/jsf/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/jsf/build.xml?rev=349980&r1=349979&r2=349980&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/jsf/build.xml (original)
+++ beehive/trunk/netui/test/webapps/jsf/build.xml Wed Nov 30 08:36:19 2005
@@ -64,21 +64,15 @@
<fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
- <path id="webapp.sourcepath">
- <pathelement location="${web.dir}"/>
- <pathelement location="${src.dir}"/>
- </path>
-
<build-controls srcdir="${src.dir}"
destdir="${classes.dir}"
classpathref="webapp.classpath"
tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
- <build-pageflows srcdir="${basedir}"
+ <build-pageflows srcdir="${web.dir}:${src.dir}"
webcontentdir="${web.dir}"
destdir="${webapp.build.dir}/WEB-INF/classes"
tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"
- sourcepathref="webapp.sourcepath"
classpathref="webapp.classpath"/>
<echo>Copying all .properties and .xml files to ${webapp.dir}/WEB-INF/classes</echo>
Modified: beehive/trunk/netui/test/webapps/urlTemplates/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/build.xml?rev=349980&r1=349979&r2=349980&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/build.xml (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/build.xml Wed Nov 30 08:36:19 2005
@@ -49,21 +49,15 @@
<fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
- <path id="webapp.sourcepath">
- <pathelement location="${web.dir}"/>
- <pathelement location="${src.dir}"/>
- </path>
-
<build-controls srcdir="${src.dir}"
destdir="${classes.dir}"
classpathref="webapp.classpath"
tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
- <build-pageflows srcdir="${basedir}"
+ <build-pageflows srcdir="${src.dir}:${web.dir}"
webcontentdir="${web.dir}"
destdir="${webapp.build.dir}/WEB-INF/classes"
tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"
- sourcepathref="webapp.sourcepath"
classpathref="webapp.classpath"/>
<!--