You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/09/30 05:38:15 UTC

svn commit: r292613 - in /beehive/trunk/netui: src/compiler-core/org/apache/beehive/netui/compiler/ test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/ test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/ test/...

Author: rich
Date: Thu Sep 29 20:37:55 2005
New Revision: 292613

URL: http://svn.apache.org/viewcvs?rev=292613&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-950 : some message bundles not appearing in generated struts-config files

tests: bvt in netui (WinXP)
BB: bvt in netui (linux)


Added:
    beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/
    beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/
    beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp   (with props)
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml   (with props)
Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
    beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java?rev=292613&r1=292612&r2=292613&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/MergedControllerAnnotation.java Thu Sep 29 20:37:55 2005
@@ -30,6 +30,8 @@
 public class MergedControllerAnnotation
         implements JpfLanguageConstants
 {
+    private static final String NULL_KEY = "";
+    
     private String _strutsMerge;
     private String _validatorVersion;
     private String _validatorMerge;
@@ -90,7 +92,7 @@
         mergeAnnotationArray( _catches, controllerAnnotation, CATCHES_ATTR, TYPE_ATTR );
         mergeAnnotationArray( _simpleActions, controllerAnnotation, SIMPLE_ACTIONS_ATTR, NAME_ATTR );
         mergeAnnotationArray( _validatableBeans, controllerAnnotation, VALIDATABLE_BEANS_ATTR, TYPE_ATTR );
-        mergeAnnotationArray( _messageBundles, controllerAnnotation, MESSAGE_BUNDLES_ATTR, BUNDLE_PATH_ATTR );
+        mergeAnnotationArray( _messageBundles, controllerAnnotation, MESSAGE_BUNDLES_ATTR, BUNDLE_NAME_ATTR );
         
         String multipartHandler = CompilerUtils.getEnumFieldName( controllerAnnotation, MULTIPART_HANDLER_ATTR, true );
         if ( multipartHandler != null ) _multipartHandler = multipartHandler;
@@ -121,7 +123,11 @@
             {
                 AnnotationInstance ann = ( AnnotationInstance ) ii.next();
                 Object key = CompilerUtils.getAnnotationValue( ann, keyAttr, true );
-                if ( key != null ) keyedList.put( key.toString(), ann );
+                if ( key != null ) {
+                    keyedList.put( key.toString(), ann );
+                } else {
+                    keyedList.put( NULL_KEY, ann );
+                }
             }
         }
     }

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties Thu Sep 29 20:37:55 2005
@@ -0,0 +1 @@
+errRequired=Got it!

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties Thu Sep 29 20:37:55 2005
@@ -0,0 +1 @@
+errRequired=uh oh -- should not have gotten this message.

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/overrideMessageBundles/base/BaseMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java Thu Sep 29 20:37:55 2005
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package miniTests.overrideMessageBundles;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp")
+    },
+    messageBundles={
+        @Jpf.MessageBundle(bundlePath="miniTests.overrideMessageBundles.Messages")
+    }
+)
+public class Controller extends miniTests.overrideMessageBundles.base.Controller
+{
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name="index", path="index.jsp")
+        },
+        validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
+    )
+    public Forward submit(MyForm form)
+    {
+        return new Forward("index");
+    }
+
+    public static class MyForm implements java.io.Serializable
+    {
+        private String _foo;
+
+        @Jpf.ValidatableProperty(
+            validateRequired=@Jpf.ValidateRequired(messageKey="errRequired")
+        )
+        public String getFoo()
+        {
+            return _foo;
+        }
+
+        public void setFoo(String foo)
+        {
+            _foo = foo;
+        }
+    }
+}

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java Thu Sep 29 20:37:55 2005
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package miniTests.overrideMessageBundles.base;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+    messageBundles={
+        @Jpf.MessageBundle(bundlePath="miniTests.overrideMessageBundles.base.BaseMessages")
+    }
+)
+public abstract class Controller extends PageFlowController
+{
+}

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp Thu Sep 29 20:37:55 2005
@@ -0,0 +1,25 @@
+<%@ 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:anchor action="begin">begin</netui:anchor>
+
+        <netui:form action="submit">
+            foo: <netui:textBox dataSource="actionForm.foo"/><netui:error key="foo"/>
+            <br/>
+            <netui:button value="submit"/>
+        </netui:form>
+    </netui:body>
+</netui:html>
+
+  
+

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/base/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp Thu Sep 29 20:37:55 2005
@@ -0,0 +1,30 @@
+<%@ 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>
+
+        <p>
+            This test ensures that you can override a default message bundle (defined using a
+            <code>@Jpf.MessageBundle</code> annotation with no <code>bundleName</code>) with a
+            default message bundle in a derived class.  If you click on Submit, you should get
+            the message "Got it!".
+        </p>
+
+        <netui:form action="submit">
+            foo: <netui:textBox dataSource="actionForm.foo"/><netui:error key="foo"/>
+            <br/>
+            <netui:button value="submit"/>
+        </netui:form>
+    </netui:body>
+</netui:html>
+
+  
+

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overrideMessageBundles/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=292613&r1=292612&r2=292613&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Thu Sep 29 20:37:55 2005
@@ -5445,6 +5445,19 @@
          </features>
       </test>
       <test>
