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/09 23:12:40 UTC
svn commit: r279881 [2/2] - in /beehive/trunk: ant/
controls/test/perf/webapps/controlsPerfWeb/WEB-INF/
controls/test/perf/webapps/reportWeb/WEB-INF/
controls/test/webapps/controlsWeb/WEB-INF/
docs/forrest/release/src/documentation/content/xdocs/infra/...
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=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml Fri Sep 9 14:11:01 2005
@@ -31,7 +31,6 @@
<property name="webapp.dir" location="${basedir}/../.."/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<!-- Define the classpath used to build the webapp -->
<path id="webapp.build.classpath">
@@ -71,7 +70,6 @@
<!-- compile JPFs -->
<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"/>
@@ -88,7 +86,6 @@
<delete dir="${webapp.dir}/WEB-INF/classes"/>
<delete dir="${webapp.dir}/WEB-INF/lib"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
- <delete dir="${webapp.dir}/WEB-INF/.pageflow-struts-generated"/>
</target>
<target name="war" depends="build" description="Build a compressed WAR file that can be deployed to an application container">
Modified: beehive/trunk/samples/netui-samples/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/web.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/web.xml Fri Sep 9 14:11:01 2005
@@ -94,7 +94,7 @@
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
- <param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
+ <param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
Modified: beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build-dist.xml Fri Sep 9 14:11:01 2005
@@ -101,7 +101,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
- weboutputdir="${build.dir}"
+ classoutputdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
@@ -136,7 +136,6 @@
<delete dir="${build.dir}/WEB-INF/classes"/>
<delete dir="${build.dir}/WEB-INF/jspc-src"/>
<delete dir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
- <delete dir="${build.dir}/WEB-INF/.pageflow-struts-generated"/>
</target>
<target name="war" description="Build a compressed WAR file that can be deployed to an application container">
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Fri Sep 9 14:11:01 2005
@@ -100,7 +100,7 @@
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
- weboutputdir="${build.dir}"
+ classoutputdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
@@ -135,7 +135,6 @@
<delete dir="${build.dir}/WEB-INF/classes"/>
<delete dir="${build.dir}/WEB-INF/jspc-src"/>
<delete dir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
- <delete dir="${build.dir}/WEB-INF/.pageflow-struts-generated"/>
</target>
<!-- =========================================== -->
Modified: beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml Fri Sep 9 14:11:01 2005
@@ -41,7 +41,7 @@
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
- <param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
+ <param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
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=279881&r1=279880&r2=279881&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 Fri Sep 9 14:11:01 2005
@@ -31,7 +31,6 @@
<property name="webapp.dir" location="${basedir}"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<!-- Define the classpath used to build the webapp -->
<path id="webapp.build.classpath">
@@ -72,7 +71,6 @@
<!-- compile JPFs -->
<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"/>
@@ -88,7 +86,6 @@
<target name="clean" description="Clean the webapp">
<delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
- <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true"/>
</target>
<target name="war" description="Build a compressed WAR file that can be deployed to an application container">
Modified: beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml (original)
+++ beehive/trunk/system-controls/samples/jdbc/jdbcControlSample/WEB-INF/web.xml Fri Sep 9 14:11:01 2005
@@ -55,7 +55,7 @@
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
- <param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
+ <param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
Modified: beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml (original)
+++ beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml Fri Sep 9 14:11:01 2005
@@ -15,7 +15,6 @@
<project name="Beehive/TestDist/WebappBuild" default="usage">
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<import file="${dist.home}/beehive-imports.xml"/>
<import file="${dist.home}/ant/beehive-tools.xml"/>
@@ -78,7 +77,6 @@
<delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
- <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true"/>
</target>
</project>
Modified: beehive/trunk/user/netui-blank/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/netui-blank/build.xml?rev=279881&r1=279880&r2=279881&view=diff
==============================================================================
--- beehive/trunk/user/netui-blank/build.xml (original)
+++ beehive/trunk/user/netui-blank/build.xml Fri Sep 9 14:11:01 2005
@@ -31,7 +31,6 @@
<property name="webapp.dir" location="${basedir}"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<!-- Define the classpath used to build the webapp -->
<path id="webapp.build.classpath">
@@ -79,7 +78,6 @@
<!-- compile JPFs -->
<build-pageflows webcontentdir="${webapp.dir}"
srcdir="${webapp.dir}"
- weboutputdir="${webapp.dir}"
classoutputdir="${webapp.dir}/WEB-INF/classes"
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.build.classpath"
@@ -96,7 +94,6 @@
<target name="clean" description="Clean the webapp">
<delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
- <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true"/>
</target>
<target name="war" description="Build a compressed WAR file that can be deployed to an application container">