svn commit: r164185 [4/4] - in /incubator/beehive/trunk: ant/ netui/src/compiler-core/org/apache/beehive/netui/compiler/ netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/ netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/ netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/env/ netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/ netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/env/ netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ netui/test/conf/ netui/test/webapps/projectModel/ netui/test/webapps/projectModel/schemas/ netui/test/webapps/projectModel/src/ netui/test/webapps/projectModel/src/common/ netui/test/webapps/projectModel/testRecorder/ netui/test/webapps/projectModel/testRecorder/config/ netui/test/webapps/projectModel/testRecorder/tests/ netui/test/webapps/projectModel/webContent/ netui/test/webapps/projectModel/webContent/WEB-INF/ netui/test/webapps/projectModel/webContent/index/ netui/test/webapps/projectModel/webContent/smokeTest/ netui/test/webapps/projectModel/webSource/ netui/test/webapps/projectModel/webSource/index/ netui/test/webapps/projectModel/webSource/smokeTest/ netui/test/webapps/tomcat/testRecorder/tests/ samples/petstoreWeb/WEB-INF/src/ test/dist-test/ant/ user/netui-blank/

22 Apr 2005 07:42:20 -0000

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/testRecorder/tests/SmokeTest.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/testRecorder/tests/SmokeTest.xml?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/testRecorder/tests/SmokeTest.xml
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/testRecorder/tests/SmokeTest.xml
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession 
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+   <ses:sessionName>SmokeTest</ses:sessionName>
+   <ses:tester>rich</ses:tester>
+   <ses:startDate>22 Apr 2005, 12:02:21.214 AM MDT</ses:startDate>
+   <ses:description>Basic test of a page flow that depends on source/binary 
artifacts in other directories, namely, /src/common/strutsMerge.xml and 
/build/webOutput/WEB-INF/classes/common/MyForm.class.</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>/projectModelWeb/smokeTest/Controller.jpf</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>07D920CBE482D2B8B2625597F6342EB0</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=07D920CBE482D2B8B2625597F6342EB0</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.7) Gecko/20050414 Firefox/1.0.3</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"
+>
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/projectModelWeb/smokeTest/index.jsp";>
+    </head>
+    <body>
+        <h3>/smokeTest/Controller.jpf</h3>
+
+        <form action="/projectModelWeb/smokeTest/submit.do" method="post">
+            foo: <input type="text" name="{actionForm.foo}">
+            <br/>
+            <input type="submit" value="submit">
+        </form>
+        <br/>
+        <br/>
+        <a href="/projectModelWeb/smokeTest/commonMergeAction.do">hit an 
action in /src/common/strutsMerge.xml</a>
+    </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>/projectModelWeb/smokeTest/submit.do</ses:uri>
+            <ses:method>POST</ses:method>
+            <ses:parameters>
+               <ses:parameter>
+                  <ses:name>{actionForm.foo}</ses:name>
+                  <ses:value/>
+               </ses:parameter>
+            </ses:parameters>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>07D920CBE482D2B8B2625597F6342EB0</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>content-length</ses:name>
+                  <ses:value>21</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>content-type</ses:name>
+                  <ses:value>application/x-www-form-urlencoded</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  
<ses:value>JSESSIONID=07D920CBE482D2B8B2625597F6342EB0</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/projectModelWeb/smokeTest/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.7) Gecko/20050414 Firefox/1.0.3</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"
+>
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/projectModelWeb/smokeTest/index.jsp";>
+    </head>
+    <body>
+        <h3>/smokeTest/Controller.jpf</h3>
+
+        <form action="/projectModelWeb/smokeTest/submit.do" method="post">
+            foo: <input type="text" name="{actionForm.foo}">This field is 
required!
+
+            <br/>
+            <input type="submit" value="submit">
+        </form>
+        <br/>
+        <br/>
+        <a href="/projectModelWeb/smokeTest/commonMergeAction.do">hit an 
action in /src/common/strutsMerge.xml</a>
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>3</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>/projectModelWeb/smokeTest/submit.do</ses:uri>
+            <ses:method>POST</ses:method>
+            <ses:parameters>
+               <ses:parameter>
+                  <ses:name>{actionForm.foo}</ses:name>
+                  <ses:value>ok</ses:value>
+               </ses:parameter>
+            </ses:parameters>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>07D920CBE482D2B8B2625597F6342EB0</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>content-length</ses:name>
+                  <ses:value>23</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>content-type</ses:name>
+                  <ses:value>application/x-www-form-urlencoded</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  
<ses:value>JSESSIONID=07D920CBE482D2B8B2625597F6342EB0</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/projectModelWeb/smokeTest/submit.do</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.7) Gecko/20050414 Firefox/1.0.3</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"
+>
+<html lang="en">
+
+    <head>
+        <base 
href="http://localhost:8080/projectModelWeb/smokeTest/success.jsp";>
+    </head>
+    <body>
+        <h3>/smokeTest/Controller.jpf</h3>
+
+        Success!
+        <br/>
+        <br/>
+        <a href="/projectModelWeb/smokeTest/begin.do">start over</a>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>4</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>/projectModelWeb/smokeTest/begin.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>07D920CBE482D2B8B2625597F6342EB0</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=07D920CBE482D2B8B2625597F6342EB0</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/projectModelWeb/smokeTest/submit.do</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.7) Gecko/20050414 Firefox/1.0.3</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"
+>
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/projectModelWeb/smokeTest/index.jsp";>
+    </head>
+    <body>
+        <h3>/smokeTest/Controller.jpf</h3>
+
+        <form action="/projectModelWeb/smokeTest/submit.do" method="post">
+            foo: <input type="text" name="{actionForm.foo}">
+            <br/>
+            <input type="submit" value="submit">
+        </form>
+        <br/>
+        <br/>
+        <a href="/projectModelWeb/smokeTest/commonMergeAction.do">hit an 
action in /src/common/strutsMerge.xml</a>
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>5</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>/projectModelWeb/smokeTest/commonMergeAction.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>07D920CBE482D2B8B2625597F6342EB0</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=07D920CBE482D2B8B2625597F6342EB0</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/projectModelWeb/smokeTest/begin.do</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.7) Gecko/20050414 Firefox/1.0.3</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"
+>
+<html lang="en">
+
+    <head>
+        <base 
href="http://localhost:8080/projectModelWeb/smokeTest/success.jsp";>
+    </head>
+    <body>
+        <h3>/smokeTest/Controller.jpf</h3>
+
+        Success!
+        <br/>
+        <br/>
+        <a href="/projectModelWeb/smokeTest/begin.do">start over</a>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+   </ses:tests>
+   <ses:endDate>22 Apr 2005, 12:02:35.645 AM MDT</ses:endDate>
+   <ses:testCount>5</ses:testCount>
+</ses:recorderSession>

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/testRecorder/tests/SmokeTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/WEB-INF/web.xml?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/WEB-INF/web.xml
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/WEB-INF/web.xml
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+    version="2.4">
+
+  <!-- Test Recorder Filter -->
+  <filter>
+    <filter-name>TestRecorderFilter</filter-name>
+    
<filter-class>org.apache.beehive.netui.tools.testrecorder.server.TestRecorderFilter</filter-class>
+      <init-param>
+          <param-name>webapp</param-name>
+          <param-value>projectModelWeb</param-value>
+      </init-param>
+  </filter>
+
+  <filter>
+    <filter-name>PageFlowJspFilter</filter-name>
+    
<filter-class>org.apache.beehive.netui.pageflow.PageFlowJspFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>TestRecorderFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+      <filter-name>PageFlowJspFilter</filter-name>
+      <url-pattern>*.jsp</url-pattern>
+      <dispatcher>FORWARD</dispatcher>
+      <dispatcher>REQUEST</dispatcher>
+      <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+
+  <filter-mapping>
+      <filter-name>PageFlowJspFilter</filter-name>
+      <url-pattern>*.jspx</url-pattern>
+      <dispatcher>FORWARD</dispatcher>
+      <dispatcher>REQUEST</dispatcher>
+      <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+
+  <!-- Test Recorder Servlet (control channel) -->
+  <servlet>
+    <servlet-name>TestRecorderServlet</servlet-name>
+    
<servlet-class>org.apache.beehive.netui.tools.testrecorder.server.TestRecorderServlet</servlet-class>
+  </servlet>
+
+  <!-- Struts Action Servlet / PageFlowController Configuration (with 
debugging) -->
+  <servlet>
+    <servlet-name>action</servlet-name>
+    
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
+
+    <init-param>
+      <param-name>config</param-name>
+      
<param-value>/WEB-INF/.pageflow-struts-generated/jpf-struts-config.xml</param-value>
+    </init-param>
+
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
+
+  <!-- The XmlHttpRequest handler Servlet -->
+  <servlet>
+    <servlet-name>XmlHttpRequestServlet</servlet-name>
+    
<servlet-class>org.apache.beehive.netui.pageflow.xmlhttprequest.XmlHttpRequestServlet</servlet-class>
+  </servlet>
+
+  <!-- Struts Action Servlet Mapping -->
+
+  <!-- Note that because Struts takes the *last* mapping here as the extension 
to add to
+       actions posted from forms, we must have *.do come after *.jpf. -->
+  <servlet-mapping>
+    <servlet-name>action</servlet-name>
+    <url-pattern>*.jpf</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+  </servlet-mapping>
+
+  <!-- TestRecorder Control Servlet -->
+  <servlet-mapping>
+    <servlet-name>TestRecorderServlet</servlet-name>
+    <url-pattern>/testRecorder</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+  <error-page>
+    <error-code>500</error-code>
+    <location>/error.jsp</location>
+  </error-page>
+
+   <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>Secure PageFlow - all</web-resource-name>
+        <url-pattern>/security/secure.do</url-pattern>
+        <url-pattern>/security/back_secure.do</url-pattern>
+      </web-resource-collection>
+      <user-data-constraint>
+         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      </user-data-constraint>
+  </security-constraint>
+  <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>Unsecure PageFlow - begin</web-resource-name>
+        <url-pattern>/security/unsecure.do</url-pattern>
+        <url-pattern>/security/back_unsecure.do</url-pattern>
+      </web-resource-collection>
+      <user-data-constraint>
+         <transport-guarantee>NONE</transport-guarantee>
+      </user-data-constraint>
+  </security-constraint>
+
+  <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>for SecureLinks test</web-resource-name>
+        <url-pattern>/tags/secureLinks/secure/*</url-pattern>
+        
<url-pattern>/tags/secureLinks/linkToSecure/secureAction.do</url-pattern>
+      </web-resource-collection>
+      <user-data-constraint>
+         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      </user-data-constraint>
+  </security-constraint>
+  
+  <security-role>
+      <description>Test role for /miniTests/roles</description>
+      <role-name>GoodRole1</role-name>
+  </security-role>
+  <security-role>
+      <description>Test role for /miniTests/roles</description>
+      <role-name>GoodRole2</role-name>
+  </security-role>
+  <security-role>
+      <description>Test role for /miniTests/roles</description>
+      <role-name>BadRole</role-name>
+  </security-role>
+
+</web-app>

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index.jsp?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index.jsp 
(added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index.jsp 
Fri Apr 22 00:41:54 2005
@@ -0,0 +1,7 @@
+<html>
+<head>
+</head>
+<body>
+<jsp:forward page="index/Controller.jpf" />
+</body>
+</html>

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/Beehive.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/Beehive.gif?rev=164185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/Beehive.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/index.jsp?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/index.jsp
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/index.jsp
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,80 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0"; 
prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0"; 
prefix="netui-template"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<netui:html>
+    <head>
+        <title>Beehive NetUI Tests</title>
+        <netui:base/>
+        <link href="style.css" rel="stylesheet" type="text/css">
+        <style type="text/css">
+        .nameColumn {
+            width: 140pt;
+            vertical-align: top;
+            text-align: right;
+        }
+
+        .descrColumn {
+        }
+
+        .diffColumn {
+            width: 30pt;
+            text-align: center;
+            vertical-align: top;
+        }
+
+        .detailColumn {
+            width: 40pt;
+            text-align: center;
+            vertical-align: top;
+        }
+
+        </style>
+    </head>
+
+    <netui:body>
+    <div style="height:80px">
+        <netui:image style="z-index:1" src="Beehive.gif" />
+    <div class="title">Beehive NetUI Tests</div>
+    <div class="subTitle">${pageFlow.title}</div>
+    </div>
+    <hr>
+    <div id="navlist">
+    <ul>
+    <netui-data:repeater dataSource="pageFlow.categories">
+        <li><netui:anchor styleClass="${container.item.selection}" 
action="selectList">${container.item.description}
+            <netui:parameter name="target" value="${container.item.name}" />
+            </netui:anchor></li>
+     </netui-data:repeater>
+    </ul>
+    </div>
+    <div id="content">
+     <netui-data:repeater dataSource="pageFlow.tests">
+         <netui-data:repeaterHeader><table border='1px' 
cellspacing='0'></netui-data:repeaterHeader>
+         <netui-data:repeaterItem>
+             <tr class="${pageFlow.rowStyle}">
+             <td class="nameColumn"><netui:anchor 
href="/projectModelWeb/testRecorder?mode=displayLink">${container.item.name}
+                 <netui:parameter name="file" value="${container.item.name}"/>
+                 </netui:anchor></td>
+             <td class="diffColumn">
+                 <c:if test="${container.item.diff == true}">
+                 <netui:anchor 
href="/projectModelWeb/testRecorder?mode=diff">Diff
+                     <netui:parameter name="file" 
value="${container.item.name}"/>
+                 </netui:anchor>
+                 </c:if>
+             &nbsp;
+             </td>
+              <td class="descrColumn">${container.item.description}
+              </td>
+              <td class="detailColumn"><netui:anchor 
href="/projectModelWeb/testRecorder?mode=details">Details
+                 <netui:parameter name="file" value="${container.item.name}"/>
+                 </netui:anchor></td>
+            </tr>
+         </netui-data:repeaterItem>
+         <netui-data:repeaterFooter></table></netui-data:repeaterFooter>
+     </netui-data:repeater>
+    </div>
+    </netui:body>
+</netui:html>
+

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkDown.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkDown.gif?rev=164185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkDown.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkOver.gif
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkOver.gif?rev=164185&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/linkOver.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/style.css
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/style.css?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/style.css
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/style.css
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,151 @@
+ body {
+       font: 10pt/16pt Comic Sans MS;
+       color: #555753;
+       margin: 5px 10px 5px 5px;
+}
+
+/** Define the look of links **/
+a:link {
+       text-decoration: none;
+       color: #e18700;
+       }
+
+a:visited {
+       text-decoration: none;
+       color: #ffad30;
+       }
+
+a:hover, a:active {
+       text-decoration: underline;
+       color: #9685BA;
+}
+
+.altRow {
+    background-color: #eeeeff;
+}
+
+/** Define the title which is positioned at the top **/
+.title {
+    position: absolute;
+    left: 80px;
+    top: 20px;
+    font-family: "Comic Sans MS", Arial, Helvetica, sans-serif;
+    font-size: 20pt;
+    font-weight: bold;
+    margin:0px;
+    padding:0px;
+    color: white;
+    z-index: 3;
+}
+
+.subTitle {
+    position: absolute;
+    left: 100px;
+    top: 55px;
+    font-family: "Comic Sans MS", Arial, Helvetica, sans-serif;
+    font-size: 16pt;
+    font-weight: bold;
+    margin:0px;
+    padding:0px;
+    color: white;
+    z-index: 3;
+}
+
+/** This defines the left nav bar **/
+
+#content {
+    margin: 0px 10px 0px 120px
+}
+
+#navlist {
+   position: absolute;
+   left: 5px;
+   top: 100px;
+   width: 90px;
+}
+
+#navlist ul {
+   margin: 0;                   /* remove indent IE and Opera */
+   padding: 0;                  /* remove indent Mozilla and NN7 */
+   list-style-type: none;       /* turns off display of bullet */
+   font-family: "Comic Sans MS", Arial, Helvetica, sans-serif;
+   font-size: 14px;
+   font-weight: bold;
+}
+
+#navlist li {
+   margin: 0 0 3px 0;
+}
+
+#navlist a {
+   display: block;
+   padding: 1px 2px 0px 20px;
+   border: 1px solid #333;
+   width: 84px;
+   background-color: #999;
+   background-image: url(linkDown.gif);
+   text-decoration: none;
+}
+
+#navlist a:link, #navlist a:visited {
+       color: #FFFFFF;
+}
+
+#navlist a:hover {
+       border: 1px solid #333;
+       background-color: #FF6600;
+       background-image:  url(linkOver.gif);
+       color: #333;
+}
+
+a.uberlink, a.uberlink:link, a.uberlink :visited, a.uberlink :hover {
+       border: 1px solid #333 !important;
+       background-color: #FF6600 !important;
+       background-image:  url(linkOver.gif) !important;
+       color: #333 !important;
+}
+
+
+
+/** This is the test recorder which we are going to put into the panel on the 
left side **/
+
+#netuiTestRecorder
+{
+    position: absolute;
+    left:5px;
+    top: 468px;
+    width: 103px;
+    background-color:#c0c0c0 !important;
+    padding: 2pt 0pt 2pt 2pt !important;
+    color: #e18700 !important;
+}
+
+#netuiTestRecorder span {
+    color: inherit !important;
+    font-size: 10pt;
+}
+
+#netuiTestRecorder a {
+    color: blue !important;
+    font-weight: normal !important;
+}
+
+#netuiTestRecorder a span {
+    color: inherit !important;
+    font-weight: normal !important;
+}
+
+#netuiTestRecorder hr {
+    display: none
+}
+
+#netuiTestRecorder a:visited, #netuiTestRecorder a:link {
+       text-decoration: none;
+       color: #e18700  !important;
+}
+
+#netuiTestRecorder a:hover, #netuiTestRecorder a:active {
+       text-decoration: underline;
+       color: #9685BA !important;
+}
+

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/index/style.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/index.jsp?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/index.jsp
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/index.jsp
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,26 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" 
uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-template" 
uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+    <head>
+        <netui:base/>
+    </head>
+    <netui:body>
+        <h3>${pageFlow.URI}</h3>
+
+        <netui:form action="submit">
+            foo: <netui:textBox dataSource="actionForm.foo"/><netui:error 
key="foo"/>
+            <br/>
+            <netui:button value="submit"/>
+        </netui:form>
+        <br/>
+        <br/>
+        <netui:anchor action="commonMergeAction">hit an action in 
/src/common/strutsMerge.xml</netui:anchor>
+    </netui:body>
+</netui:html>
+
+  
+

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/success.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/success.jsp?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/success.jsp
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/success.jsp
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,23 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" 
uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-template" 
uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+    <head>
+        <netui:base/>
+    </head>
+    <netui:body>
+        <h3>${pageFlow.URI}</h3>
+
+        Success!
+        <br/>
+        <br/>
+        <netui:anchor action="begin">start over</netui:anchor>
+
+    </netui:body>
+</netui:html>
+
+  
+

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webContent/smokeTest/success.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/index/Controller.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/index/Controller.java?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/index/Controller.java
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/index/Controller.java
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,188 @@
+/*
+ * 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 index;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.tools.testrecorder.shared.config.Category;
+import 
org.apache.beehive.netui.tools.testrecorder.shared.config.TestDefinition;
+import 
org.apache.beehive.netui.tools.testrecorder.shared.config.TestDefinitions;
+import org.apache.beehive.netui.tools.testrecorder.server.TestRecorderFilter;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
+
[EMAIL PROTECTED] (
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    },
+    longLived = true
+)
+public class Controller extends PageFlowController
+{
+    private final String ROW_ON_STYLE = "row";
+    private final String ROW_OFF_STYLE = "altRow";
+    private final String TESTS = " Tests";
+    transient private TestDefinitions _td;
+    transient private Category[] _cats;
+    private String _cat = "drt";
+
+    private boolean _rowOn = false;
+
+    public Iterator getCategories()
+    {
+        CatIterator it = new CatIterator(_cats,_cat);
+        return it;
+    }
+
+    public Iterator getTests()
+    {
+        TestIterator it = new TestIterator(_td.getCategories().getTests(_cat));
+        return it;
+    }
+
+    public String getTitle() {
+        Category c = _td.getCategories().getCategory(_cat);
+        String d = c.getDescription();
+        int pos = d.indexOf("Tests");
+        return c.getDescription() + ((pos != -1) ? "" : TESTS);
+    }
+
+    public String getRowStyle() {
+        _rowOn = !_rowOn;
+        return (_rowOn) ? ROW_ON_STYLE : ROW_OFF_STYLE;
+    }
+
+
+    protected void onCreate()
+    {
+        TestDefinitions td = 
TestRecorderFilter.instance().getTestDefinitions();
+        if (td == null) {
+            System.err.println("Didn't find the test Definitions");
+        }
+        _td = td;
+        _cats = _td.getCategories().getCategories();
+    }
+
+    @Jpf.Action(
+        forwards = {
+            @Jpf.Forward(
+                name = "success",
+                path = "index.jsp")
+        })
+    public Forward selectList()
+    {
+        _rowOn = false;
+        String cat = getRequest().getParameter("target");
+        if (cat != null) {
+            _cat = cat;
+        }
+        return new Forward( "success" );
+    }
+
+    public class CatIterator implements Iterator
+    {
+        private Category[] _cats;
+        private int pos;
+        private Category _cat;
+        private String _selCat;
+
+        public CatIterator(Category[] cats, String selCat) {
+            _cats = cats;
+            _selCat = selCat;
+            pos = 0;
+        }
+
+        public String getName() {
+            return _cat.getName();
+        }
+
+        public String getDescription() {
+            return _cat.getDescription();
+        }
+
+        public String getSelection() {
+            return (_cat.getName().equals(_selCat)) ? "uberlink" : null;
+        }
+
+        public boolean hasNext()
+        {
+            return (pos < _cats.length);
+        }
+
+        public Object next()
+        {
+            _cat = _cats[pos++];
+            return this;
+        }
+
+        public void remove()
+        {
+            throw new RuntimeException("Iterator does not support remove.");
+        }
+    }
+
+    public class TestIterator implements Iterator
+    {
+        private List _list;
+        private int _cur;
+        private TestDefinition _test;
+
+        public TestIterator(List l)
+        {
+            _list = l;
+            _cur = 0;
+        }
+
+        public String getName()
+        {
+            return _test.getName();
+        }
+
+        public boolean isDiff()
+        {
+            File file = new File(_test.getResultDiffFilePath());
+            return file.exists();
+        }
+
+        public String getDescription()
+        {
+            return _test.getDescription();
+        }
+
+        //*********************************** ITERATOR 
******************************************
+        public boolean hasNext()
+        {
+            return (_cur != _list.size());
+        }
+
+        public Object next()
+        {
+            _test = (TestDefinition) _list.get(_cur++);
+            return this;
+        }
+
+        public void remove()
+        {
+            throw new RuntimeException("Iterator does not support remove.");
+        }
+    }
+}

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/index/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/log4j.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/log4j.xml?rev=164185&view=auto
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/log4j.xml 
(added)
+++ incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/log4j.xml 
Fri Apr 22 00:41:54 2005
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+
+<!-- 
+  <appender name="NETUISYSLOGFILE" 
class="org.apache.log4j.RollingFileAppender">
+    <param name="File" value="c:/tmp/netui.log"/>
+-->
+  <appender name="NETUISYSLOGFILE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="500000KB"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: 
%m%n"/>
+    </layout>
+  </appender>
+
+  <!-- base for all netui server components -->
+  <category name="org.apache.beehive.netui">
+    <priority value="error"/>
+    <appender-ref ref="NETUISYSLOGFILE"/>
+  </category>
+
+  <!-- base for all netui server components -->
+  <category name="org.apache.struts">
+    <priority value="error"/>
+    <appender-ref ref="NETUISYSLOGFILE"/>
+  </category>
+
+  <category name="org.apache.beehive.netui.script">
+    <priority value="error"/>
+    <appender-ref ref="NETUISYSLOGFILE"/>
+  </category>
+
+</log4j:configuration>

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/log4j.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/smokeTest/Controller.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/smokeTest/Controller.java?rev=164185&view=auto
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/smokeTest/Controller.java
 (added)
+++ 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/smokeTest/Controller.java
 Fri Apr 22 00:41:54 2005
@@ -0,0 +1,26 @@
+package smokeTest;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.*;
+
+import common.MyForm;
+
[EMAIL PROTECTED](
+    strutsMerge="/common/strutsMerge.xml",  // in /src/common, which is 
another source root
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    }
+)
+public class Controller extends PageFlowController
+{
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name="index", path="success.jsp")
+        },
+        [EMAIL PROTECTED](name="failure", path="index.jsp")
+    )
+    public Forward submit( MyForm form )
+    {
+        return new Forward( "index" );
+    }
+}

Propchange: 
incubator/beehive/trunk/netui/test/webapps/projectModel/webSource/smokeTest/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Login.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Login.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Login.xml 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Login.xml 
Fri Apr 22 00:41:54 2005
@@ -77,7 +77,7 @@
             
         </span>
 
-        <form name="loginForm" action="/tomcatWeb/login/doLogin.do" 
method="post">
+        <form action="/tomcatWeb/login/doLogin.do" method="post">
             <table>
                 <tr>
                     <td>username:</td>
@@ -180,7 +180,7 @@
             org.apache.beehive.netui.pageflow.NotLoggedInException: Action 
mustBeLoggedIn on page flow /login/Controller.jpf requires a current user, but 
there is no logged-in user.
         </span>
 
-        <form name="loginForm" action="/tomcatWeb/login/doLogin.do" 
method="post">
+        <form action="/tomcatWeb/login/doLogin.do" method="post">
             <table>
                 <tr>
                     <td>username:</td>
@@ -300,7 +300,7 @@
             javax.security.auth.login.FailedLoginException: Page Flow login 
failed: invalid
         </span>
 
-        <form name="loginForm" action="/tomcatWeb/login/doLogin.do" 
method="post">
+        <form action="/tomcatWeb/login/doLogin.do" method="post">
             <table>
                 <tr>
                     <td>username:</td>

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SecureLinks.xml
 Fri Apr 22 00:41:54 2005
@@ -92,13 +92,10 @@
         imageButton under /secure (relative): &lt;input type="image" 
src="https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif";
 
onmouseout="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')"
 
onmouseover="swapImage(this,'https://localhost:8443/tomcatWeb/tags/secureLinks/linkToSecure/../secure/image.gif')">
         
     &lt;/body>
-
-
 &lt;script language="JavaScript" type="text/JavaScript">
 &lt;!--
 
-// **** This section contains functions typically run as events ****
-
+// **** Start the NetUI Framework Generated JavaScript ****
 
 // Simple rollover function which replaces the image.src with the passed image
 function swapImage(control, image)
@@ -107,8 +104,6 @@
 }
 -->
 &lt;/script>
-
-
 &lt;/html></ses:responseBody>
          </ses:response>
       </ses:test>

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/Security.xml
 Fri Apr 22 00:41:54 2005
@@ -2,8 +2,8 @@
 <ses:recorderSession 
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
    <ses:sessionName>Security</ses:sessionName>
    <ses:tester>rich</ses:tester>
-   <ses:startDate>25 Jan 2005, 11:19:16.113 PM MST</ses:startDate>
-   <ses:description>Test of rendering secure links based on 
security-constraints in web.xml for the actions specified in the 
tags.</ses:description>
+   <ses:startDate>21 Apr 2005, 05:41:08.126 PM MDT</ses:startDate>
+   <ses:description>rich</ses:description>
    <ses:tests>
       <ses:test>
          <ses:testNumber>1</ses:testNumber>
@@ -18,7 +18,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>EF9AEA70F80DCD7DD4FC682B9E4B76CD</ses:value>
+                  <ses:value>6042182FCDD89DF4828A96C1A7EA8685</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -44,7 +44,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  
<ses:value>JSESSIONID=EF9AEA70F80DCD7DD4FC682B9E4B76CD</ses:value>
+                  <ses:value>$Version=0; 
JSESSIONID=6042182FCDD89DF4828A96C1A7EA8685; $Path=/tomcatWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -55,6 +55,10 @@
                   <ses:value>300</ses:value>
                </ses:header>
                <ses:header>
+                  <ses:name>testrecorder.playback.testid</ses:name>
+                  <ses:value>420d9683:10367169781:-7f84</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>
@@ -63,31 +67,35 @@
          <ses:response>
             <ses:statusCode>200</ses:statusCode>
             <ses:reason/>
-            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 
4.01 Transitional//EN"
+            <ses:responseBody>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 
Transitional//EN"
 >
-<html lang="en">
+&lt;html lang="en">
 
-<head>
-<title>Security/Proxies</title>
-</head>
-<body bgcolor="white">
-
-<h3>Secure check</h3>
+&lt;head>
+&lt;title>Security/Proxies&lt;/title>
+&lt;/head>
+&lt;body bgcolor="white">
 
-<form id="form" action="/tomcatWeb/security/unsecure.do" method="post">
+&lt;h3>Secure check&lt;/h3>
 
-    <a href="https://localhost:8443/tomcatWeb/security/secure.do";>Secure</a>
-    <a href="/tomcatWeb/security/unsecure.do">Unsecure</a>
-</form>
+&lt;form name="form" id="form" action="/tomcatWeb/security/unsecure.do" 
method="post">
 
+    &lt;a 
href="https://localhost:8443/tomcatWeb/security/secure.do";>Secure&lt;/a>
+    &lt;a href="/tomcatWeb/security/unsecure.do">Unsecure&lt;/a>
+&lt;/form>
 
-</body>
 
+&lt;/body>
+&lt;script language="JavaScript" type="text/JavaScript">
+&lt;!--
 
-<script language="JavaScript" type="text/JavaScript">
-<!--
+// **** Start the NetUI Framework Generated JavaScript ****
 
-// **** This section contains functions typically run as events ****
+// Build the netui_names table to map the tagId attributes
+// to the real id written into the HTML
+if (netui_tagIdNameMap == null)
+   var netui_tagIdNameMap = new Object();
+netui_tagIdNameMap.form="form"
 
 
 // lookup by tagId to "real id"
@@ -97,12 +105,25 @@
    return (idScope == "") ? id : idScope + id;
 }
 
+// lookup by tagId to "real name"
+function lookupNameByTagId(id, tag)
+{
+   var idScope = lookupIdScope(tag,"_");
+   if (idScope == "")
+      return netui_tagIdNameMap[id];
+   else
+      return netui_tagIdNameMap[idScope  + "__" + id];
+}
+
 //Non-Legacy lookup method creating a fully qualified scope id
 function lookupIdScope(tag,sep)
 {
    var val = "";
-   while (tag != null && tag.getAttribute != null) {
-      var attrVal = tag.getAttribute("netui:idScope");
+   if (sep == null) sep = "";
+   while (tag != null &amp;&amp; tag.getAttribute != null) {
+      try {
+         var attrVal = tag.getAttribute("netui:idScope");
+      } catch (e) { /* ignore, in IE6 calling on a table results in an 
exception */ }
       if (attrVal != null)
          val = attrVal + sep + val;
       tag = tag.parentNode;
