You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@beehive.apache.org by Rich Feit <ri...@gmail.com> on 2005/11/09 22:04:38 UTC
Re: svn commit: r332140 - in /beehive/trunk/netui/test/webapps/drt:
./ coreWeb/WEB-INF/ coreWeb/WEB-INF/src/ coreWeb/formBean/test1/ coreWeb/formBean/test2/
coreWeb/miniTests/webinfSrcDotJava/ coreWeb/pageFlowCore/inheritance/super1/
coreWeb/pageFlowCore/r...
This is going to break the build; svn ran into an error *after* it had
committed some of the files. I'm working to clean it up.
Rich
rich@apache.org wrote:
>Author: rich
>Date: Wed Nov 9 12:59:36 2005
>New Revision: 332140
>
>URL: http://svn.apache.org/viewcvs?rev=332140&view=rev
>Log:
>Changed the project model for coreWeb so that source and web content directories are split out, and the deployed webapp is built to a separate directory:
>
> src
> coreWeb
> build
> build.xml
>
>This is part one (the hard part). Part 2 is to rename 'coreWeb' to 'web'.
>
>tests: bvt in netui, run.tests against the built test distribution (linux)
>BB: self (WinXP)
>
>
>Added:
> beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp2.jsp
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test1/Jsp2.jsp
> beehive/trunk/netui/test/webapps/drt/src/
> - copied from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/
> beehive/trunk/netui/test/webapps/drt/src/META-INF/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/META-INF/
> beehive/trunk/netui/test/webapps/drt/src/bugs/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/bugs/
> beehive/trunk/netui/test/webapps/drt/src/databinding/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/
> beehive/trunk/netui/test/webapps/drt/src/databinding/controls/methodTest/MethodTestImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/controls/methodTest/MethodTestImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/controls/PortfolioControlImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/controls/PortfolioControlImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/error/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/error/
> beehive/trunk/netui/test/webapps/drt/src/errors/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/errors/
> beehive/trunk/netui/test/webapps/drt/src/exceptions/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/exceptions/
> beehive/trunk/netui/test/webapps/drt/src/formBean/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/
> beehive/trunk/netui/test/webapps/drt/src/global/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/global/
> beehive/trunk/netui/test/webapps/drt/src/global/Global.java
> - copied, changed from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/global/Global.app
> beehive/trunk/netui/test/webapps/drt/src/interOp/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/interOp/
> beehive/trunk/netui/test/webapps/drt/src/jpfScopedForms/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/jpfScopedForms/
> beehive/trunk/netui/test/webapps/drt/src/log4j.xml
> - copied unchanged from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/log4j.xml
> beehive/trunk/netui/test/webapps/drt/src/miniTests/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/
> beehive/trunk/netui/test/webapps/drt/src/miscJpf/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/
> beehive/trunk/netui/test/webapps/drt/src/miscJpf/bug21124/CtrlImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miscJpf/bug21124/CtrlImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/mockportal/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/
> beehive/trunk/netui/test/webapps/drt/src/models/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/models/
> beehive/trunk/netui/test/webapps/drt/src/moduleConfigLocator/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/moduleConfigLocator/
> beehive/trunk/netui/test/webapps/drt/src/org/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/org/
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/controlsContextualServices/HelloControlImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/controlsContextualServices/HelloControlImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/inheritControls/BaseControlImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/inheritControls/BaseControlImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/lifecycle/TestControlImpl.java
> - copied unchanged from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/lifecycle/TestControlImpl.jcs
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/
> beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/InputForm.java
> beehive/trunk/netui/test/webapps/drt/src/pageFlowUtils/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowUtils/
> beehive/trunk/netui/test/webapps/drt/src/pageInput/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageInput/
> beehive/trunk/netui/test/webapps/drt/src/properties/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/properties/
> beehive/trunk/netui/test/webapps/drt/src/qaUtil/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/qaUtil/
> beehive/trunk/netui/test/webapps/drt/src/resources/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/resources/
> beehive/trunk/netui/test/webapps/drt/src/returnTo/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/returnTo/
> beehive/trunk/netui/test/webapps/drt/src/returnToTest/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/returnToTest/
> beehive/trunk/netui/test/webapps/drt/src/shared/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/shared/
> beehive/trunk/netui/test/webapps/drt/src/strutsMerge/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/strutsMerge/
> beehive/trunk/netui/test/webapps/drt/src/test/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/test/
> beehive/trunk/netui/test/webapps/drt/src/util/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/util/
> beehive/trunk/netui/test/webapps/drt/src/valFwdErr/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/valFwdErr/
> beehive/trunk/netui/test/webapps/drt/src/validation/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/validation/
> beehive/trunk/netui/test/webapps/drt/src/xml/
> - copied from r331925, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/xml/
>Removed:
> beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/
> beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test2/
> beehive/trunk/netui/test/webapps/drt/src/formBean/test1/Jsp2.jsp
> beehive/trunk/netui/test/webapps/drt/src/formBean/test2/Jsp1.jsp
> beehive/trunk/netui/test/webapps/drt/testRecorder/tests/StrutsFormBeanTest2.xml
>Modified:
> beehive/trunk/netui/test/webapps/drt/build.xml
> beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
> beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp
> beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.java
> beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/nested/nestedController.java
> beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.java
> beehive/trunk/netui/test/webapps/drt/src/bugs/j172/Messages.properties
> beehive/trunk/netui/test/webapps/drt/src/formBean/test1/struts-config-formBean.xml
> beehive/trunk/netui/test/webapps/drt/src/formBean/test2/struts-config-formBean.xml
> beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
> beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J172.xml
> beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml
>
>Modified: beehive/trunk/netui/test/webapps/drt/build.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.xml?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/build.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/build.xml Wed Nov 9 12:59:36 2005
>@@ -2,16 +2,20 @@
>
> <!--
> -->
>-<project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir=".">
>+<project name="Beehive/NetUI/Test/coreWeb" default="usage" basedir=".">
>
> <property environment="os"/>
> <property file="build.properties"/>
>
>+ <property name="webapp.build.dir" location="build"/>
>+ <property name="classes.dir" location="${webapp.build.dir}/WEB-INF/classes"/>
>+ <property name="src.dir" location="src"/>
>+ <property name="web.dir" location="coreWeb"/>
>+
> <property name="webapp.name" value="coreWeb"/>
> <property name="testRecorder.config.name" value="netui-server-drt-config"/>
> <property name="server.root.url" value="http://localhost:8080"/>
> <property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/>
>- <property name="webapp.dir" location="${webapp.name}"/>
>
> <import file="${testrecorder.dir}/testRecorder.xml"/>
> <import file="${beehive.home}/beehive-imports.xml"/>
>@@ -42,57 +46,65 @@
> <echo message="| NetUI coreWeb DRT webapp build starting |"/>
> <echo message="--------------------------------------------------"/>
>
>+ <mkdir dir="${webapp.build.dir}"/>
>+ <mkdir dir="${webapp.build.dir}/WEB-INF/classes"/>
>+ <mkdir dir="${webapp.build.dir}/WEB-INF/lib"/>
>+
> <antcall target="update.runtime"/>
>
> <!-- this is the classpath to include when building webapp sources -->
> <path id="webapp.classpath">
> <pathelement location="${servlet-api.jar}"/>
> <pathelement location="${jsp-api.jar}"/>
>- <pathelement location="${webapp.dir}/WEB-INF/classes"/>
>- <fileset dir="${webapp.dir}/WEB-INF/lib">
>+ <pathelement location="${webapp.build.dir}/WEB-INF/classes"/>
>+ <fileset dir="${webapp.build.dir}/WEB-INF/lib">
> <include name="*.jar"/>
> </fileset>
> </path>
>
>- <!--
>- this directory needs to get whacked before every build so
>- that control interface repackagings don't cause stale
>- files to be compiled
>- -->
>- <delete dir="${webapp.dir}/WEB-INF/.tmpbeansrc" includeEmptyDirs="true"/>
>-
>- <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
>-
>- <!-- compile XSDs -->
>- <echo>Building XML Schemas</echo>
>- <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas"
>- destdir="${webapp.dir}/WEB-INF/classes"/>
>-
>- <!-- compile controls -->
>- <echo>Building Controls</echo>
>- <build-controls srcdir="${webapp.dir}/WEB-INF/src"
>- destdir="${webapp.dir}/WEB-INF/classes"
>- tempdir="${webapp.dir}/WEB-INF/.tmpbeansrc"
>- classpathref="webapp.classpath"/>
>-
>- <!-- compile JPFs -->
>- <echo>Building Page Flows</echo>
>- <build-pageflows srcdir="${webapp.dir}"
>- tempdir="${webapp.dir}/WEB-INF/.tmpbeansrc"
>- classpathref="webapp.classpath"/>
>-
>- <!-- copy resources -->
>- <echo>Copying all .properties and .xml files to ${webapp.dir}/WEB-INF/classes</echo>
>- <copy todir="${webapp.dir}/WEB-INF/classes">
>- <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.properties"/>
>- <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
>+ <copy todir="${webapp.build.dir}" includeEmptyDirs="false">
>+ <fileset dir="${web.dir}">
>+ <exclude name="**/*.java"/>
>+ <exclude name="**/*.jpf"/>
>+ <exclude name="**/.svn/**"/>
>+ </fileset>
> </copy>
>
>- <!-- Copy a META-INF reference to our test.TestServletContainerAdapter (see /WEB-INF/src/test/TestServletContainerAdapter.java for more details). -->
>- <copy todir="${webapp.dir}/WEB-INF/classes">
>- <fileset dir="${webapp.dir}/WEB-INF/src" includes="META-INF/**"/>
>+ <echo>Copying .properties and .xml files from ${src.dir} to ${webapp.build.dir}/WEB-INF/classes</echo>
>+ <copy todir="${webapp.build.dir}/WEB-INF/classes" includeEmptyDirs="false">
>+ <fileset dir="${src.dir}" includes="**/*.properties"/>
>+ <fileset dir="${src.dir}" includes="**/*.xml"/>
>+ <fileset dir="${src.dir}" includes="META-INF/**"/>
> </copy>
>
>+ <path id="webapp.classpath">
>+ <pathelement location="${servlet-api.jar}"/>
>+ <pathelement location="${jsp-api.jar}"/>
>+ <pathelement location="${webapp.build.dir}/WEB-INF/classes"/>
>+ <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-schemas srcdir="${webapp.build.dir}/WEB-INF/schemas"
>+ destdir="${webapp.build.dir}/WEB-INF/classes"/>
>+
>+ <build-controls srcdir="${src.dir}"
>+ destdir="${classes.dir}"
>+ classpathref="webapp.classpath"
>+ tempdir="tmpbeansrc"/>
>+
>+ <build-pageflows srcdir="."
>+ webcontentdir="${web.dir}"
>+ destdir="${webapp.build.dir}/WEB-INF/classes"
>+ tempdir="tmpbeansrc"
>+ sourcepathref="webapp.sourcepath"
>+ classpathref="webapp.classpath"/>
>+
>+
> <echo message="--------------------------------------------------"/>
> <echo message="| NetUI coreWeb DRT webapp build ending |"/>
> <echo message="--------------------------------------------------"/>
>@@ -110,18 +122,18 @@
>
> <echo>Struts version: ${struts.version}</echo>
>
>- <deploy-netui webappdir="${webapp.dir}"/>
>+ <deploy-netui webappdir="${webapp.build.dir}"/>
>
> <testrecorder-config testfile="${basedir}/testRecorder/config/testRecorder-tests.xml"
> configfile="testRecorder/config/testRecorder-config.xml"
> webappfile="testRecorder/config/testRecorder-webapp.xml"
> appdir="${basedir}"
>- outputdir="coreWeb/WEB-INF/classes"/>
>+ outputdir="${webapp.build.dir}/WEB-INF/classes"/>
>
>- <testrecorder-deploy webappdir="${webapp.dir}"/>
>+ <testrecorder-deploy webappdir="${webapp.build.dir}"/>
>
> <!-- deploy XMLBeans which isn't included in the default webapp template -->
>- <copy todir="${webapp.dir}/WEB-INF/lib">
>+ <copy todir="${webapp.build.dir}/WEB-INF/lib">
> <fileset file="${xbean.jar}"/>
> <fileset file="${jsr173.jar}"/>
> </copy>
>@@ -132,19 +144,7 @@
> <echo message="| NetUI coreWeb DRT webapp clean starting |"/>
> <echo message="--------------------------------------------------"/>
>
>- <property name="struts.version" value="1.2"/>
>-
>- <delete dir="${webapp.dir}/resources/beehive/version1" quiet="true"/>
>- <delete dir="${webapp.dir}/WEB-INF/classes" quiet="true"/>
>- <delete dir="${webapp.dir}/WEB-INF/.tmpbeansrc" quiet="true"/>
>- <delete quiet="true">
>- <fileset dir="${webapp.dir}/WEB-INF/lib" includes="*.jar"/>
>- </delete>
>-
>- <echo>Clean the test recorder to webapp at root: ${webapp.dir}</echo>
>- <ant dir="${test.dir}/ant" antfile="testRecorder.xml" target="undeploy.testrecorder" inheritAll="false">
>- <property name="webapp.dir" location="${webapp.dir}"/>
>- </ant>
>+ <delete dir="${webapp.build.dir}"/>
>
> <echo message="--------------------------------------------------"/>
> <echo message="| NetUI coreWeb DRT webapp clean ending |"/>
>@@ -188,7 +188,6 @@
> <property name="playback.webapps" value="${webapp.name}"/>
> <property name="drt.mode" value="true"/>
> </ant>
>- <delete file="${webapp.dir}/WEB-INF/netui-config.xml"/>
> </target>
>
> <target name="bvt" description="Run the bvt suite with full server start / stop support.">
>@@ -210,10 +209,10 @@
> <!-- This is the documented workaround for using declarative validation with Struts 1.1.
> We need to copy the resources so they can be loaded from *servlet context* as
> /_pageflow/pageflow-validation-*.xml. -->
>- <delete dir="${webapp.dir}/_pageflow"/>
>- <mkdir dir="${webapp.dir}/_pageflow"/>
>- <copy todir="${webapp.dir}/_pageflow">
>- <fileset dir="${webapp.dir}/WEB-INF/classes/_pageflow" includes="*-validation*.xml"/>
>+ <delete dir="${webapp.build.dir}/_pageflow"/>
>+ <mkdir dir="${webapp.build.dir}/_pageflow"/>
>+ <copy todir="${webapp.build.dir}/_pageflow">
>+ <fileset dir="${webapp.build.dir}/WEB-INF/classes/_pageflow" includes="*-validation*.xml"/>
> </copy>
> <ant dir="${testrecorder.dir}" antfile="testRecorder.xml" inheritAll="false" target="server.test">
> <property name="app.build.dir" location="${basedir}"/>
>@@ -224,7 +223,7 @@
> <property name="formatter.type" value="xml"/>
> <property name="formatter.usefile" value="true"/>
> </ant>
>- <delete dir="${webapp.dir}/_pageflow"/>
>+ <delete dir="${webapp.build.dir}/_pageflow"/>
> </target>
>
> <target name="suite.running" description="Playback a test recorder test suite against a running server">
>@@ -241,7 +240,7 @@
> <!-- -->
> <!-- ================================================================ -->
> <target name="deploy" description="Deploy webapp">
>- <deploy-webapp webappDir="${webapp.dir}" contextPath="${webapp.name}"/>
>+ <deploy-webapp webappDir="${webapp.build.dir}" contextPath="${webapp.name}"/>
> </target>
>
> <target name="undeploy" description="Undeploy webapp">
>@@ -318,3 +317,4 @@
> </waitfor>
> </target>
> </project>
>+
>
>Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml Wed Nov 9 12:59:36 2005
>@@ -137,19 +137,15 @@
> </init-param>
> <init-param>
> <param-name>config/formBeanTest1</param-name>
>- <param-value>/WEB-INF/src/formBean/test1/struts-config-formBean.xml</param-value>
>+ <param-value>/formBean/test1/struts-config-formBean.xml</param-value>
> </init-param>
> <init-param>
> <param-name>config/interOp/tests</param-name>
> <param-value>/WEB-INF/interOp/struts-config-tests.xml</param-value>
> </init-param>
> <init-param>
>- <param-name>config/formBeanTest2</param-name>
>- <param-value>/WEB-INF/src/formBean/test2/struts-config-formBean.xml</param-value>
>- </init-param>
>- <init-param>
> <param-name>config/miscJpf/test13</param-name>
>- <param-value>/WEB-INF/src/miscJpf/test13/struts-config-test13.xml</param-value>
>+ <param-value>/miscJpf/test13/struts-config-test13.xml</param-value>
> </init-param>
>
> <init-param>
>
>Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp (original)
>+++ beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp Wed Nov 9 12:59:36 2005
>@@ -5,7 +5,7 @@
>
> <netui:html>
> <body>
>- This is a test of a page flow as a .java file in WEB-INF/src (WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java in this case).
>+ This is a test of a page flow as a .java file in /src (/src/miniTests/webinfSrcDotJava/Controller.java in this case).
> <br/>
> <br/>
> <netui:anchor action="next">next</netui:anchor>
>
>Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.java
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.java?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.java (original)
>+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.java Wed Nov 9 12:59:36 2005
>@@ -2,7 +2,7 @@
>
> import org.apache.beehive.netui.pageflow.*;
> import org.apache.beehive.netui.pageflow.annotations.*;
>-import pageFlowCore.inheritance.super0.Super0; // in WEB-INF/src
>+import pageFlowCore.inheritance.super0.Super0; // in /src
>
> @Jpf.Controller(
> catches={
>
>Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/nested/nestedController.java
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/nested/nestedController.java?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/nested/nestedController.java (original)
>+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/nested/nestedController.java Wed Nov 9 12:59:36 2005
>@@ -25,578 +25,9 @@
> import org.apache.beehive.netui.pageflow.Forward;
> import org.apache.beehive.netui.pageflow.PageFlowController;
> import org.apache.beehive.netui.pageflow.annotations.Jpf;
>-import pageFlowCore.returnToTest.returnToTestController.InputForm;
>+import pageFlowCore.returnToTest.InputForm;
>
>-/**
>- * @jpf:controller nested="true"
>- * @jpf:view-properties view-properties::
>- * <!-- This data is auto-generated. Hand-editing this section is not recommended. -->
>- * <view-properties>
>- * <pageflow-object id="pageflow:/returnToTest/nested/nestedController.jpf"/>
>- * <pageflow-object id="action:begin.do">
>- * <property value="2120" name="x"/>
>- * <property value="60" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPreviousPageOverrideInputs.do">
>- * <property value="2920" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToCurrentPage.do">
>- * <property value="1580" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPage.do">
>- * <property value="2180" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPreviousPage.do">
>- * <property value="2740" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPageOverrideInputs.do">
>- * <property value="2320" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPageOverrideForm.do">
>- * <property value="2040" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToPreviousPageOverrideForm.do">
>- * <property value="2560" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToCurrentPageOverrideInputs.do">
>- * <property value="1400" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:returnToCurrentPageOverrideForm.do">
>- * <property value="1760" name="x"/>
>- * <property value="440" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPage.do@">
>- * <property value="2156,2156,2144,2144" name="elbowsX"/>
>- * <property value="163,300,300,432" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPreviousPageOverrideInputs.do@">
>- * <property value="2156,2520,2520,2884" name="elbowsX"/>
>- * <property value="163,163,432,432" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToCurrentPageOverrideForm.do@">
>- * <property value="2084,1940,1940,1796" name="elbowsX"/>
>- * <property value="163,163,432,432" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToCurrentPageOverrideInputs.do@">
>- * <property value="2084,1760,1760,1436" name="elbowsX"/>
>- * <property value="163,163,432,432" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPageOverrideInputs.do@">
>- * <property value="2156,2220,2220,2284" name="elbowsX"/>
>- * <property value="163,163,432,432" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPageOverrideForm.do@">
>- * <property value="2084,2040,2040,2040" name="elbowsX"/>
>- * <property value="163,163,279,396" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToCurrentPage.do@">
>- * <property value="2084,1850,1850,1616" name="elbowsX"/>
>- * <property value="152,152,432,432" name="elbowsY"/>
>- * <property value="West_1" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPreviousPage.do@">
>- * <property value="2156,2430,2430,2704" name="elbowsX"/>
>- * <property value="152,152,432,432" name="elbowsY"/>
>- * <property value="East_1" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:returnToPreviousPageOverrideForm.do@">
>- * <property value="2156,2340,2340,2524" name="elbowsX"/>
>- * <property value="163,163,432,432" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="page:index.jsp">
>- * <property value="2120" name="x"/>
>- * <property value="160" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:path#success#index.jsp#@action:begin.do@">
>- * <property value="2120,2120,2120,2120" name="elbowsX"/>
>- * <property value="104,110,110,116" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToPreviousPage">
>- * <property value="2740" name="x"/>
>- * <property value="560" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPreviousPage#@action:returnToPreviousPageOverrideInputs.do@">
>- * <property value="2920,2920,2920,2920" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToCurrentPage">
>- * <property value="1580" name="x"/>
>- * <property value="600" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToCurrentPage#@action:returnToCurrentPage.do@">
>- * <property value="1580,1580,1580,1580" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToPage">
>- * <property value="2180" name="x"/>
>- * <property value="600" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPage#@action:returnToPage.do@">
>- * <property value="2180,2180,2180,2180" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPreviousPage#@action:returnToPreviousPage.do@">
>- * <property value="2740,2740,2740,2740" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPage#@action:returnToPageOverrideInputs.do@">
>- * <property value="2284,2250,2250,2216" name="elbowsX"/>
>- * <property value="443,443,592,592" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToPageWithForm">
>- * <property value="2040" name="x"/>
>- * <property value="600" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPageWithForm#@action:returnToPageOverrideForm.do@">
>- * <property value="2040,2040,2040,2040" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToPreviousPageWithForm">
>- * <property value="2560" name="x"/>
>- * <property value="600" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToPreviousPageWithForm#@action:returnToPreviousPageOverrideForm.do@">
>- * <property value="2560,2560,2560,2560" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToCurrentPage#@action:returnToCurrentPageOverrideInputs.do@">
>- * <property value="1436,1490,1490,1544" name="elbowsX"/>
>- * <property value="443,443,592,592" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="exit:returnToCurrentPageWithForm">
>- * <property value="1760" name="x"/>
>- * <property value="600" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="forward:return-action#success#returnToCurrentPageWithForm#@action:returnToCurrentPageOverrideForm.do@">
>- * <property value="1760,1760,1760,1760" name="elbowsX"/>
>- * <property value="484,520,520,556" name="elbowsY"/>
>- * <property value="South_1" name="fromPort"/>
>- * <property value="North_1" name="toPort"/>
>- * <property value="success" name="label"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPageOverrideInputs.do">
>- * <property value="640" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPage.do">
>- * <property value="1920" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPreviousPage.do">
>- * <property value="3280" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPreviousPageOverrideForm.do">
>- * <property value="400" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPreviousPageOverrideInputs.do">
>- * <property value="4320" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToCurrentPageOverrideForm.do">
>- * <property value="4040" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToCurrentPageOverrideForm.do@">
>- * <property value="2156,3080,3080,4005" name="elbowsX"/>
>- * <property value="163,163,252,252" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPage.do@">
>- * <property value="2084,2019,2019,1955" name="elbowsX"/>
>- * <property value="163,163,252,252" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToPageOverrideForm.do">
>- * <property value="1520" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPreviousPageOverrideInputs.do@">
>- * <property value="2156,3220,3220,4285" name="elbowsX"/>
>- * <property value="163,163,252,252" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPreviousPageOverrideForm.do@">
>- * <property value="2084,1259,1259,435" name="elbowsX"/>
>- * <property value="152,152,252,252" name="elbowsY"/>
>- * <property value="West_1" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPreviousPage.do@">
>- * <property value="2156,2700,2700,3245" name="elbowsX"/>
>- * <property value="163,163,252,252" name="elbowsY"/>
>- * <property value="East_2" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToCurrentPageOverrideInputs.do">
>- * <property value="3520" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action:globalReturnToCurrentPage.do">
>- * <property value="1720" name="x"/>
>- * <property value="260" name="y"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPageOverrideInputs.do@">
>- * <property value="2084,1379,1379,675" name="elbowsX"/>
>- * <property value="163,163,252,252" name="elbowsY"/>
>- * <property value="West_2" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToPageOverrideForm.do@">
>- * <property value="2084,1819,1819,1555" name="elbowsX"/>
>- * <property value="152,152,252,252" name="elbowsY"/>
>- * <property value="West_1" name="fromPort"/>
>- * <property value="East_1" name="toPort"/>
>- * </pageflow-object>
>- * <pageflow-object id="action-call:@page:index.jsp@#@action:globalReturnToCurrentPageOverrideInputs.do@">
>- * <property value="2156,2820,2820,3485" name="elbowsX"/>
>- * <property value="152,152,252,252" name="elbowsY"/>
>- * <property value="East_1" name="fromPort"/>
>- * <property value="West_1" name="toPort"/>
>- * </pageflow-object>
>- * </view-properties>
>- * ::
>- */
>-@Jpf.Controller(
>- nested = true)
>-@Jpf.ViewProperties(
>- value = {
>- "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
>- "<view-properties>",
>- "<pageflow-object id='pageflow:/returnToTest/nested/nestedController.jpf'/>",
>- "<pageflow-object id='action:begin.do'>",
>- " <property value='2120' name='x'/>",
>- " <property value='60' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPreviousPageOverrideInputs.do'>",
>- " <property value='2920' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToCurrentPage.do'>",
>- " <property value='1580' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPage.do'>",
>- " <property value='2180' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPreviousPage.do'>",
>- " <property value='2740' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPageOverrideInputs.do'>",
>- " <property value='2320' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPageOverrideForm.do'>",
>- " <property value='2040' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToPreviousPageOverrideForm.do'>",
>- " <property value='2560' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToCurrentPageOverrideInputs.do'>",
>- " <property value='1400' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:returnToCurrentPageOverrideForm.do'>",
>- " <property value='1760' name='x'/>",
>- " <property value='440' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPage.do@'>",
>- " <property value='2156,2156,2144,2144' name='elbowsX'/>",
>- " <property value='163,300,300,432' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPreviousPageOverrideInputs.do@'>",
>- " <property value='2156,2520,2520,2884' name='elbowsX'/>",
>- " <property value='163,163,432,432' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToCurrentPageOverrideForm.do@'>",
>- " <property value='2084,1940,1940,1796' name='elbowsX'/>",
>- " <property value='163,163,432,432' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToCurrentPageOverrideInputs.do@'>",
>- " <property value='2084,1760,1760,1436' name='elbowsX'/>",
>- " <property value='163,163,432,432' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPageOverrideInputs.do@'>",
>- " <property value='2156,2220,2220,2284' name='elbowsX'/>",
>- " <property value='163,163,432,432' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPageOverrideForm.do@'>",
>- " <property value='2084,2040,2040,2040' name='elbowsX'/>",
>- " <property value='163,163,279,396' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToCurrentPage.do@'>",
>- " <property value='2084,1850,1850,1616' name='elbowsX'/>",
>- " <property value='152,152,432,432' name='elbowsY'/>",
>- " <property value='West_1' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPreviousPage.do@'>",
>- " <property value='2156,2430,2430,2704' name='elbowsX'/>",
>- " <property value='152,152,432,432' name='elbowsY'/>",
>- " <property value='East_1' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:returnToPreviousPageOverrideForm.do@'>",
>- " <property value='2156,2340,2340,2524' name='elbowsX'/>",
>- " <property value='163,163,432,432' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='page:index.jsp'>",
>- " <property value='2120' name='x'/>",
>- " <property value='160' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:path#success#index.jsp#@action:begin.do@'>",
>- " <property value='2120,2120,2120,2120' name='elbowsX'/>",
>- " <property value='104,110,110,116' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToPreviousPage'>",
>- " <property value='2740' name='x'/>",
>- " <property value='560' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPreviousPage#@action:returnToPreviousPageOverrideInputs.do@'>",
>- " <property value='2920,2920,2920,2920' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToCurrentPage'>",
>- " <property value='1580' name='x'/>",
>- " <property value='600' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToCurrentPage#@action:returnToCurrentPage.do@'>",
>- " <property value='1580,1580,1580,1580' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToPage'>",
>- " <property value='2180' name='x'/>",
>- " <property value='600' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPage#@action:returnToPage.do@'>",
>- " <property value='2180,2180,2180,2180' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPreviousPage#@action:returnToPreviousPage.do@'>",
>- " <property value='2740,2740,2740,2740' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPage#@action:returnToPageOverrideInputs.do@'>",
>- " <property value='2284,2250,2250,2216' name='elbowsX'/>",
>- " <property value='443,443,592,592' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToPageWithForm'>",
>- " <property value='2040' name='x'/>",
>- " <property value='600' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPageWithForm#@action:returnToPageOverrideForm.do@'>",
>- " <property value='2040,2040,2040,2040' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToPreviousPageWithForm'>",
>- " <property value='2560' name='x'/>",
>- " <property value='600' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToPreviousPageWithForm#@action:returnToPreviousPageOverrideForm.do@'>",
>- " <property value='2560,2560,2560,2560' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToCurrentPage#@action:returnToCurrentPageOverrideInputs.do@'>",
>- " <property value='1436,1490,1490,1544' name='elbowsX'/>",
>- " <property value='443,443,592,592' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='exit:returnToCurrentPageWithForm'>",
>- " <property value='1760' name='x'/>",
>- " <property value='600' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='forward:return-action#success#returnToCurrentPageWithForm#@action:returnToCurrentPageOverrideForm.do@'>",
>- " <property value='1760,1760,1760,1760' name='elbowsX'/>",
>- " <property value='484,520,520,556' name='elbowsY'/>",
>- " <property value='South_1' name='fromPort'/>",
>- " <property value='North_1' name='toPort'/>",
>- " <property value='success' name='label'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPageOverrideInputs.do'>",
>- " <property value='640' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPage.do'>",
>- " <property value='1920' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPreviousPage.do'>",
>- " <property value='3280' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPreviousPageOverrideForm.do'>",
>- " <property value='400' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPreviousPageOverrideInputs.do'>",
>- " <property value='4320' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToCurrentPageOverrideForm.do'>",
>- " <property value='4040' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToCurrentPageOverrideForm.do@'>",
>- " <property value='2156,3080,3080,4005' name='elbowsX'/>",
>- " <property value='163,163,252,252' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPage.do@'>",
>- " <property value='2084,2019,2019,1955' name='elbowsX'/>",
>- " <property value='163,163,252,252' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToPageOverrideForm.do'>",
>- " <property value='1520' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPreviousPageOverrideInputs.do@'>",
>- " <property value='2156,3220,3220,4285' name='elbowsX'/>",
>- " <property value='163,163,252,252' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPreviousPageOverrideForm.do@'>",
>- " <property value='2084,1259,1259,435' name='elbowsX'/>",
>- " <property value='152,152,252,252' name='elbowsY'/>",
>- " <property value='West_1' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPreviousPage.do@'>",
>- " <property value='2156,2700,2700,3245' name='elbowsX'/>",
>- " <property value='163,163,252,252' name='elbowsY'/>",
>- " <property value='East_2' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToCurrentPageOverrideInputs.do'>",
>- " <property value='3520' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action:globalReturnToCurrentPage.do'>",
>- " <property value='1720' name='x'/>",
>- " <property value='260' name='y'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPageOverrideInputs.do@'>",
>- " <property value='2084,1379,1379,675' name='elbowsX'/>",
>- " <property value='163,163,252,252' name='elbowsY'/>",
>- " <property value='West_2' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToPageOverrideForm.do@'>",
>- " <property value='2084,1819,1819,1555' name='elbowsX'/>",
>- " <property value='152,152,252,252' name='elbowsY'/>",
>- " <property value='West_1' name='fromPort'/>",
>- " <property value='East_1' name='toPort'/>",
>- "</pageflow-object>",
>- "<pageflow-object id='action-call:@page:index.jsp@#@action:globalReturnToCurrentPageOverrideInputs.do@'>",
>- " <property value='2156,2820,2820,3485' name='elbowsX'/>",
>- " <property value='152,152,252,252' name='elbowsY'/>",
>- " <property value='East_1' name='fromPort'/>",
>- " <property value='West_1' name='toPort'/>",
>- "</pageflow-object>",
>- "</view-properties>"
>- })
>+@Jpf.Controller(nested = true)
> public class nestedController extends PageFlowController
> {
> private Forward getInputOverrideForward()
>
>Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.java
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.java?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.java (original)
>+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToTestController.java Wed Nov 9 12:59:36 2005
>@@ -288,47 +288,4 @@
> {
> return new Forward("success");
> }
>-
>- /**
>- * FormData get and set methods may be overwritten by the Form Bean editor.
>- */
>- public static class InputForm extends FormData
>- {
>- private String bar;
>-
>- private String foo;
>-
>-
>- public void setFoo(String foo)
>- {
>- this.foo = foo;
>- }
>-
>- public String getFoo()
>- {
>- return this.foo;
>- }
>-
>- public void setBar(String bar)
>- {
>- this.bar = bar;
>- }
>-
>- public String getBar()
>- {
>- return this.bar;
>- }
>-
>- public ActionErrors validate( ActionMapping mapping, HttpServletRequest request )
>- {
>- if ( foo.length() == 0 )
>- {
>- ActionErrors errs = new ActionErrors();
>- errs.add( "foo", new ActionError( "anError" ) );
>- return errs;
>- }
>-
>- return null;
>- }
>- }
> }
>
>Modified: beehive/trunk/netui/test/webapps/drt/src/bugs/j172/Messages.properties
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/src/bugs/j172/Messages.properties?rev=332140&r1=331925&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/src/bugs/j172/Messages.properties (original)
>+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j172/Messages.properties Wed Nov 9 12:59:36 2005
>@@ -1 +1 @@
>-err=This is a custom message from /WEB-INF/src/bugs/j172/Messages.properties.
>+err=This is a custom message from /src/bugs/j172/Messages.properties.
>
>Modified: beehive/trunk/netui/test/webapps/drt/src/formBean/test1/struts-config-formBean.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/src/formBean/test1/struts-config-formBean.xml?rev=332140&r1=331925&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/src/formBean/test1/struts-config-formBean.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/src/formBean/test1/struts-config-formBean.xml Wed Nov 9 12:59:36 2005
>@@ -22,7 +22,7 @@
> scope="session"
> validate="false"
> type="formBean.test1.Struts1" >
>- <forward name="gotoJsp2" contextRelative="true" path="/WEB-INF/src/formBean/test1/Jsp2.jsp" />
>+ <forward name="gotoJsp2" contextRelative="true" path="/formBean/test1/Jsp2.jsp" />
> </action>
> <action
> path="/strutsAction2"
>
>Modified: beehive/trunk/netui/test/webapps/drt/src/formBean/test2/struts-config-formBean.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/src/formBean/test2/struts-config-formBean.xml?rev=332140&r1=331925&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/src/formBean/test2/struts-config-formBean.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/src/formBean/test2/struts-config-formBean.xml Wed Nov 9 12:59:36 2005
>@@ -22,7 +22,7 @@
> scope="session"
> validate="false"
> type="formBean.test2.Struts1" >
>- <forward name="gotoJsp1" contextRelative="true" path="/WEB-INF/src/formBean/test2/Jsp1.jsp" />
>+ <forward name="gotoJsp1" contextRelative="true" path="/formBean/test2/Jsp1.jsp" />
> </action>
> <action
> path="/strutsAction2"
>@@ -38,7 +38,7 @@
> scope="session"
> validate="false"
> type="formBean.test2.Struts3" >
>- <forward name="gotoJsp3" contextRelative="true" path="/WEB-INF/src/formBean/test2/Jsp3.jsp" />
>+ <forward name="gotoJsp3" contextRelative="true" path="/formBean/test2/Jsp3.jsp" />
> </action>
> <action
> path="/strutsAction4"
>
>Copied: beehive/trunk/netui/test/webapps/drt/src/global/Global.java (from r331850, beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/global/Global.app)
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/src/global/Global.java?p2=beehive/trunk/netui/test/webapps/drt/src/global/Global.java&p1=beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/global/Global.app&r1=331850&r2=332140&rev=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/global/Global.app (original)
>+++ beehive/trunk/netui/test/webapps/drt/src/global/Global.java Wed Nov 9 12:59:36 2005
>@@ -10,10 +10,10 @@
> import org.apache.struts.action.ActionForward;
> import shared.FormA;
> import shared.QaTrace;
>-import pageFlowCore.returnToTest.returnToTestController.InputForm;
>+import pageFlowCore.returnToTest.InputForm;
>
> @Jpf.Controller(
>- strutsMerge="/WEB-INF/src/global/merge-jpf-struts-config.xml"
>+ strutsMerge="merge-jpf-struts-config.xml"
> )
> public class Global extends GlobalApp
> {
>
>Added: beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/InputForm.java
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/InputForm.java?rev=332140&view=auto
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/InputForm.java (added)
>+++ beehive/trunk/netui/test/webapps/drt/src/pageFlowCore/returnToTest/InputForm.java Wed Nov 9 12:59:36 2005
>@@ -0,0 +1,46 @@
>+package pageFlowCore.returnToTest;
>+
>+import org.apache.beehive.netui.pageflow.FormData;
>+import org.apache.struts.action.ActionErrors;
>+import org.apache.struts.action.ActionError;
>+import org.apache.struts.action.ActionMapping;
>+import javax.servlet.http.HttpServletRequest;
>+
>+public class InputForm extends FormData
>+{
>+ private String bar;
>+ private String foo;
>+
>+
>+ public void setFoo(String foo)
>+ {
>+ this.foo = foo;
>+ }
>+
>+ public String getFoo()
>+ {
>+ return this.foo;
>+ }
>+
>+ public void setBar(String bar)
>+ {
>+ this.bar = bar;
>+ }
>+
>+ public String getBar()
>+ {
>+ return this.bar;
>+ }
>+
>+ public ActionErrors validate( ActionMapping mapping, HttpServletRequest request )
>+ {
>+ if ( foo.length() == 0 )
>+ {
>+ ActionErrors errs = new ActionErrors();
>+ errs.add( "foo", new ActionError( "anError" ) );
>+ return errs;
>+ }
>+
>+ return null;
>+ }
>+}
>
>Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Wed Nov 9 12:59:36 2005
>@@ -7315,16 +7315,6 @@
> </categories>
> </test>
> <test>
>- <name>StrutsFormBeanTest2</name>
>- <description>StrutsFormBeanTest2</description>
>- <webapp>coreWeb</webapp>
>- <categories>
>- <category>bvt</category>
>- <category>bvt.struts11</category>
>- <category>qaTests</category>
>- </categories>
>- </test>
>- <test>
> <name>StrutsInteropTest1</name>
> <description>StrutsInteropTest1</description>
> <webapp>coreWeb</webapp>
>@@ -8489,7 +8479,7 @@
> </test>
> <test>
> <name>WebinfSrc</name>
>- <description>Test of server support for page flows in WEB-INF/src.</description>
>+ <description>Test of server support for page flows in /src.</description>
> <webapp>coreWeb</webapp>
> <categories>
> <category>bvt</category>
>@@ -8502,7 +8492,7 @@
> </test>
> <test>
> <name>WebinfSrcDotJava</name>
>- <description>Test of a page flow as a .java file in WEB-INF/src.</description>
>+ <description>Test of a page flow as a .java file in /src.</description>
> <webapp>coreWeb</webapp>
> <categories>
> <category>bvt</category>
>
>Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J172.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J172.xml?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J172.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J172.xml Wed Nov 9 12:59:36 2005
>@@ -153,10 +153,10 @@
>
> exceptions tag: <b>java.lang.IllegalStateException: hi</b>
> <br/>
>- error tag: <b>This is a custom message from /WEB-INF/src/bugs/j172/Messages.properties.
>+ error tag: <b>This is a custom message from /src/bugs/j172/Messages.properties.
> </b>
> <br/>
>- message from method: <b>This is a custom message from /WEB-INF/src/bugs/j172/Messages.properties.</b>
>+ message from method: <b>This is a custom message from /src/bugs/j172/Messages.properties.</b>
>
> </body>
>
>
>Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml
>URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml?rev=332140&r1=332139&r2=332140&view=diff
>==============================================================================
>--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml (original)
>+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml Wed Nov 9 12:59:36 2005
>@@ -3,7 +3,7 @@
> <ses:sessionName>WebinfSrcDotJava</ses:sessionName>
> <ses:tester>rich</ses:tester>
> <ses:startDate>21 Jan 2005, 03:26:10.973 PM MST</ses:startDate>
>- <ses:description>Test of a page flow as a .java file in WEB-INF/src.</ses:description>
>+ <ses:description>Test of a page flow as a .java file in /src.</ses:description>
> <ses:tests>
> <ses:test>
> <ses:testNumber>1</ses:testNumber>
>@@ -68,7 +68,7 @@
> <html lang="en">
>
> <body>
>- This is a test of a page flow as a .java file in WEB-INF/src (WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java in this case).
>+ This is a test of a page flow as a .java file in /src (/src/miniTests/webinfSrcDotJava/Controller.java in this case).
> <br/>
> <br/>
> <a href="/coreWeb/miniTests/webinfSrcDotJava/next.do">next</a>
>
>
>
>
>