Author: rich
Date: Mon Jan 24 20:15:31 2005
New Revision: 126344

URL: http://svn.apache.org/viewcvs?view=rev&rev=126344
Log:
Skeleton for a webapp to test TomcatServletContainerAdapter.  Have to submit 
this before I can move 'jsfWeb' to 'tomcatWeb'.


Added:
   incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/log4j.xml  
 (contents, props changed)
   incubator/beehive/trunk/netui/test/webapps/tomcat/
      - copied from r126260, incubator/beehive/trunk/netui/test/webapps/jsf/
Removed:
   
incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/faces-config.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/src/backingControls/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/src/faces/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/backingControls/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/bindingInFaces/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/dataStructure.jspf
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/faces/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/faces.jsp
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/initMemberFields/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/jpfFaces/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/navigateTo/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/page.jspf
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/restorePreviousPage/
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/submitFormBean/
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/BindingInFaces.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeAnchors.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeBundle.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeConversions.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeDataTable.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeFormOne.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeFormTwo.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokeImage.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/FacesSmokePanel.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/InitMemberFields.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/JpfFaces.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/RestorePreviousPage.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/tests/SubmitFormBean.xml
Modified:
   incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/web.xml
   incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/index/index.jsp
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
   
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-webapp.xml

Added: 
incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/log4j.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/log4j.xml?view=auto&rev=126344
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/src/log4j.xml 
Mon Jan 24 20:15:31 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>

Modified: incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml?view=diff&rev=126344&p1=incubator/beehive/trunk/netui/test/webapps/jsf/build.xml&r1=126260&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml&r2=126344
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/build.xml    (original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml Mon Jan 24 
20:15:31 2005
@@ -2,16 +2,16 @@
 
 <!-- 
 -->
-<project name="Beehive/NetUI/JSFTests" default="usage" basedir=".">
+<project name="Beehive/NetUI/TomcatTests" default="usage" basedir=".">
 
     <property environment="os"/>
     <import file="../../ant/webapp-imports.xml"/>
 
-    <property name="webapp.name" value="jsfWeb"/>
-    <property name="testRecorder.config.name" value="netui-server-jsf-config"/>
+    <property name="webapp.name" value="tomcatWeb"/>
+    <property name="testRecorder.config.name" 
value="netui-server-tomcat-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}/jsf/${webapp.name}"/>
+    <property name="webapp.dir" location="${app.dir}/tomcat/${webapp.name}"/>
 
     <!-- ================================================================ -->
     <!--                                                                  -->
@@ -20,46 +20,41 @@
     <!-- ================================================================ -->
     <target name="build" description="Build webapp">
         <echo message="--------------------------------------------------"/>
-        <echo message="|     NetUI jsfWeb DRT webapp build starting     |"/>
+        <echo message="|     NetUI tomcatWeb DRT webapp build starting     |"/>
         <echo message="--------------------------------------------------"/>
 
-        <fail unless="os.JSF_HOME" message="JSF_HOME must point to the 
JavaServer Faces 1.1 Reference Implementation distribution."/>
+       <!-- the default version of Struts for the DRTs.  To override, pass 
-Dstruts.version=1.1 on the command line -->
+       <property name="struts.version" value="1.2"/>
 
-           <!-- the default version of Struts for the DRTs.  To override, pass 
-Dstruts.version=1.1 on the command line -->
-           <property name="struts.version" value="1.2"/>
-   
-           <echo>struts.version: ${struts.version}</echo>
-   
-           <ant antfile="${test.dir}/ant/buildWebapp.xml" 
target="deploy.netui" inheritAll="false">
-               <property name="webapp.dir" location="${webapp.dir}"/>
-               <property name="include.testrecorder" value="true"/>
-               <property name="testRecorder.config.name" 
value="${testRecorder.config.name}"/>
-               <property name="test.file" 
location="${app.dir}/jsf/testRecorder/config/testRecorder-tests.xml"/>
-               <property name="config.file" 
location="${app.dir}/jsf/testRecorder/config/testRecorder-config.xml"/>
-               <property name="webapp.file" 
location="${app.dir}/jsf/testRecorder/config/testRecorder-webapp.xml"/>
-               <property name="struts.version" value="${struts.version}"/>
-           </ant>
-   
-           <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
-                 tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
-                 overwrite="true" failonerror="false"/>
+       <echo>struts.version: ${struts.version}</echo>
+
+       <ant antfile="${test.dir}/ant/buildWebapp.xml" target="deploy.netui" 
inheritAll="false">
+           <property name="webapp.dir" location="${webapp.dir}"/>
+           <property name="include.testrecorder" value="true"/>
+           <property name="testRecorder.config.name" 
value="${testRecorder.config.name}"/>
+           <property name="test.file" 
location="${app.dir}/tomcat/testRecorder/config/testRecorder-tests.xml"/>
+           <property name="config.file" 
location="${app.dir}/tomcat/testRecorder/config/testRecorder-config.xml"/>
+           <property name="webapp.file" 
location="${app.dir}/tomcat/testRecorder/config/testRecorder-webapp.xml"/>
+           <property name="struts.version" value="${struts.version}"/>
+       </ant>
+
+       <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml" 
+             tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}" 
+             overwrite="true" failonerror="false"/>
 
         <property name="webinf.dir" value="${webapp.dir}/WEB-INF"/>