@@ -110,11 +131,12 @@
    return val;
 }
 -->
-</script>
-
-
-</html>]]></ses:responseBody>
+&lt;/script>
+&lt;/html></ses:responseBody>
          </ses:response>
+         <ses:testResults>
+            <ses:testStatus>fail</ses:testStatus>
+         </ses:testResults>
       </ses:test>
       <ses:test>
          <ses:testNumber>2</ses:testNumber>
@@ -129,7 +151,7 @@
             <ses:cookies>
                <ses:cookie>
                   <ses:name>JSESSIONID</ses:name>
-                  <ses:value>EF9AEA70F80DCD7DD4FC682B9E4B76CD</ses:value>
+                  <ses:value>6042182FCDD89DF4828A96C1A7EA8685</ses:value>
                </ses:cookie>
             </ses:cookies>
             <ses:headers>
@@ -155,7 +177,7 @@
                </ses:header>
                <ses:header>
                   <ses:name>cookie</ses:name>
-                  
<ses:value>JSESSIONID=EF9AEA70F80DCD7DD4FC682B9E4B76CD</ses:value>
+                  <ses:value>$Version=0; 
JSESSIONID=6042182FCDD89DF4828A96C1A7EA8685; $Path=/tomcatWeb</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>host</ses:name>
@@ -166,8 +188,8 @@
                   <ses:value>300</ses:value>
                </ses:header>
                <ses:header>
