Author: rich Date: Fri Jan 21 14:31:12 2005 New Revision: 125975 URL: http://svn.apache.org/viewcvs?view=rev&rev=125975 Log: Fixed the webapp build to support page flows as .java files in WEB-INF/src, and added a BVT for this.
DRT/BVT: netui (WinXP) BB: self (linux) Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/webinfSrcDotJava/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java (contents, props changed) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp (contents, props changed) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/next.jsp (contents, props changed) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml (contents, props changed) Modified: incubator/beehive/trunk/ant/buildWebappCore.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Modified: incubator/beehive/trunk/ant/buildWebappCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/buildWebappCore.xml?view=diff&rev=125975&p1=incubator/beehive/trunk/ant/buildWebappCore.xml&r1=125974&p2=incubator/beehive/trunk/ant/buildWebappCore.xml&r2=125975 ============================================================================== --- incubator/beehive/trunk/ant/buildWebappCore.xml (original) +++ incubator/beehive/trunk/ant/buildWebappCore.xml Fri Jan 21 14:31:12 2005 @@ -78,7 +78,7 @@ destdir="@{destDir}" gendir="@{tmpDir}" classpathref="pageflow.build.classpath" - srcExtensions="*.jpf,*.jpfs,*.app,*.jsfb" + srcExtensions="*.jpf,*.jpfs,*.app,*.jsfb,*.java" debug="true"/> </sequential> </macrodef> Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java?view=auto&rev=125975 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/webinfSrcDotJava/Controller.java Fri Jan 21 14:31:12 2005 @@ -0,0 +1,31 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package miniTests.webinfSrcDotJava; + +import org.apache.beehive.netui.pageflow.PageFlowController; +import org.apache.beehive.netui.pageflow.annotations.Jpf; + [EMAIL PROTECTED]( + simpleActions={ + @Jpf.SimpleAction(name="begin", path="index.jsp"), + @Jpf.SimpleAction(name="next", path="next.jsp") + } +) +public class Controller extends PageFlowController +{ +} Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp?view=auto&rev=125975 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/index.jsp Fri Jan 21 14:31:12 2005 @@ -0,0 +1,16 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%> +<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%> +<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%> + +<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). + <br/> + <br/> + <netui:anchor action="next">next</netui:anchor> + <br> + </body> +</netui:html> + + Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/next.jsp Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/next.jsp?view=auto&rev=125975 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrcDotJava/next.jsp Fri Jan 21 14:31:12 2005 @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%> +<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%> +<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%> + +<netui:html> + <body> + Success. + </body> +</netui:html> + + Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&rev=125975&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r1=125974&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r2=125975 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Fri Jan 21 14:31:12 2005 @@ -6338,6 +6338,19 @@ </features> </test> <test> + <name>WebinfSrcDotJava</name> + <description>Test of a page flow as a .java file in WEB-INF/src.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>PageFlow</feature> + </features> + </test> + <test> <name>WelcomeFile</name> <description>Test of hitting a page flow directory, when the page flow is registered in web.xml as a welcome-file.</description> <webapp>coreWeb</webapp> Added: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml?view=auto&rev=125975 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/WebinfSrcDotJava.xml Fri Jan 21 14:31:12 2005 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> + <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:tests> + <ses:test> + <ses:testNumber>1</ses:testNumber> + <ses:request> + <ses:protocol>HTTP</ses:protocol> + <ses:protocolVersion>1.1</ses:protocolVersion> + <ses:host>localhost</ses:host> + <ses:port>8080</ses:port> + <ses:uri>/coreWeb/miniTests/webinfSrcDotJava/Controller.jpf</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>48C13F50F90C930800BBD232CF122BCA</ses:value> + </ses:cookie> + </ses:cookies> + <ses:headers> + <ses:header> + <ses:name>accept</ses:name> + <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-charset</ses:name> + <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-encoding</ses:name> + <ses:value>gzip,deflate</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-language</ses:name> + <ses:value>en-us,en;q=0.5</ses:value> + </ses:header> + <ses:header> + <ses:name>connection</ses:name> + <ses:value>keep-alive</ses:value> + </ses:header> + <ses:header> + <ses:name>cookie</ses:name> + <ses:value>JSESSIONID=48C13F50F90C930800BBD232CF122BCA</ses:value> + </ses:header> + <ses:header> + <ses:name>host</ses:name> + <ses:value>localhost:8080</ses:value> + </ses:header> + <ses:header> + <ses:name>keep-alive</ses:name> + <ses:value>300</ses:value> + </ses:header> + <ses:header> + <ses:name>user-agent</ses:name> + <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<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). + <br/> + <br/> + <a href="/coreWeb/miniTests/webinfSrcDotJava/next.do">next</a> + <br> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>2</ses:testNumber> + <ses:request> + <ses:protocol>HTTP</ses:protocol> + <ses:protocolVersion>1.1</ses:protocolVersion> + <ses:host>localhost</ses:host> + <ses:port>8080</ses:port> + <ses:uri>/coreWeb/miniTests/webinfSrcDotJava/next.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>48C13F50F90C930800BBD232CF122BCA</ses:value> + </ses:cookie> + </ses:cookies> + <ses:headers> + <ses:header> + <ses:name>accept</ses:name> + <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-charset</ses:name> + <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-encoding</ses:name> + <ses:value>gzip,deflate</ses:value> + </ses:header> + <ses:header> + <ses:name>accept-language</ses:name> + <ses:value>en-us,en;q=0.5</ses:value> + </ses:header> + <ses:header> + <ses:name>connection</ses:name> + <ses:value>keep-alive</ses:value> + </ses:header> + <ses:header> + <ses:name>cookie</ses:name> + <ses:value>JSESSIONID=48C13F50F90C930800BBD232CF122BCA</ses:value> + </ses:header> + <ses:header> + <ses:name>host</ses:name> + <ses:value>localhost:8080</ses:value> + </ses:header> + <ses:header> + <ses:name>keep-alive</ses:name> + <ses:value>300</ses:value> + </ses:header> + <ses:header> + <ses:name>referer</ses:name> + <ses:value>http://localhost:8080/coreWeb/miniTests/webinfSrcDotJava/Controller.jpf</ses:value> + </ses:header> + <ses:header> + <ses:name>user-agent</ses:name> + <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <body> + Success. + </body> + +</html></ses:responseBody> + </ses:response> + </ses:test> + </ses:tests> + <ses:endDate>21 Jan 2005, 03:26:27.116 PM MST</ses:endDate> + <ses:testCount>2</ses:testCount> +</ses:recorderSession>
