Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java Mon Apr 11 23:42:11 2005 @@ -45,7 +45,7 @@ public void testSortModelSimple() { SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNull(sorts); } @@ -53,7 +53,7 @@ DataGridTestUtil.initQueryString(_servletRequest, "foo=bar"); SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNull(sorts); DataGridURLBuilder urlBuilder = DataGridTestUtil.createDataGridURLBuilder(_servletRequest, GRID_NAME); @@ -68,11 +68,11 @@ DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs;id"); SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNotNull(sorts); assertEquals(1, sorts.size()); - assertEquals(SortDirection.ASCENDING, sorts.get(0).getDirection()); - assertEquals("id", sorts.get(0).getSortExpression()); + assertEquals(SortDirection.ASCENDING, ((Sort)sorts.get(0)).getDirection()); + assertEquals("id", ((Sort)sorts.get(0)).getSortExpression()); DataGridURLBuilder urlBuilder = DataGridTestUtil.createDataGridURLBuilder(_servletRequest, GRID_NAME); Map queryParams = urlBuilder.getQueryParams(); @@ -90,13 +90,13 @@ DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs;id,-name"); SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNotNull(sorts); assertEquals(2, sorts.size()); - assertEquals(SortDirection.ASCENDING, sorts.get(0).getDirection()); - assertEquals("id", sorts.get(0).getSortExpression()); - assertEquals(SortDirection.DESCENDING, sorts.get(1).getDirection()); - assertEquals("name", sorts.get(1).getSortExpression()); + assertEquals(SortDirection.ASCENDING, ((Sort)sorts.get(0)).getDirection()); + assertEquals("id", ((Sort)sorts.get(0)).getSortExpression()); + assertEquals(SortDirection.DESCENDING, ((Sort)sorts.get(1)).getDirection()); + assertEquals("name", ((Sort)sorts.get(1)).getSortExpression()); DataGridURLBuilder urlBuilder = DataGridTestUtil.createDataGridURLBuilder(_servletRequest, GRID_NAME); Map queryParams = urlBuilder.getQueryParams(); @@ -114,13 +114,13 @@ DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs;id,-name"); SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNotNull(sorts); assertEquals(2, sorts.size()); - assertEquals(SortDirection.ASCENDING, sorts.get(0).getDirection()); - assertEquals("id", sorts.get(0).getSortExpression()); - assertEquals(SortDirection.DESCENDING, sorts.get(1).getDirection()); - assertEquals("name", sorts.get(1).getSortExpression()); + assertEquals(SortDirection.ASCENDING, ((Sort)sorts.get(0)).getDirection()); + assertEquals("id", ((Sort)sorts.get(0)).getSortExpression()); + assertEquals(SortDirection.DESCENDING, ((Sort)sorts.get(1)).getDirection()); + assertEquals("name", ((Sort)sorts.get(1)).getSortExpression()); DataGridURLBuilder urlBuilder = DataGridTestUtil.createDataGridURLBuilder(_servletRequest, GRID_NAME); Map queryParams = urlBuilder.getQueryParams(); @@ -258,13 +258,13 @@ DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs;id,-name&netui_sort=developers;bugcount,-milestone"); SortModel sortModel = DataGridTestUtil.createSortModel(_servletRequest, GRID_NAME); - List<Sort> sorts = sortModel.getSorts(); + List/*<Sort>*/ sorts = sortModel.getSorts(); assertNotNull(sorts); assertEquals(2, sorts.size()); - assertEquals(SortDirection.ASCENDING, sorts.get(0).getDirection()); - assertEquals("id", sorts.get(0).getSortExpression()); - assertEquals(SortDirection.DESCENDING, sorts.get(1).getDirection()); - assertEquals("name", sorts.get(1).getSortExpression()); + assertEquals(SortDirection.ASCENDING, ((Sort)sorts.get(0)).getDirection()); + assertEquals("id", ((Sort)sorts.get(0)).getSortExpression()); + assertEquals(SortDirection.DESCENDING, ((Sort)sorts.get(1)).getDirection()); + assertEquals("name", ((Sort)sorts.get(1)).getSortExpression()); DataGridURLBuilder urlBuilder = DataGridTestUtil.createDataGridURLBuilder(_servletRequest, GRID_NAME); Map queryParams = urlBuilder.getQueryParams(); @@ -311,4 +311,4 @@ public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } -} \ No newline at end of file +}
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/ServletHandler.java Mon Apr 11 23:42:11 2005 @@ -54,7 +54,7 @@ } else if(method.getName().equals("toString")) return ""; else if(method.getName().equals("isSecure")) - return false; + return Boolean.FALSE; else throw new UnsupportedOperationException("Can not invoke method (" + method + "); this proxy does not support the method."); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java Mon Apr 11 23:42:11 2005 @@ -64,7 +64,7 @@ Map map = (Map)iterator.next(); assertNotNull(map); assertEquals("bob", map.get("name")); - assertEquals(1, map.get("id")); + assertEquals(new Integer(1), map.get("id")); assertTrue(iterator.hasNext()); int rowCount = 1; @@ -75,7 +75,7 @@ assertNotNull(map); assertEquals("harry", map.get("name")); - assertEquals(6, map.get("id")); + assertEquals(new Integer(6), map.get("id")); assertFalse(iterator.hasNext()); assertEquals(6, rowCount); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/ResultSetTestSupport.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/ResultSetTestSupport.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/ResultSetTestSupport.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/ResultSetTestSupport.java Mon Apr 11 23:42:11 2005 @@ -48,7 +48,7 @@ static class MockResultSet implements InvocationHandler { - private static List<CustomerBean> DATA = new ArrayList<CustomerBean>(); + private static List/*<CustomerBean>*/ DATA = new ArrayList/*<CustomerBean>*/(); static { DATA.add(new CustomerBean(1, "bob")); @@ -69,21 +69,21 @@ if (methodName.equals("getMetaData")) return _rsmd; else if(methodName.equals("isLast")) - return _row+1 == DATA.size(); + return Boolean.valueOf(_row+1 == DATA.size()); else if(methodName.equals("wasNull")) - return false; + return Boolean.FALSE; else if(methodName.equals("getObject")) { - int col = (Integer)args[0]; + int col = ((Integer)args[0]).intValue(); /* the order of the indices here must match the order of the COLUMN_NAMES in the metadata */ if(col == 1) - return DATA.get(_row).getName(); + return ((CustomerBean)DATA.get(_row)).getName(); else if(col == 2) - return DATA.get(_row).getId(); + return ((CustomerBean)DATA.get(_row)).getId(); else throw new SQLException("Invalid column value \"" + col + "\""); } else if(methodName.equals("next")) { _row++; - return _row < DATA.size(); + return Boolean.valueOf(_row < DATA.size()); } else throw new UnsupportedOperationException("Can not invoke the method \"" + methodName + "\" as it is not supported"); } @@ -102,9 +102,9 @@ String methodName = method.getName(); if (methodName.equals("getColumnCount")) - return COLUMN_COUNT; + return new Integer(COLUMN_COUNT); else if(methodName.equals("getColumnName")) { - int col = (Integer)args[0]; + int col = ((Integer)args[0]).intValue(); return COLUMN_NAMES[col-1]; } else throw new UnsupportedOperationException("Can not invoke the method \"" + methodName + "\" as it is not supported"); Modified: incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml (original) +++ incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Mon Apr 11 23:42:11 2005 @@ -30,7 +30,8 @@ classpathref="module.classpath" debug="${compile.debug}" deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> + optimize="${compile.optimize}" + source="1.4"> <include name="**/*.java"/> </javac> Added: incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml?view=auto&rev=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml Mon Apr 11 23:42:11 2005 @@ -0,0 +1,196 @@ +<?xml version="1.0"?> + +<project name="Beehive/NetUI/Tests-JDK1.4" default="bvt" basedir="."> + + <property name="required.jdk.version" value="1.4"/> + <import file="../../ant/webapp-imports.xml"/> + + <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="${app.dir}/drt/${webapp.name}"/> + <property name="jdk14.temp.dir" value="${app.dir}/drt/temp-jdk14"/> + <property name="temp.webapp.dir" value="${jdk14.temp.dir}/${webapp.name}"/> + + <target name="build" description="build the webapp under JDK 1.4"> + <!-- check for JDK 1.4 --> + <condition property="java.version.correct"> + <equals arg1="${ant.java.version}" arg2="1.4"/> + </condition> + <fail unless="java.version.correct" message="Java version 1.4 (no earlier or later) is required."/> + + <!-- delete and recreate the temp directory --> + <delete dir="${jdk14.temp.dir}" failonerror="true"/> + <mkdir dir="${jdk14.temp.dir}"/> + <mkdir dir="${temp.webapp.dir}"/> + + <!-- copy the XDoclet compiler (and XDoclet/XJavaDoc) into a lib directory in the temp directory --> + <property name="compiler.lib.dir" value="${jdk14.temp.dir}/compiler-lib"/> + <mkdir dir="${compiler.lib.dir}"/> + <copy todir="${compiler.lib.dir}" file="${build.lib.dir}/${compiler-xdoclet.jar.name}"/> + <copy todir="${compiler.lib.dir}" file="${xdoclet.jar}"/> + <copy todir="${compiler.lib.dir}" file="${xjavadoc.jar}"/> + + <!-- deploy netui into the temp webapp --> + <ant antfile="${test.dir}/ant/buildWebapp.xml" target="deploy.netui" inheritAll="false"> + <property name="webapp.dir" location="${temp.webapp.dir}"/> + <property name="include.testrecorder" value="true"/> + <property name="testRecorder.config.name" value="${testRecorder.config.name}"/> + <property name="test.file" location="${app.dir}/drt/testRecorder/config/testRecorder-tests.xml"/> + <property name="config.file" location="${app.dir}/drt/testRecorder/config/testRecorder-config.xml"/> + <property name="webapp.file" location="${app.dir}/drt/testRecorder/config/testRecorder-webapp.xml"/> + <property name="struts.version" value="1.2"/> + <property name="required.jdk.version" value="${required.jdk.version}"/> + </ant> + + <!-- delete controls.jar and beehive-netui-pageflow.jar, and add beehive-netui-pageflow-jdk14.jar --> + <delete file="${temp.webapp.dir}/WEB-INF/lib/controls.jar"/> + <delete file="${temp.webapp.dir}/WEB-INF/lib/${pageflow.jar.name}"/> + <!-- TODO: need a constant for the pageflow-jdk14 jar --> + <copy file="${build.lib.dir}/beehive-netui-pageflow-jdk14.jar" todir="${temp.webapp.dir}/WEB-INF/lib"/> + + <!-- copy files from coreWeb, and translate annotations into XDoclet tags --> + <antcall target="copy.webapp"/> + + <!-- build the webapp, using the XDoclet compiler --> + <ant antfile="${build.lib.dir}/pageflow-webapp-build-xdoclet.xml" target="clean" inheritAll="false"> + <property name="webapp.dir" location="${temp.webapp.dir}"/> + <property name="compiler.lib.dir" location="${compiler.lib.dir}"/> + </ant> + <ant antfile="${build.lib.dir}/pageflow-webapp-build-xdoclet.xml" target="build" inheritAll="false"> + <property name="webapp.dir" location="${temp.webapp.dir}"/> + <property name="compiler.lib.dir" location="${compiler.lib.dir}"/> + </ant> + </target> + + <target name="copy.webapp" description="copy files from coreWeb, and translate annotations into XDoclet tags"> + <taskdef name="annotations-to-xdoclet" classname="org.apache.beehive.netui.compiler.xdoclet.tools.AnnotationsToXDocletTask" classpath="${compiler.lib.dir}/${compiler-xdoclet.jar.name}"/> + + <copy todir="${temp.webapp.dir}" failonerror="true"> + <fileset dir="${webapp.dir}"> + <include name="**/*.css"/> + <include name="**/*.db"/> + <include name="**/*.gif"/> + <include name="**/*.html"/> + <include name="**/*.inc"/> + <include name="**/*.jcs"/> + <include name="**/*.jpg"/> + <include name="**/*.js"/> + <include name="**/*.jsp"/> + <include name="**/*.jspf"/> + <include name="**/*.properties"/> + <include name="**/*.tag"/> + <include name="**/*.tld"/> + <include name="**/*.txt"/> + <include name="**/*.xml"/> + <include name="**/*.xsd"/> + <include name="**/*.xsdconfig"/> + </fileset> + </copy> + + <annotations-to-xdoclet todir="${temp.webapp.dir}" overwrite="true"> + <fileset dir="${webapp.dir}"> + <include name="**/*.jpf"/> + <include name="**/*.jpfs"/> + <include name="**/*.java"/> + <include name="**/Global.app"/> + <exclude name="WEB-INF/.pageflow-struts-generated/**"/> + <exclude name="WEB-INF/.tmpbeansrc/**"/> + <exclude name="WEB-INF/classes/**"/> + <exclude name="**/miniTests/generics/**"/> + <exclude name="**/databinding/datagrid/controls/**"/> + <exclude name="**/databinding/controls/**"/> + <exclude name="**/pageFlowCore/inheritControls/**"/> + <exclude name="**/xmlbeans/**"/> + <exclude name="**/xmlBeans/**"/> + </fileset> + </annotations-to-xdoclet> + + </target> + + <target name="bvt.running" description="Playback the bvt suite to a running server"> + <ant antfile="${test.dir}/ant/testRecorder.xml" target="suite.callback" inheritAll="false"> + <property name="suite.name" value="bvt"/> + <property name="playback.webapps" value="${webapp.name}"/> + <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <property name="required.jdk.version" value="${required.jdk.version}"/> + </ant> + </target> + + <target name="bvt" depends="build" description="Run the bvt suite with full server start / stop support."> + <ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> + <property name="app.build.file" location="${app.dir}/drt/bvt-jdk14.xml"/> + <property name="waitfor.url" value="${server.root.url}"/> + <property name="suite.name" value="bvt"/> + <property name="playback.webapps" value="${webapp.name}"/> + <property name="drt.mode" value="true"/> + <property name="required.jdk.version" value="${required.jdk.version}"/> + </ant> + </target> + + <target name="start" description="Start server with asserts enabled for org.apache.beehive.netui"> + <start-server shmem="false" javaOptions="-ea:org.apache.beehive.netui..."/> + </target> + + <target name="stop" description="Stop server"> + <stop-server/> + </target> + + + <!-- todo: this needs to compost down into buildWebapp.xml; until we're sure it works, it stays here --> + <target name="ensure.deployed" description="Deploy webapp for the test recorder"> + <echo>Ensuring that the webapp ${webapp.name} is deployed on a running server at the url ${webapp.waitfor.url}</echo> + + <waitfor maxwait="5" maxwaitunit="second" timeoutproperty="unavailable"> + <http url="${webapp.waitfor.url}"/> + </waitfor> + <antcall target="do.deploy"/> + <antcall target="do.redeploy"/> + <fail if="still.unavailable" message="Couldn't find webapp with path ${webapp.waitfor.url}"/> + </target> + + <target name="do.deploy" if="unavailable"> + <echo>Webapp is not deployed; deploying</echo> + + <antcall target="deploy"/> + <echo>...deploy complete</echo> + + <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable"> + <http url="${webapp.waitfor.url}"/> + </waitfor> + </target> + + <target name="do.redeploy" unless="unavailable"> + <echo>Webapp is deployed; undeploy and redeploy</echo> + + <antcall target="undeploy"/> + <echo>...undeploy complete</echo> + + <antcall target="deploy"/> + <echo>...deploy complete</echo> + + <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable"> + <http url="${webapp.waitfor.url}"/> + </waitfor> + </target> + + <!-- ================================================================ --> + <!-- --> + <!-- Targets for deploying the webapp on a server --> + <!-- --> + <!-- ================================================================ --> + <target name="deploy" description="Deploy webapp"> + <deploy-webapp webappDir="${temp.webapp.dir}" contextPath="${webapp.name}"/> + </target> + + <target name="undeploy" description="Undeploy webapp"> + <undeploy-webapp contextPath="${webapp.name}"/> + </target> + + <target name="redeploy" description="Redeploy webapp"> + <redeploy-webapp contextPath="${webapp.name}"/> + </target> + + +</project> Propchange: incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java Mon Apr 11 23:42:11 2005 @@ -28,10 +28,10 @@ protected static void addMessage( ActionInterceptorContext context, String msg ) { - ArrayList< String > messages = ( ArrayList< String > ) context.getRequest().getAttribute( "messages" ); + ArrayList messages = ( ArrayList ) context.getRequest().getAttribute( "messages" ); if ( messages == null ) { - messages = new ArrayList< String >(); + messages = new ArrayList(); context.getRequest().setAttribute( "messages", messages ); } messages.add( msg ); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -15,7 +15,7 @@ { protected void beforeAction() { - ArrayList< String > messages = ( ArrayList< String > ) getRequest().getAttribute( "messages" ); + ArrayList messages = ( ArrayList ) getRequest().getAttribute( "messages" ); if ( messages != null ) messages.add( "in action " + getCurrentActionName() ); } } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -4,9 +4,6 @@ import org.apache.beehive.netui.pageflow.annotations.*; @Jpf.Controller( - simpleActions={ - @Jpf.SimpleAction(name="begin", path="index.jsp") - }, catches={ @Jpf.Catch(type=Controller.Exception1.class, path="catchPage.jsp", message="${pageFlow.message1}"), @Jpf.Catch(type=Controller.Exception2.class, path="catchPage.jsp", message="${pageFlow.message1}", messageKey="foo"), @@ -17,6 +14,9 @@ }, messageBundles={ @Jpf.MessageBundle(bundlePath="miniTests.exceptionMessages.Messages") + }, + simpleActions={ + @Jpf.SimpleAction(name="begin", path="index.jsp") } ) public class Controller extends PageFlowController Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlePageException/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlePageException/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlePageException/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlePageException/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -4,11 +4,11 @@ import org.apache.beehive.netui.pageflow.annotations.*; @Jpf.Controller( - simpleActions={ - @Jpf.SimpleAction(name="begin", path="index.jsp") - }, catches={ @Jpf.Catch(type=Exception.class, path="error.jsp") + }, + simpleActions={ + @Jpf.SimpleAction(name="begin", path="index.jsp") } ) public class Controller extends PageFlowController Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlers/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlers/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlers/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/handlers/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -43,41 +43,41 @@ public ActionForward doForward( FlowControllerHandlerContext context, ActionForward fwd, ActionMapping mapping, String actionName, ModuleConfig altModuleConfig, ActionForm form ) { - return getPreviousHandler().doForward( context, fwd, mapping, actionName, altModuleConfig, form ); + return getPreviousActionForwardHandler().doForward( context, fwd, mapping, actionName, altModuleConfig, form ); } public ActionForward doAutoViewRender( FlowControllerHandlerContext context, ActionMapping mapping, ActionForm form ) { - return getPreviousHandler().doAutoViewRender( context, mapping, form ); + return getPreviousActionForwardHandler().doAutoViewRender( context, mapping, form ); } public ActionForward doReturnToPage( FlowControllerHandlerContext context, PreviousPageInfo prevPageInfo, PageFlowController currentPageFlow, ActionForm currentForm, String actionName, Forward pageFlowFwd ) { - return getPreviousHandler().doReturnToPage( context, prevPageInfo, currentPageFlow, currentForm, actionName, pageFlowFwd ); + return getPreviousActionForwardHandler().doReturnToPage( context, prevPageInfo, currentPageFlow, currentForm, actionName, pageFlowFwd ); } public ActionForward doReturnToAction( FlowControllerHandlerContext context, String actionName, Forward pageFlowFwd ) { - return getPreviousHandler().doReturnToAction( context, actionName, pageFlowFwd ); + return getPreviousActionForwardHandler().doReturnToAction( context, actionName, pageFlowFwd ); } public ActionForward doNestingReturn( FlowControllerHandlerContext context, Forward pageFlowFwd, ActionMapping mapping, ActionForm form ) { - return getPreviousHandler().doNestingReturn( context, pageFlowFwd, mapping, form ); + return getPreviousActionForwardHandler().doNestingReturn( context, pageFlowFwd, mapping, form ); } public ActionForward handleInterceptorReturn( FlowControllerHandlerContext context, PageFlowController poppedPageFlow, PageFlowStack.PushedPageFlow pushedPageFlowWrapper, String returnAction, ActionMapping actionMapping, ActionForm form, ActionInterceptor interceptor ) { - return getPreviousHandler().handleInterceptorReturn( context, poppedPageFlow, pushedPageFlowWrapper, returnAction, + return getPreviousActionForwardHandler().handleInterceptorReturn( context, poppedPageFlow, pushedPageFlowWrapper, returnAction, actionMapping, form, interceptor ); } - protected ActionForwardHandler getPreviousHandler() + protected ActionForwardHandler getPreviousActionForwardHandler() { return ( ActionForwardHandler ) super.getPreviousHandler(); } @@ -96,25 +96,25 @@ ActionForm form ) throws IOException, ServletException { - return getPreviousHandler().handleException( context, ex, actionMapping, form ); + return getPreviousExceptionsHandler().handleException( context, ex, actionMapping, form ); } public Throwable unwrapException( FlowControllerHandlerContext context, Throwable ex ) { - return getPreviousHandler().unwrapException( context, ex ); + return getPreviousExceptionsHandler().unwrapException( context, ex ); } public void exposeException( FlowControllerHandlerContext context, Throwable ex, ActionMapping actionMapping ) { - getPreviousHandler().exposeException( context, ex, actionMapping ); + getPreviousExceptionsHandler().exposeException( context, ex, actionMapping ); } public boolean eatUnhandledException( FlowControllerHandlerContext context, Throwable ex ) { - return getPreviousHandler().eatUnhandledException( context, ex ); + return getPreviousExceptionsHandler().eatUnhandledException( context, ex ); } - protected ExceptionsHandler getPreviousHandler() + protected ExceptionsHandler getPreviousExceptionsHandler() { return ( ExceptionsHandler ) super.getPreviousHandler(); } @@ -132,25 +132,25 @@ public void login( FlowControllerHandlerContext context, String username, String password ) throws LoginException { - getPreviousHandler().login( context, username, password ); + getPreviousLoginHandler().login( context, username, password ); } public void logout( FlowControllerHandlerContext context, boolean invalidateSessions ) { - getPreviousHandler().logout( context, invalidateSessions ); + getPreviousLoginHandler().logout( context, invalidateSessions ); } public boolean isUserInRole( FlowControllerHandlerContext context, String roleName ) { - return getPreviousHandler().isUserInRole( context, roleName ); + return getPreviousLoginHandler().isUserInRole( context, roleName ); } public Principal getUserPrincipal( FlowControllerHandlerContext context ) { - return getPreviousHandler().getUserPrincipal( context ); + return getPreviousLoginHandler().getUserPrincipal( context ); } - protected LoginHandler getPreviousHandler() + protected LoginHandler getPreviousLoginHandler() { return ( LoginHandler ) super.getPreviousHandler(); } @@ -166,7 +166,7 @@ public boolean isUserInRole( FlowControllerHandlerContext context, String roleName ) { if ( roleName.equals( "HandlersTest" ) ) return true; - return getPreviousHandler().isUserInRole( context, roleName ); + return getPreviousLoginHandler().isUserInRole( context, roleName ); } public Principal getUserPrincipal( FlowControllerHandlerContext context ) @@ -176,7 +176,7 @@ return new Principal(){ public String getName() { return "handler-temp-user"; } }; } - return getPreviousHandler().getUserPrincipal( context ); + return getPreviousLoginHandler().getUserPrincipal( context ); } public String toString() Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/validation.jsp Mon Apr 11 23:42:11 2005 @@ -17,8 +17,8 @@ PageFlowUtils.addValidationError( "b", "msg2", "arg1", request ); Object[] args = new Object[]{ "arg1", "arg2", "arg3" }; PageFlowUtils.addValidationError( "c", "msg3", args, request ); - PageFlowUtils.addActionError( request, "d", "msg3", "arg1", "arg2", "arg3" ); - PageFlowUtils.addActionErrorExpression( request, "e", "The page flow is ${pageFlow.URI}. Some args are: {0}, {1}, {2}.", "arg1", "arg2", "arg3" ); + PageFlowUtils.addActionError( request, "d", "msg3", new Object[]{ "arg1", "arg2", "arg3" } ); + PageFlowUtils.addActionErrorExpression( request, "e", "The page flow is ${pageFlow.URI}. Some args are: {0}, {1}, {2}.", new Object[]{ "arg1", "arg2", "arg3" } ); %> Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -4,12 +4,12 @@ import org.apache.beehive.netui.pageflow.annotations.*; @Jpf.Controller( + catches={ + @Jpf.Catch(type=DoubleSubmitException.class, path="caughtit.jsp") + }, simpleActions={ @Jpf.SimpleAction(name="begin", path="index.jsp"), @Jpf.SimpleAction(name="anchorSubmit", preventDoubleSubmit=true, path="submitted.jsp") - }, - catches={ - @Jpf.Catch(type=DoubleSubmitException.class, path="caughtit.jsp") } ) public class Controller extends PageFlowController Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -23,16 +23,16 @@ import org.apache.beehive.netui.pageflow.PageFlowController; import org.apache.beehive.netui.pageflow.Forward; +// Note: normally, a tiles definitions config file would go in WEB-INF. +// It's here (tiles-defs.xml) to encapsulate the test. @Jpf.Controller( - // Note: normally, a tiles definitions config file would go in WEB-INF. - // It's here to encapsulate the test. tilesDefinitionsConfigs = { "/miniTests/tiles/tiles-defs.xml" }, simpleActions={ @Jpf.SimpleAction(name="begin", tilesDefinition="defaultPage") }) public class Controller extends PageFlowController { - protected StringBuilder _sb = new StringBuilder(); + protected StringBuffer _sb = new StringBuffer(); public String getResults() { return _sb.toString(); @@ -136,7 +136,7 @@ protected void doWork() { - _sb = new StringBuilder(); + _sb = new StringBuffer(); HttpServletRequest req = getRequest(); _sb.append("Request URI: " + req.getRequestURI()); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -46,6 +46,11 @@ } + /** + * This action forwards to the nested page flow to gather the zip. Note that it takes a + * SubmitForm so we can update the form with the zip code in [EMAIL PROTECTED] #zipSuccess}, but we've + * explicitly turned validation off for this action, since the form may be incomplete. + */ @Jpf.Action( forwards={ @Jpf.Forward( @@ -55,11 +60,6 @@ }, doValidation=false ) - /** - * This action forwards to the nested page flow to gather the zip. Note that it takes a - * SubmitForm so we can update the form with the zip code in [EMAIL PROTECTED] #zipSuccess}, but we've - * explicitly turned validation off for this action, since the form may be incomplete. - */ protected Forward getZip(SubmitForm form) { return new Forward("getZipFlow"); @@ -102,7 +102,7 @@ /** * For performance reasons, getPreviousFormBean() (used in [EMAIL PROTECTED] #zipSuccess}) will not - * be enabled unless we use <code>@Jpf.NavigateTo.previousAction</code> in this page flow + * be enabled unless we use <code>Jpf.NavigateTo.previousAction</code> in this page flow * flow, <i>or</i> we provide this override. So here we provide the override. */ protected boolean alwaysTrackPreviousAction() @@ -142,4 +142,4 @@ "<pageflow-object id='forward:[EMAIL PROTECTED]:zipSuccess.do#java.lang.String@'><property name='elbowsX' value='157,170,170,183'/><property name='elbowsY' value='312,312,192,192'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>", "</view-properties>" }) -interface VIEW_PROPERTIES { } \ No newline at end of file +interface VIEW_PROPERTIES { } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/Super1.jpf Mon Apr 11 23:42:11 2005 @@ -5,11 +5,11 @@ import pageFlowCore.inheritance.super0.Super0; // in WEB-INF/src @Jpf.Controller( - simpleActions={ - @Jpf.SimpleAction(name="simpleAction1", path="index.jsp") - }, catches={ @Jpf.Catch(type=Super1.Ex.class, method="handleEx") + }, + simpleActions={ + @Jpf.SimpleAction(name="simpleAction1", path="index.jsp") } ) public class Super1 extends Super0 Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/PageInputController.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/PageInputController.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/PageInputController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/PageInputController.jpf Mon Apr 11 23:42:11 2005 @@ -158,7 +158,7 @@ @Jpf.Forward( name = "success", actionOutputs={ - @Jpf.ActionOutput(name="pi1", type=Serializable.class), // an interface + @Jpf.ActionOutput(name="pi1", type=Serializable.class), @Jpf.ActionOutput(name="pi2", type=String[].class), @Jpf.ActionOutput(name="pi3", type=String[][].class) }, Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -81,7 +81,7 @@ private String getRoundTripData(String encoding) { - StringBuilder result = new StringBuilder(); + StringBuffer result = new StringBuffer(); String name = "foo"; String value = getRequest().getParameter(name); if (value == null) return result.toString(); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/xhtml/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/xhtml/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/xhtml/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/xhtml/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -30,7 +30,7 @@ private String _hiddenIn = "hidden input"; private String[] _selectOptions = {"Select One", "Select Two", "Select Three"}; private String _selectedValue; - private String _hiddenValue;; + private String _hiddenValue; private String _search; public String getHiddenIn() { Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -37,7 +37,7 @@ ) public class Controller extends PageFlowController { - protected StringBuilder _sb = new StringBuilder(); + protected StringBuffer _sb = new StringBuffer(); public String getResults() { return _sb.toString(); @@ -81,7 +81,7 @@ protected void doWork(String msg) { - _sb = new StringBuilder(msg); + _sb = new StringBuffer(msg); _sb.append("\n"); HttpServletRequest req = getRequest(); _sb.append("Request URI: " + req.getRequestURI()); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/nested/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/nested/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/nested/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tiles/pf/nested/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -33,7 +33,7 @@ ) public class Controller extends PageFlowController { - StringBuilder _sb = new StringBuilder(); + StringBuffer _sb = new StringBuffer(); public String getResults() { return _sb.toString(); @@ -47,7 +47,7 @@ }) public Forward begin() { - _sb = new StringBuilder(); + _sb = new StringBuffer(); return new Forward("begin"); } @@ -89,7 +89,7 @@ private void doWork(String msg) { - _sb = new StringBuilder(msg); + _sb = new StringBuffer(msg); _sb.append("\n"); HttpServletRequest req = getRequest(); _sb.append("Request URI: " + req.getRequestURI()); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -28,9 +28,9 @@ getRequest().setAttribute( "requestMessage", "a message in the request with two arguments: {0} and {1}" ); getSession().setAttribute( "sessionMessage", "a message in the session" ); - addActionErrorExpression( "prop1", "${pageFlow.pageFlowMessage}" ); - addActionErrorExpression( "prop2", "${requestScope.requestMessage}", "ARG1", "ARG2" ); - addActionErrorExpression( "prop3", "${sessionScope.sessionMessage}" ); + addActionErrorExpression( "prop1", "${pageFlow.pageFlowMessage}", null ); + addActionErrorExpression( "prop2", "${requestScope.requestMessage}", new Object[]{ "ARG1", "ARG2" } ); + addActionErrorExpression( "prop3", "${sessionScope.sessionMessage}", null ); return new Forward( "index" ); } @@ -54,9 +54,9 @@ { public void validate( ActionMapping mapping, HttpServletRequest request, ActionMessages errors ) { - errors.add( "prop4", new ExpressionMessage( "explicit string" ) ); - errors.add( "prop5", new ExpressionMessage( "${bundle.default.bundleMessage}" ) ); - errors.add( "prop6", new ExpressionMessage( "${sharedFlow.sf.sharedFlowMessage}" ) ); + errors.add( "prop4", new ExpressionMessage( "explicit string", null ) ); + errors.add( "prop5", new ExpressionMessage( "${bundle.default.bundleMessage}", null ) ); + errors.add( "prop6", new ExpressionMessage( "${sharedFlow.sf.sharedFlowMessage}", null ) ); // The following is just to make sure that the "sessionMessage" string doesn't get left // hanging around in the session while the other tests run. Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/argExpressions/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/argExpressions/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/argExpressions/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/argExpressions/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -53,8 +53,8 @@ { public void validate( ActionMapping mapping, HttpServletRequest request, ActionMessages errors ) { - errors.add( "foo", new ExpressionMessage( "(Form1) this is arg 0: {0}", "${pageFlow.arg0}" ) ); - errors.add( "bar", new ExpressionMessage( "(Form1) ${pageFlow.message}", "${pageFlow.arg0}", "${pageFlow.arg1}" ) ); + errors.add( "foo", new ExpressionMessage( "(Form1) this is arg 0: {0}", new Object[]{ "${pageFlow.arg0}" } ) ); + errors.add( "bar", new ExpressionMessage( "(Form1) ${pageFlow.message}", new Object[]{ "${pageFlow.arg0}", "${pageFlow.arg1}" } ) ); } } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/custom/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -13,10 +13,10 @@ @Jpf.SimpleAction(name="begin", path="index.jsp") }, customValidatorConfigs={ - // Note: normally, this file would go in WEB-INF. It's here to encapsulate the test. "/validation/custom/customrules.xml" } ) +// Note: normally, the customrules.xml file would go in WEB-INF. It's here to encapsulate the test. public class Controller extends PageFlowController { @Jpf.Action( @@ -34,14 +34,13 @@ { private String _val; + // for internationalization, use 'displayNameKey', or an expression in 'displayName' @Jpf.ValidatableProperty( - // for internationalization, use 'displayNameKey', or an expression in 'displayName' displayName="The value", [EMAIL PROTECTED](), validateCustomRules={ @Jpf.ValidateCustomRule( rule="customRuleDivisibleBy", - // for internationalization, use 'messageKey', or an expression in 'message' message="{0} must be divisible by {1}.", [EMAIL PROTECTED](name="factor", value="3")} ), Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/Controller.jpf?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/declarativeValidation/Controller.jpf Mon Apr 11 23:42:11 2005 @@ -114,9 +114,9 @@ return _str; } - public Map< String, String > getActionChoices() + public Map getActionChoices() { - HashMap< String, String > ret = new HashMap< String, String >(); + HashMap ret = new HashMap(); ret.put( "formLevelValidate", "form-level validation" ); ret.put( "actionLevelValidate", "action-level validation" ); ret.put( "classLevelValidate", "class-level validation" );