-                  <ses:name>referer</ses:name>
-                  
<ses:value>http://localhost:8080/tomcatWeb/security/Controller.jpf</ses:value>
+                  <ses:name>testrecorder.playback.testid</ses:name>
+                  <ses:value>420d9683:10367169781:-7f84</ses:value>
                </ses:header>
                <ses:header>
                   <ses:name>user-agent</ses:name>
@@ -193,8 +215,14 @@
 
 </html>]]></ses:responseBody>
          </ses:response>
+         <ses:testResults>
+            <ses:testStatus>pass</ses:testStatus>
+         </ses:testResults>
       </ses:test>
    </ses:tests>
-   <ses:endDate>25 Jan 2005, 11:19:35.852 PM MST</ses:endDate>
+   <ses:endDate>21 Apr 2005, 05:41:08.166 PM MDT</ses:endDate>
+   <ses:sessionStatus>fail</ses:sessionStatus>
    <ses:testCount>2</ses:testCount>
+   <ses:passedCount>1</ses:passedCount>
+   <ses:failedCount>1</ses:failedCount>
 </ses:recorderSession>

Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml 
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml Fri 
Apr 22 00:41:54 2005
@@ -62,19 +62,18 @@
         <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile XSDs -->
-        <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas" 
destDir="${webapp.dir}/WEB-INF/classes"/>
+        <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" 
destdir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile controls -->
-        <build-controls sourceDir="${webapp.dir}/WEB-INF/src" 
+        <build-controls srcdir="${webapp.dir}/WEB-INF/src" 
                         destdir="${webapp.dir}/WEB-INF/classes" 