+         <name>OverrideMessageBundles</name>
+         <description>This test ensures that you can override a default message bundle (defined using a @Jpf.MessageBundle annotation with no bundleName) with a default message bundle in a derived class.</description>
+         <webapp>coreWeb</webapp>
+         <categories>
+            <category>bvt</category>
+            <category>bvt.struts11</category>
+            <category>corePageFlow</category>
+         </categories>
+         <features>
+            <feature>Message</feature>
+         </features>
+      </test>
+      <test>
          <name>PadRepeater</name>
          <description>Test of repeater padding and repeater choice.</description>
          <webapp>coreWeb</webapp>

Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml?rev=292613&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml Thu Sep 29 20:37:55 2005
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+   <ses:sessionName>OverrideMessageBundles</ses:sessionName>
+   <ses:tester>rich</ses:tester>
+   <ses:startDate>29 Sep 2005, 05:28:24.936 PM MDT</ses:startDate>
+   <ses:description>This test ensures that you can override a default message bundle (defined using a @Jpf.MessageBundle annotation with no bundleName) with a default message bundle in a derived 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>/coreWeb/miniTests/overrideMessageBundles/Controller.jpf</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>185173B254ECD6771F2B32C0AF263A32</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</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.7,ja;q=0.3</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=185173B254ECD6771F2B32C0AF263A32; Language=en; nde-textsize=16px; Country=US</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.12) Gecko/20050915 Firefox/1.0.7</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/miniTests/overrideMessageBundles/index.jsp">
+    </head>
+    <body>
+        <h3>/miniTests/overrideMessageBundles/Controller.jpf</h3>
+
+        <p>
+            This test ensures that you can override a default message bundle (defined using a
+            <code>@Jpf.MessageBundle</code> annotation with no <code>bundleName</code>) with a
+            default message bundle in a derived class.  If you click on Submit, you should get
+            the message "Got it!".
+        </p>
+
+        <form action="/coreWeb/miniTests/overrideMessageBundles/submit.do" method="post">
+            foo: <input type="text" name="{actionForm.foo}">
+            <br/>
+            <input type="submit" value="submit">
+        </form>
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>2</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/miniTests/overrideMessageBundles/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>185173B254ECD6771F2B32C0AF263A32</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</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.7,ja;q=0.3</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=185173B254ECD6771F2B32C0AF263A32; Language=en; nde-textsize=16px; Country=US</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>referer</ses:name>
+                  <ses:value>http://localhost:8080/coreWeb/miniTests/overrideMessageBundles/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.12) Gecko/20050915 Firefox/1.0.7</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/miniTests/overrideMessageBundles/index.jsp">
+    </head>
+    <body>
+        <h3>/miniTests/overrideMessageBundles/Controller.jpf</h3>
+
+        <p>
+            This test ensures that you can override a default message bundle (defined using a
+            <code>@Jpf.MessageBundle</code> annotation with no <code>bundleName</code>) with a
+            default message bundle in a derived class.  If you click on Submit, you should get
+            the message "Got it!".
+        </p>
+
+        <form action="/coreWeb/miniTests/overrideMessageBundles/submit.do" method="post">
+            foo: <input type="text" name="{actionForm.foo}">Got it!
+
+            <br/>
+            <input type="submit" value="submit">
+        </form>
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+   </ses:tests>
+   <ses:endDate>29 Sep 2005, 05:28:40.068 PM MDT</ses:endDate>
+   <ses:testCount>2</ses:testCount>
+</ses:recorderSession>

Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/OverrideMessageBundles.xml
------------------------------------------------------------------------------
    svn:eol-style = native