+        
+        <!-- copy the tomcat webapp integration library -->
         <copy todir="${webinf.dir}/lib" overwrite="true" failonerror="true">
-            <fileset dir="${os.JSF_HOME}/lib">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${webinf.dir}" overwrite="true" failonerror="true">
-            <fileset dir="${os.JSF_HOME}/lib">
-                <include name="*.tld"/>
+            <fileset dir="${build.lib.dir}">
+                <include name="${netui-tomcat-webapp.5x.jar.name}"/>
             </fileset>
         </copy>
 
         <build-webapp webappDir="${webapp.dir}"/>
 
         <echo message="--------------------------------------------------"/>
-        <echo message="|     NetUI jsfWeb DRT webapp build ending       |"/>
+        <echo message="|     NetUI tomcatWeb DRT webapp build ending       |"/>
         <echo message="--------------------------------------------------"/>
 
     </target>
@@ -91,7 +86,7 @@
 
     <target name="drt" description="Run the drt 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}/jsf/build.xml"/>
+            <property name="app.build.file" 
location="${app.dir}/tomcat/build.xml"/>
             <property name="suite.name" value="drt"/>
             <property name="drt.mode" value="true"/>
             <property name="playback.webapps" value="${webapp.name}"/>

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/faces-config.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/faces-config.xml?view=auto&rev=126260
==============================================================================

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/web.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/web.xml?view=diff&rev=126344&p1=incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml&r1=126260&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/web.xml&r2=126344
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/WEB-INF/web.xml       
(original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/WEB-INF/web.xml    
Mon Jan 24 20:15:31 2005
@@ -5,43 +5,13 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
     version="2.4">
 
-<!--
-    <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
--->
-
-    <context-param>
-        <param-name>com.sun.faces.validateXml</param-name>
-        <param-value>true</param-value>
-        <description>
-            Set this flag to true if you want the JavaServer Faces
-            Reference Implementation to validate the XML in your
-            faces-config.xml resources against the DTD.  Default
-            value is false.
-        </description>
-    </context-param>
-
-    <context-param>
-        <param-name>com.sun.faces.verifyObjects</param-name>
-        <param-value>true</param-value>
-        <description>
-            Set this flag to true if you want the JavaServer Faces
-            Reference Implementation to verify that all of the application
-            objects you have configured (components, converters,
-            renderers, and validators) can be successfully created.
-            Default value is false.
-        </description>
-    </context-param>
-
   <!-- 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>jsfWeb</param-value>
+          <param-value>tomcatWeb</param-value>
       </init-param>
   </filter>
 
@@ -50,11 +20,6 @@
     
<filter-class>org.apache.beehive.netui.pageflow.PageFlowJspFilter</filter-class>
   </filter>
 
-  <filter>
-      <filter-name>PageFlowFacesFilter</filter-name>
-      
<filter-class>org.apache.beehive.netui.pageflow.PageFlowFacesFilter</filter-class>
-  </filter>
-
   <filter-mapping>
     <filter-name>TestRecorderFilter</filter-name>
     <url-pattern>/*</url-pattern>
@@ -76,26 +41,6 @@
       <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
 
-  <filter-mapping>
-      <filter-name>PageFlowFacesFilter</filter-name>
-      <url-pattern>*.faces</url-pattern>
-      <dispatcher>FORWARD</dispatcher>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-  </filter-mapping>
-
-  <filter-mapping>
-      <filter-name>PageFlowFacesFilter</filter-name>
-      <url-pattern>*.jsf</url-pattern>
-      <dispatcher>FORWARD</dispatcher>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-  </filter-mapping>
-
-  <listener>
-      <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
-  </listener>
-
   <!-- Test Recorder Servlet (control channel) -->
   <servlet>
     <servlet-name>TestRecorderServlet</servlet-name>
@@ -143,36 +88,12 @@
     <url-pattern>*.do</url-pattern>
   </servlet-mapping>
 
-  <!-- XmlHttpRequest Servlet -->
-  <servlet-mapping>
-    <servlet-name>XmlHttpRequestServlet</servlet-name>
-    <url-pattern>*.xmlHttpRequest</url-pattern>
-  </servlet-mapping>
-
-  <!-- Faces Servlet -->
-  <servlet>
-      <servlet-name>Faces Servlet</servlet-name>
-      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-      <load-on-startup> 1 </load-on-startup>
-  </servlet>
-
   <!-- TestRecorder Control Servlet -->
   <servlet-mapping>
     <servlet-name>TestRecorderServlet</servlet-name>
     <url-pattern>/testRecorder</url-pattern>
   </servlet-mapping>
 
-  <!-- 
-       This mapping identifies a jsp page as having JSF content.  If a
-       request comes to the server for foo.faces, the container will
-       send the request to the FacesServlet, which will expect a
-       corresponding foo.jsp page to exist containing the content.
-  -->
-  <servlet-mapping>
-      <servlet-name>Faces Servlet</servlet-name>
-      <url-pattern>*.faces</url-pattern>
-  </servlet-mapping>
-
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>
@@ -202,23 +123,6 @@
         <taglib-uri>beehive-netui-tags-datagrid.tld</taglib-uri>
         
<taglib-location>/WEB-INF/beehive-netui-tags-datagrid.tld</taglib-location>
     </taglib>
-
-      <!-- the JSF Tag Libraries -->
-      <taglib>
-          <taglib-uri>http://java.sun.com/jsf/html</taglib-uri>
-          <taglib-location>/WEB-INF/html_basic.tld</taglib-location>
-      </taglib>
-
-      <taglib>
-          <taglib-uri>http://java.sun.com/jsf/core</taglib-uri>
-          <taglib-location>/WEB-INF/jsf_core.tld</taglib-location>
-      </taglib>
-
-      <!-- Mock Portal -->
-      <taglib>
-          <taglib-uri>mockportal.tld</taglib-uri>
-          <taglib-location>/WEB-INF/mockportal.tld</taglib-location>
-      </taglib>
 
     <!-- Struts Tag Library Descriptors -->
     <taglib>

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/dataStructure.jspf
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/dataStructure.jspf?view=auto&rev=126260
==============================================================================

Deleted: /incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/faces.jsp
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/faces.jsp?view=auto&rev=126260
==============================================================================

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/index/index.jsp
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/index/index.jsp?view=diff&rev=126344&p1=incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/index/index.jsp&r1=126260&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/index/index.jsp&r2=126344
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/index/index.jsp       
(original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/jsfWeb/index/index.jsp    
Mon Jan 24 20:15:31 2005
@@ -54,12 +54,12 @@
          <netui-data:repeaterHeader><table border='1px' 
cellspacing='0'></netui-data:repeaterHeader>
          <netui-data:repeaterItem>
              <tr class="${pageFlow.rowStyle}">
-             <td class="nameColumn"><netui:anchor 
href="/jsfWeb/testRecorder?mode=displayLink">${container.item.name}
+             <td class="nameColumn"><netui:anchor 
href="/tomcatWeb/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="/jsfWeb/testRecorder?mode=diff">Diff
+                 <netui:anchor href="/tomcatWeb/testRecorder?mode=diff">Diff
                      <netui:parameter name="file" 
value="${container.item.name}"/>
                  </netui:anchor>
                  </c:if>
@@ -67,7 +67,7 @@
              </td>
               <td class="descrColumn">${container.item.description}
               </td>
-              <td class="detailColumn"><netui:anchor 
href="/jsfWeb/testRecorder?mode=details">Details
+              <td class="detailColumn"><netui:anchor 
href="/tomcatWeb/testRecorder?mode=details">Details
                  <netui:parameter name="file" value="${container.item.name}"/>
                  </netui:anchor></td>
             </tr>

Deleted: /incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/page.jspf
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/jsfWeb/page.jspf?view=auto&rev=126260
==============================================================================

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml?view=diff&rev=126344&p1=incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml&r1=126260&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml&r2=126344
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/config/testRecorder-tests.xml
   (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-tests.xml
        Mon Jan 24 20:15:31 2005
@@ -11,109 +11,5 @@
         </category>
     </categories>
     <tests>
-        <test>
-            <name>BindingInFaces</name>
-            <description>Test of binding to pageInput, pageFlow, sharedFlow in 
a JSF page.</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>drt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeAnchors</name>
-            <description>FacesSmokeAnchors</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeBundle</name>
-            <description>FacesSmokeBundle</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeConversions</name>
-            <description>FacesSmokeConversions</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeDataTable</name>
-            <description>FacesSmokeDataTable</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeFormOne</name>
-            <description>FacesSmokeFormOne</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeFormTwo</name>
-            <description>FacesSmokeFormTwo</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokeImage</name>
-            <description>FacesSmokeImage</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>FacesSmokePanel</name>
-            <description>FacesSmokePanel</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>bvt</category>
-            </categories>
-        </test>
-        <test>
-            <name>InitMemberFields</name>
-            <description>Test of initialization of backing class fields marked 
with @Jpf.SharedFlowField and @Jpf.PageFlowField.</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>drt</category>
-            </categories>
-        </test>
-        <test>
-            <name>JpfFaces</name>
-            <description>Test of basic JSF / page flow integration, including 
raising actions and passing forms from JSF pages and backing 
files.</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>drt</category>
-            </categories>
-        </test>
-        <test>
-            <name>RestorePreviousPage</name>
-            <description>Test of restoring the component tree of a JSF page 
when returning to it through navigateTo=Jpf.NavigateTo.currentPage or 
navigateTo=Jpf.NavigateTo.previousPage.</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>drt</category>
-            </categories>
-        </test>
-        <test>
-            <name>SubmitFormBean</name>
-            <description>Test of sending a form bean to a Page Flow action in 
two ways: (1) through the "submitFormBean" attribute (f:attribute tag) inside 
of h:commandLink or h:commandButton, or (2) through an 'outputFormBean' 
attribute on @Jpf.RaiseAction in a backing file command handler.</description>
-            <webapp>jsfWeb</webapp>
-            <categories>
-                <category>drt</category>
-            </categories>
-        </test>
     </tests>
 </testDefinitions>

Modified: 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-webapp.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-webapp.xml?view=diff&rev=126344&p1=incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/config/testRecorder-webapp.xml&r1=126260&p2=incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-webapp.xml&r2=126344
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/config/testRecorder-webapp.xml
  (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/tomcat/testRecorder/config/testRecorder-webapp.xml
       Mon Jan 24 20:15:31 2005
@@ -7,11 +7,11 @@
 
     <webapps>
         <webapp>
-            <name>jsfWeb</name>
-            <description>NetUI / JSF web application</description>
+            <name>tomcatWeb</name>
+            <description>NetUI / Tomcat web application</description>
             <testMode>true</testMode>
-            <contextRoot>/jsfWeb</contextRoot>
-            
<testDefinitionsDirectory>@DOMAIN_DIR@/jsf/testRecorder/tests</testDefinitionsDirectory>
+            <contextRoot>/tomcatWeb</contextRoot>
+            
<testDefinitionsDirectory>@DOMAIN_DIR@/tomcat/testRecorder/tests</testDefinitionsDirectory>
         </webapp>
     </webapps>
 </server>

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/BindingInFaces.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/BindingInFaces.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeAnchors.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeAnchors.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeBundle.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeBundle.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeConversions.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeConversions.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeDataTable.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeDataTable.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeFormOne.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeFormOne.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeFormTwo.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeFormTwo.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeImage.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokeImage.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokePanel.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/FacesSmokePanel.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/InitMemberFields.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/InitMemberFields.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/JpfFaces.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/JpfFaces.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/RestorePreviousPage.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/RestorePreviousPage.xml?view=auto&rev=126260
==============================================================================

Deleted: 
/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/SubmitFormBean.xml
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/testRecorder/tests/SubmitFormBean.xml?view=auto&rev=126260
==============================================================================

Reply via email to