You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/09/12 05:40:47 UTC
svn commit: r280244 - in /beehive/trunk: ant/
docs/forrest/release/src/documentation/content/xdocs/
docs/forrest/release/src/documentation/content/xdocs/infra/
docs/forrest/release/src/documentation/content/xdocs/netui/
netui/test/src/junitTests/ netui...
Author: rich
Date: Sun Sep 11 20:40:09 2005
New Revision: 280244
URL: http://svn.apache.org/viewcvs?rev=280244&view=rev
Log:
- Remove unused 'weboutputdir' attribute on <build-pageflows> macro.
- Move 'classoutputdir' to 'destdir' on <build-pageflows>.
tests: drt in trunk, bvt in netui (WinXP)
BB: run.tests against the dist (linux)
Modified:
beehive/trunk/ant/beehive-tools.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/projects.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml
beehive/trunk/netui/test/src/junitTests/build.xml
beehive/trunk/netui/test/webapps/projectModel/build.xml
beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml
beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
beehive/trunk/samples/petstoreWeb/build-dist.xml
beehive/trunk/samples/petstoreWeb/build.xml
beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml
beehive/trunk/user/netui-blank/build.xml
Modified: beehive/trunk/ant/beehive-tools.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/ant/beehive-tools.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/ant/beehive-tools.xml (original)
+++ beehive/trunk/ant/beehive-tools.xml Sun Sep 11 20:40:09 2005
@@ -83,8 +83,7 @@
<attribute name="classpathref" description="The classpath reference for building page flows. Required."/>
<attribute name="sourcepathref" default="_pageflow.default.sourcepath" description="A reference to a path that contains all the source roots. Defaults to a path that contains @{srcdir} and @{srcdir}/WEB-INF/src."/>
<attribute name="webcontentdir" default="@{srcdir}" description="The root location for web content (e.g., JSPs, web.xml, etc.). Defaults to @{srcdir}."/>
- <attribute name="weboutputdir" default="@{srcdir}" description="Deprecated. All files are generated into @{classoutputdir}."/>
- <attribute name="classoutputdir" default="@{srcdir}/WEB-INF/classes" description="The directory for compiled classes. Defaults to @{srcdir}/WEB-INF/classes."/>
+ <attribute name="destdir" default="@{srcdir}/WEB-INF/classes" description="The directory for compiled classes and generated resources. Defaults to @{srcdir}/WEB-INF/classes."/>
<attribute name="tempdir" default="@{srcdir}/WEB-INF/.tmpbeansrc" description="The directory for temporary .java files, copied from page flows (etc.) with non-.java extensions. Defaults to @{srcdir}/WEB-INF/.tmpbeansrc."/>
<sequential>
@@ -115,13 +114,13 @@
<echo> classpath: ${_pageflow.build.classpath}</echo>
<echo> sourcepath: ${_pageflow.build.sourcepath}</echo>
<echo> webcontentdir: @{webcontentdir}</echo>
- <echo> classoutputdir: @{classoutputdir}</echo>
+ <echo> destdir: @{destdir}</echo>
<echo> tempdir: @{tempdir}</echo>
- <mkdir dir="@{classoutputdir}"/>
+ <mkdir dir="@{destdir}"/>
<apt srcdir="@{srcdir}"
- destdir="@{classoutputdir}"
+ destdir="@{destdir}"
gendir="@{tempdir}"
classpathref="_pageflow.build.classpath"
sourcepathref="@{sourcepathref}"
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml Sun Sep 11 20:40:09 2005
@@ -99,9 +99,9 @@
<td>The root location for web content (e.g., JSPs, web.xml, etc.). Defaults to ${srcdir}.</td>
</tr>
<tr>
- <td>classoutputdir</td>
+ <td>destdir</td>
<td>No</td>
- <td>The directory for compiled classes. Defaults to ${srcdir}/WEB-INF/classes.</td>
+ <td>The directory for compiled classes and generated resources. Defaults to ${srcdir}/WEB-INF/classes.</td>
</tr>
<tr>
<td>tempdir</td>
@@ -147,7 +147,7 @@
<source>
<build-pageflows srcdir="project/src"
webcontentdir="project/web"
- classoutputdir="project/build/webapp/WEB-INF/classes"
+ destdir="project/build/webapp/WEB-INF/classes"
classpathref="<em>webapp.build.classpath</em>"/></source>
</section>
</section>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/projects.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/projects.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/projects.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/projects.xml Sun Sep 11 20:40:09 2005
@@ -62,7 +62,7 @@
<build-pageflows srcdir="src/"
webcontentdir="web/"
- classoutputdir="build/WEB-INF/classes/"
+ destdir="build/WEB-INF/classes/"
tempdir="build/WEB-INF/.tmpbeansrc"
classpathref="webapp.classpath"/>
]]></source>
@@ -80,7 +80,7 @@
<build-pageflows srcdir="web/"
webcontentdir="web/"
- classoutputdir="build/WEB-INF/classes/"
+ destdir="build/WEB-INF/classes/"
tempdir="build/WEB-INF/.tmpbeansrc"
classpathref="webapp.classpath"/>
]]></source>
@@ -131,7 +131,7 @@
]]></source>
<p>
The difference between this <code><build-pageflows></code> call and the previous examples is that the <code>webcontentdir</code> and
- <code>classoutputdir</code> directories are implicitly set by only using the <code>srcdir</code> attribute. This causes the web project
+ <code>destdir</code> directories are implicitly set by only using the <code>srcdir</code> attribute. This causes the web project
to build directly into the <code>fooWebProject/</code> directory and to generate classes into <code>fooWebProject/WEB-INF/classes</code>.
</p>
</section>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/release_notes.xml Sun Sep 11 20:40:09 2005
@@ -12,6 +12,30 @@
</section>
-->
<section>
+ <title>Changes</title>
+ <p>
+ This section lists changes from the last release that are not backward-compatible.
+ </p>
+ <ul>
+ <li>
+ The location for generated Struts (and Validator) XML configuration files has been moved. Previously,
+ these files were created under <code>WEB-INF/.pageflow-struts-generated</code>. They are now generated
+ into <code>WEB-INF/classes/_pageflow</code>. In most cases, this should not cause any back-compat
+ problems, since the generated files are internal to the framework.
+ </li>
+ <li>
+ The <code>weboutputdir</code> attribute on the <code>build-pageflows</code> macro
+ (<code>/ant/beehive-tools.xml</code>) has been removed. This had been used to support generation of
+ resources under <code>WEB-INF</code> (see above).
+ </li>
+ <li>
+ The <code>classoutputdir</code> attribute on the <code>build-pageflows</code> macro
+ (<code>/ant/beehive-tools.xml</code>) has been replaced with <code>destdir</code>, to line it up with
+ the rest of the <code>build-</code>* macros (and javac).
+ </li>
+ </ul>
+ </section>
+ <section>
<title>Known Issues</title>
<p>TODO</p>
</section>
Modified: beehive/trunk/netui/test/src/junitTests/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/build.xml (original)
+++ beehive/trunk/netui/test/src/junitTests/build.xml Sun Sep 11 20:40:09 2005
@@ -39,7 +39,7 @@
<!-- Build all page flows and other classes. -->
<build-pageflows
srcdir="${module.dir}"
- classoutputdir="${module.classes.dir}"
+ destdir="${module.classes.dir}"
classpathref="junit.classpath"/>
<!-- Generated struts-config and validator files are built into the classes dir. In a
Modified: beehive/trunk/netui/test/webapps/projectModel/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/projectModel/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/projectModel/build.xml (original)
+++ beehive/trunk/netui/test/webapps/projectModel/build.xml Sun Sep 11 20:40:09 2005
@@ -82,7 +82,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.source.dir}"
webcontentdir="${web.content.dir}"
- classoutputdir="${web.classes.dir}"
+ destdir="${web.classes.dir}"
tempdir="${temp.gen.dir}"
classpathref="projectmodel.webapp.classpath"
sourcepathref="projectmodel.webapp.sourcepath" />
Modified: beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml Sun Sep 11 20:40:09 2005
@@ -93,7 +93,7 @@
<!-- compile JPFs -->
<build-pageflows srcdir="${webapp.dir}"
- classoutputdir="${webapp.dir}/WEB-INF/classes"
+ destdir="${webapp.dir}/WEB-INF/classes"
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.build.classpath"/>
Modified: beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml Sun Sep 11 20:40:09 2005
@@ -70,7 +70,7 @@
<!-- compile JPFs -->
<build-pageflows srcdir="${webapp.dir}"
- classoutputdir="${webapp.dir}/WEB-INF/classes"
+ destdir="${webapp.dir}/WEB-INF/classes"
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.build.classpath"/>
Modified: beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build-dist.xml Sun Sep 11 20:40:09 2005
@@ -101,7 +101,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
- classoutputdir="${build.dir}/WEB-INF/classes"
+ destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Sun Sep 11 20:40:09 2005
@@ -100,7 +100,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
- classoutputdir="${build.dir}/WEB-INF/classes"
+ destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
Modified: beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml (original)
+++ beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/src/build.xml Sun Sep 11 20:40:09 2005
@@ -71,7 +71,7 @@
<!-- compile JPFs -->
<build-pageflows srcdir="${webapp.dir}"
- classoutputdir="${webapp.dir}/WEB-INF/classes"
+ destdir="${webapp.dir}/WEB-INF/classes"
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.build.classpath"/>
Modified: beehive/trunk/user/netui-blank/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/netui-blank/build.xml?rev=280244&r1=280243&r2=280244&view=diff
==============================================================================
--- beehive/trunk/user/netui-blank/build.xml (original)
+++ beehive/trunk/user/netui-blank/build.xml Sun Sep 11 20:40:09 2005
@@ -84,7 +84,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
- classoutputdir="${build.dir}/WEB-INF/classes"
+ destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>