-                        tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                        classpathRef="webapp.build.classpath"/>
+                        tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                        classpathref="webapp.build.classpath"/>
 
         <!-- compile JPFs -->
-        <build-pageflows sourceDir="${webapp.dir}" 
-                         destdir="${webapp.dir}/WEB-INF/classes" 
-                         tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                         classpathRef="webapp.build.classpath"/>
+        <build-pageflows srcdir="${webapp.dir}" 
+                         tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                         classpathref="webapp.build.classpath"/>
 
         <!-- copy resources -->
         <echo>Copy all .properties and .xml files</echo>
@@ -123,4 +122,4 @@
         </java>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml 
(original)
+++ incubator/beehive/trunk/test/dist-test/ant/testdist-buildWebapp.xml Fri Apr 
22 00:41:54 2005
@@ -49,13 +49,13 @@
         <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile XSDs -->
-        <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas" 
destDir="${webapp.dir}/WEB-INF/classes"/>
+        <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" 
destdir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile controls -->
-        <build-controls sourceDir="${webapp.dir}/WEB-INF/src" 
destdir="${webapp.dir}/WEB-INF/classes" 
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" 
classpathRef="webapp.build.classpath"/>
+        <build-controls srcdir="${webapp.dir}/WEB-INF/src" 
destdir="${webapp.dir}/WEB-INF/classes" 
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" 
classpathref="webapp.build.classpath"/>
 
         <!-- compile JPFs -->
-        <build-pageflows sourceDir="${webapp.dir}" 
destdir="${webapp.dir}/WEB-INF/classes" 
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" 
classpathRef="webapp.build.classpath"/>
+        <build-pageflows srcdir="${webapp.dir}" 
tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" 
classpathref="webapp.build.classpath"/>
 
         <!-- copy resources -->
        <echo>Copy all .properties and .xml files</echo>
@@ -74,4 +74,4 @@
         <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" 
includeEmptyDirs="true"/>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/beehive/trunk/user/netui-blank/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.xml?rev=164185&r1=164184&r2=164185&view=diff
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.xml (original)
+++ incubator/beehive/trunk/user/netui-blank/build.xml Fri Apr 22 00:41:54 2005
@@ -62,19 +62,19 @@
         <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile XSDs -->
-        <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas" 
destDir="${webapp.dir}/WEB-INF/classes"/>
+        <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" 
destdir="${webapp.dir}/WEB-INF/classes"/>
 
         <!-- compile controls -->
-        <build-controls sourceDir="${webapp.dir}/WEB-INF/src" 
+        <build-controls srcdir="${webapp.dir}/WEB-INF/src" 
                         destdir="${webapp.dir}/WEB-INF/classes" 
-                        tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                        classpathRef="webapp.build.classpath"/>
+                        tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                        classpathref="webapp.build.classpath"/>
 
         <!-- compile JPFs -->
-        <build-pageflows sourceDir="${webapp.dir}" 
+        <build-pageflows srcdir="${webapp.dir}" 
                          destdir="${webapp.dir}/WEB-INF/classes" 
-                         tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
-                         classpathRef="webapp.build.classpath"/>
+                         tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+                         classpathref="webapp.build.classpath"/>
 
         <!-- copy resources -->
        <echo>Copy all .properties and .xml files</echo>


Reply via email to