dev@javaserverfaces.java.net

Re: Review: Changes to get systests running

From: Roger Kitain <Roger.Kitain_at_Sun.COM>
Date: Tue, 26 Apr 2005 08:17:58 -0400

r=rogerk;

I'm looking at PathTestCase.

-roger

Jayashri Visvanathan wrote:

>
> M src/javax/faces/webapp/UIComponentClassicTagBase.java
> - if body content contains comments, ignore and clear the content.
>
> M src/com/sun/faces/application/ViewHandlerImpl.java
> - StateManager.writeState() should be called
> for state saving in server mode.
> - Added comments about dynamically added components during
> encodeAll()
>
> M build-tests.xml
> M src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java
> M src/com/sun/faces/jsptest/JspIntegrationTestCase.java
> M src/com/sun/faces/jsptest/ValidatorTestCase.java
> M src/com/sun/faces/systest/DynamicComponent.java
> M web/duplicateIds03.jsp
> M web/methodref01.jsp
> M web/golden/factoryFinder.txt
> M web/golden/managed04.txt
> M web/golden/renderkit02A.txt
> M web/golden/renderkit03A.txt
> M web/golden/subview01.txt
> M web/golden/subview02.txt
> M web/golden/subview03.txt
> M web/golden/subview04.txt
> M web/golden/subview05.txt
> M web/golden/subview06.txt
> M web/golden/standard/component01.txt
> M web/golden/standard/converter02.txt
> M web/golden/standard/messages01.txt
> M web/golden/standard/messages02.txt
> M web/golden/taglib/attributeTest.txt
> M web/golden/taglib/commandButton_test.txt
> M web/golden/taglib/commandLink_multiform_test.txt
> M web/golden/taglib/commandLink_test.txt
> M web/taglib/commandLink_multiform_test.jsp
> Changes to get systests working gain
>
> Except the following tests, all systests run with this change bundle.
> 1. JspIntegrationTestCase (I am looking at this)
> 2. PathTestCase
> 3. ViewRootPhaseListenerTestCase
>
> Can somebody please volunteer to fix 2 and 3. We need to get the
> tests running ASAP so that we can move on to EL merge.
>
> Thanks a lot in advance
> -Jayashri
>
>------------------------------------------------------------------------
>
>Index: src/javax/faces/webapp/UIComponentClassicTagBase.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-api/src/javax/faces/webapp/UIComponentClassicTagBase.java,v
>retrieving revision 1.1
>diff -u -r1.1 UIComponentClassicTagBase.java
>--- src/javax/faces/webapp/UIComponentClassicTagBase.java 21 Apr 2005 18:55:31 -0000 1.1
>+++ src/javax/faces/webapp/UIComponentClassicTagBase.java 26 Apr 2005 00:53:00 -0000
>@@ -837,7 +837,10 @@
> verbatim = createVerbatimComponent();
> verbatim.setValue(bodyContentString);
> bodyContent.clearBody();
>- }
>+ } else {
>+ // clear body if bodyContent is just comments.
>+ bodyContent.clearBody();
>+ }
> }
> return verbatim;
> }
>
>
>------------------------------------------------------------------------
>
>Index: src/com/sun/faces/application/ViewHandlerImpl.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/application/ViewHandlerImpl.java,v
>retrieving revision 1.50
>diff -u -r1.50 ViewHandlerImpl.java
>--- src/com/sun/faces/application/ViewHandlerImpl.java 21 Apr 2005 18:55:34 -0000 1.50
>+++ src/com/sun/faces/application/ViewHandlerImpl.java 26 Apr 2005 01:28:25 -0000
>@@ -34,6 +34,7 @@
> import javax.faces.context.ResponseWriter;
> import javax.faces.render.RenderKit;
> import javax.faces.render.RenderKitFactory;
>+
> import javax.servlet.ServletRequest;
> import javax.servlet.ServletResponse;
> import javax.servlet.http.HttpServletRequest;
>@@ -175,6 +176,14 @@
> ExternalContext extContext = context.getExternalContext();
> ServletResponse response = (ServletResponse) extContext.getResponse();
>
>+ // NOTE: With tree pre-creation, components can be dynamically added
>+ // to the tree by registering a beforeRender phaseListener. So, any
>+ // component added during encodeAll, will not be persisted as a result.
>+ // With this change, we can avoid buffering and the marker replacement
>+ // complexity since the actual state is written out during
>+ // ViewHandler.writeState(). saveSerializedView() must be called before
>+ // encodeAll because writeState() needs the actual state which gets
>+ // created during saveSerializedView
> Object view =
> Util.getStateManager(context).saveSerializedView(context);
> extContext.getRequestMap().put(RIConstants.SAVED_STATE, view);
>@@ -610,25 +619,23 @@
> }
> StateManager stateManager = Util.getStateManager(context);
>
>- if (stateManager.isSavingStateInClient(context)) {
>- SerializedView viewState = (SerializedView)
>- context.getExternalContext().getRequestMap().get(RIConstants.SAVED_STATE);
>- assert(null != viewState);
>-
>- if (logger.isLoggable(Level.FINE)) {
>- logger.fine("Begin writing state to response for viewId " +
>- context.getViewRoot().getViewId());
>- }
>-
>- // write out the state
>- stateManager.writeState(context, viewState);
>-
>- if (logger.isLoggable(Level.FINE)) {
>- logger.fine("End writing state to response for viewId " +
>- context.getViewRoot().getViewId());
>- }
>+ SerializedView viewState = (SerializedView)
>+ context.getExternalContext().getRequestMap().get(RIConstants.SAVED_STATE);
>+ assert(null != viewState);
>+
>+ if (logger.isLoggable(Level.FINE)) {
>+ logger.fine("Begin writing state to response for viewId " +
>+ context.getViewRoot().getViewId());
> }
>-
>+
>+ // write out the state
>+ stateManager.writeState(context, viewState);
>+
>+ if (logger.isLoggable(Level.FINE)) {
>+ logger.fine("End writing state to response for viewId " +
>+ context.getViewRoot().getViewId());
>+ }
>+
> }
>
>
>@@ -862,6 +869,6 @@
> }
> return convertedViewId;
> }
>-
>-
>+
>+
> }
>Index: systest/build-tests.xml
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build-tests.xml,v
>retrieving revision 1.70
>diff -u -r1.70 build-tests.xml
>--- systest/build-tests.xml 21 Apr 2005 18:55:40 -0000 1.70
>+++ systest/build-tests.xml 26 Apr 2005 01:28:26 -0000
>@@ -70,8 +70,6 @@
>
>
> <!-- ======================== Test Execution ============================== -->
>-
>-
> <target name="test"
> description="Execute all tests against installed application"
> depends="test.init,
>@@ -101,12 +99,12 @@
> test.verbatim,
> test.phases,
> test.subview,
>- test.jsp,
>- test.path,
> test.methodRef,
>+ test.jsp,
>+ test.path,
> test.valueBindingGet
>- "/>
>-
>+ "/>
>+
> <target name="test.init">
> <mkdir dir="${test.results.dir}"/>
> </target>
>@@ -121,12 +119,10 @@
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/duplicateIds02.jsp"
> status="200" failonerror="${failonerror}"/>
>-<!-- PENDING: return to running
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/duplicateIds03.jsp"
>- status="200" failonerror="${failonerror}"/>
>--->
>+ status="500" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/duplicateIds05.jsp"
>@@ -232,24 +228,22 @@
> <sysproperty key="org.apache.commons.logging.simplelog.showdatetime"
> value="true"/>
> -->
>-
>+ <!-- PENDING (visvan) Fix tests in excludes -->
> <batchtest todir="${test.results.dir}">
> <fileset dir="${basedir}/build/WEB-INF/classes"
> includes="com/sun/faces/jsptest/*TestCase.class"
>- excludes="com/sun/faces/jsptest/CommandLinkMultiFormTestCase.class,com/sun/faces/jsptest/ConverterTestCase.class,com/sun/faces/jsptest/FormInputTestCase.class,com/sun/faces/jsptest/JspIntegrationTestCase.class,com/sun/faces/jsptest/ListenerTestCase.class,com/sun/faces/jsptest/SelectComponentValueTestCase.class,com/sun/faces/jsptest/ValidatorTestCase.class,com/sun/faces/jsptest/ValueChangeListenerTestCase.class,com/sun/faces/jsptest/ViewRootPhaseListenerTestCase.class,com/sun/faces/jsptest/ViewTagTestCase.class"/>
>-
>-<!-- PENDING: remove excludes. Start out with
>- ViewRootPhaseListenerTestCase and ListenerTestCase. -->
>-
>+ excludes="com/sun/faces/jsptest/ViewRootPhaseListenerTestCase.class,
>+ com/sun/faces/jsptest/JspIntegrationTestCase.class"/>
> </batchtest>
>
> </junit>
>
> </target>
>
>+
> <target name="test.path"
> description="Test Path Handling">
>-
>+ <!-- PENDING (visvan) Fix PathTestCase
> <junit printsummary="yes" fork="yes"
> haltonfailure="yes" haltonerror="yes">
>
>@@ -262,27 +256,12 @@
> <sysproperty key="port" value="${port}"/>
> <sysproperty key="context.path" value="${context.path}"/>
>
>- <!-- Uncomment the following for wire-level debugging -->
>- <!-- NOTE: this requires a hacked htmlunit-1.2.3.jar -->
>- <!--
>- <sysproperty key="org.apache.commons.logging.Log"
>- value="org.apache.commons.logging.impl.SimpleLog"/>
>- <sysproperty key="org.apache.commons.logging.simplelog.log.httpclient.wire"
>- value="debug"/>
>- -->
>- <!--
>- <sysproperty key="org.apache.commons.logging.simplelog.showdatetime"
>- value="true"/>
>- -->
>-
> <batchtest todir="${test.results.dir}">
> <fileset dir="${basedir}/build/WEB-INF/classes"
>- includes="com/sun/faces/pathtest/*TestCase.class,com/sun/faces/systest/NavigationTestCase.class"
>- excludes="com/sun/faces/pathtest/PathTestCase.class,com/sun/faces/systest/NavigationTestCase.class"/>
>-<!-- PENDING: remove excludes. For some reason, PathTestCase hangs. -->
>+ includes="com/sun/faces/pathtest/*TestCase.class" />
> </batchtest>
>
>- </junit>
>+ </junit> -->
>
> </target>
>
>@@ -317,10 +296,7 @@
>
> <batchtest todir="${test.results.dir}">
> <fileset dir="${basedir}/build/WEB-INF/classes"
>- includes="com/sun/faces/methodref/*TestCase.class"
>- excludes="com/sun/faces/methodref/MethodRefTestCase.class" />
>-<!-- PENDING: remove excludes -->
>-
>+ includes="com/sun/faces/methodref/*TestCase.class"/>
> </batchtest>
>
>
> </junit>
>@@ -379,16 +355,11 @@
> request="${context.path}/faces/config01.jsp"
> outContent="/config01.jsp PASSED" failonerror="${failonerror}"/>
>
>-<!-- PENDING: return to running
>-
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/factoryFinder.jsp"
>- golden="${golden.path}/factoryFinder.txt" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>+ golden="${golden.path}/factoryFinder.txt"
> recordGolden="${local.golden.path}/factoryFinder.txt"
> failonerror="${failonerror}"/>
>--->
>-
>-
> </target>
>
> <target name="test.listener"
>@@ -416,13 +387,11 @@
> request="${context.path}/faces/managed03.jsp"
> status="500" failonerror="${failonerror}"/>
>
>-<!-- PENDING: return to running
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/managed04.jsp"
> golden="${golden.path}/managed04.txt"
>- recordGolden="${local.golden.path}/managed04.txt" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>+ recordGolden="${local.golden.path}/managed04.txt"
> failonerror="${failonerror}"/>
>--->
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/managed07.jsp"
>@@ -555,11 +524,10 @@
> <target name="test.converter02"
> description="Test passing Converter instances to component tag">
>
>-<!-- PENDING: return to running
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/converter02.jsp"
>+ recordGolden="${local.golden.path}/standard/converter02.txt"
> golden="${golden.path}/standard/converter02.txt" failonerror="${failonerror}"/>
>--->
> </target>
>
> <target name="test.converter03"
>@@ -631,27 +599,26 @@
>
> <target name="test.standard"
> description="Test the Standard RenderKit">
>-
>-<!-- PENDING: return to running
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/standard/messages01.jsp"
>+ recordGolden="${local.golden.path}/standard/messages01.txt"
> golden="${golden.path}/standard/messages01.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/standard/messages02.jsp"
> golden="${golden.path}/standard/messages02.txt" failonerror="${failonerror}"
>- recordGolden="/home/rogerk/messages02.txt"/>
>+ recordGolden="${local.golden.path}/standard/messages02.txt"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/standard/component01.jsp"
>+ recordGolden="${local.golden.path}/standard/component01.txt"
> golden="${golden.path}/standard/component01.txt" failonerror="${failonerror}"/>
>--->
> </target>
>
> <target name="test.html.taglib"
> description="Test the HTML JSP Tags">
> <echo message="Testing commandButton..."/>
>-<!-- PENDING: return to running
>+
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/taglib/commandButton_test.jsp"
> golden="${golden.path}/taglib/commandButton_test.txt" failonerror="${failonerror}" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>@@ -660,16 +627,16 @@
> <echo message="Testing commandLink..."/>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/taglib/commandLink_test.jsp"
>- golden="${golden.path}/taglib/commandLink_test.txt" failonerror="${failonerror}" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>+ golden="${golden.path}/taglib/commandLink_test.txt" failonerror="${failonerror}"
> recordGolden="${local.golden.path}/taglib/commandLink_test.txt" />
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/taglib/commandLink_multiform_test.jsp"
>- golden="${golden.path}/taglib/commandLink_multiform_test.txt" failonerror="${failonerror}" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>+ golden="${golden.path}/taglib/commandLink_multiform_test.txt" failonerror="${failonerror}"
> recordGolden="${local.golden.path}/taglib/commandLink_multiform_test.txt" />
> <tester host="${host}" port="${port}" protocol="${protocol}"
>- request="${context.path}/faces/taglib/attributeTest.jsp" ignoreIfContains="${ignore.path}/ignoreIfContains.txt"
>+ request="${context.path}/faces/taglib/attributeTest.jsp"
>+ recordGolden="${local.golden.path}/taglib/attributeTest.txt"
> golden="${golden.path}/taglib/attributeTest.txt" failonerror="${failonerror}" />
>--->
>
> </target>
>
>@@ -689,17 +656,20 @@
>
> <target name="test.renderkit"
> description="Test renderkit processing">
>-<!-- PENDING: return to running
>+
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/renderkit01.jsp"
> outContent="/renderkit01.jsp PASSED" failonerror="${failonerror}"/>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/renderkit02.jsp"
>- golden="${golden.path}/renderkit02A.txt" failonerror="${failonerror}"/>
>+ golden="${golden.path}/renderkit02A.txt"
>+ recordGolden="${local.golden.path}/renderkit02A.txt"
>+ failonerror="${failonerror}"/>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/renderkit03.jsp"
>+ recordGolden="${local.golden.path}/renderkit03A.txt"
> golden="${golden.path}/renderkit03A.txt" failonerror="${failonerror}"/>
>--->
>+
> </target>
>
> <target name="test.phases"
>@@ -710,32 +680,37 @@
> </target>
> <target name="test.subview"
> description="Test subview tag">
>-<!-- PENDING: return to running
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview01.jsp"
>+ recordGolden="${local.golden.path}/subview01.txt"
> golden="${golden.path}/subview01.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview02.jsp"
>+ recordGolden="${local.golden.path}/subview02.txt"
> golden="${golden.path}/subview02.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview03.jsp"
>+ recordGolden="${local.golden.path}/subview03.txt"
> golden="${golden.path}/subview03.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview04.jsp"
>+ recordGolden="${local.golden.path}/subview04.txt"
> golden="${golden.path}/subview04.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview05.jsp"
>+ recordGolden="${local.golden.path}/subview05.txt"
> golden="${golden.path}/subview05.txt" failonerror="${failonerror}"/>
>
> <tester host="${host}" port="${port}" protocol="${protocol}"
> request="${context.path}/faces/subview06.jsp"
>+ recordGolden="${local.golden.path}/subview06.txt"
> golden="${golden.path}/subview06.txt" failonerror="${failonerror}"/>
>--->
>+
> </target>
>
> </project>
>Index: systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java,v
>retrieving revision 1.1
>diff -u -r1.1 CommandLinkMultiFormTestCase.java
>--- systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java 8 Jun 2004 13:49:18 -0000 1.1
>+++ systest/src/com/sun/faces/jsptest/CommandLinkMultiFormTestCase.java 26 Apr 2005 01:28:26 -0000
>@@ -1,5 +1,5 @@
> /*
>- * $Id: CommandLinkMultiFormTestCase.java,v 1.1 2004/06/08 13:49:18 rogerk Exp $
>+ * $Id: CommandLinkMultiFormTestCase.java,v 1.4 2005/04/02 00:48:11 jayashri Exp $
> */
>
> /*
>@@ -95,22 +95,22 @@
> form2 = (HtmlForm)forms.get(1);
>
> // links within the first form
>- hidden1 = (HtmlHiddenInput)form1.getInputByName("_id0:_idcl");
>+ hidden1 = (HtmlHiddenInput)form1.getInputByName("form01:_idcl");
> assertNotNull(hidden1);
>- hidden1.setValueAttribute("_id0:_id1");
>+ hidden1.setValueAttribute("form01:Link1");
> page1 = (HtmlPage)form1.submit();
> assertTrue(-1 != page1.asText().indexOf("Thank you"));
>- hidden1.setValueAttribute("_id0:_id3");
>+ hidden1.setValueAttribute("form01:Link2");
> page1 = (HtmlPage)form1.submit();
> assertTrue(-1 != page1.asText().indexOf("Thank you"));
>
> // links within second form
>- hidden2 = (HtmlHiddenInput)form2.getInputByName("_id5:_idcl");
>+ hidden2 = (HtmlHiddenInput)form2.getInputByName("form02:_idcl");
> assertNotNull(hidden2);
>- hidden2.setValueAttribute("_id5:_id6");
>+ hidden2.setValueAttribute("form02:Link3");
> page1 = (HtmlPage)form1.submit();
> assertTrue(-1 != page1.asText().indexOf("Thank you"));
>- hidden2.setValueAttribute("_id5:_id8");
>+ hidden2.setValueAttribute("form02:Link4");
> page1 = (HtmlPage)form1.submit();
> assertTrue(-1 != page1.asText().indexOf("Thank you"));
> }
>Index: systest/src/com/sun/faces/jsptest/JspIntegrationTestCase.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/jsptest/JspIntegrationTestCase.java,v
>retrieving revision 1.9
>diff -u -r1.9 JspIntegrationTestCase.java
>--- systest/src/com/sun/faces/jsptest/JspIntegrationTestCase.java 15 Mar 2005 20:37:39 -0000 1.9
>+++ systest/src/com/sun/faces/jsptest/JspIntegrationTestCase.java 26 Apr 2005 01:28:26 -0000
>@@ -79,15 +79,15 @@
> // Check with children that have explicit ids
> checkJspDynamic00();
> checkJspDynamic01("",
>- "[A] { } [Z]");
>- checkJspDynamic01("?mode=create&id=C1&value=[1]&com.sun.faces.VIEW=_id1",
>- "[A] { [1] } [Z]");
>- checkJspDynamic01("?mode=create&id=C2&value=[2]&com.sun.faces.VIEW=_id2",
>- "[A] { [1] [2] } [Z]");
>- checkJspDynamic01("?mode=create&id=C3&value=[3]&com.sun.faces.VIEW=_id3",
>- "[A] { [1] [2] [3] } [Z]");
>- checkJspDynamic01("?mode=delete&id=C2&com.sun.faces.VIEW=_id4",
>- "[A] { [1] [3] } [Z]");
>+ "[A]{ } [Z]");
>+ checkJspDynamic01("?mode=create&id=C1&value=[1]&com.sun.faces.VIEW=_id0",
>+ "[A]{ [1] } [Z]");
>+ checkJspDynamic01("?mode=create&id=C2&value=[2]&com.sun.faces.VIEW=_id1",
>+ "[A]{ [1] [2] } [Z]");
>+ checkJspDynamic01("?mode=create&id=C3&value=[3]&com.sun.faces.VIEW=_id2",
>+ "[A]{ [1] [2] [3] } [Z]");
>+ checkJspDynamic01("?mode=delete&id=C2&com.sun.faces.VIEW=_id3",
>+ "[A]{ [1] [3] } [Z]");
>
> checkJspDynamic00();
> client = new WebClient();
>@@ -109,7 +109,7 @@
> checkJspDynamic00();
> client = new WebClient();
> checkJspDynamic01("",
>- "[A] { } [Z]");
>+ "[A]{ } [Z]");
> }
>
>
>@@ -254,6 +254,7 @@
> assertEquals("Correct page title",
> "jsp-dynamic-01", page.getTitleText());
> String bodyText = getBodyText(page);
>+ System.out.println("bodyText " + bodyText);
> assertTrue("Correct body element",
> -1 != bodyText.indexOf(result));
>
>@@ -289,7 +290,7 @@
> assertEquals("Correct page title",
> "jsp-include-02", page.getTitleText());
> assertEquals("Correct body element",
>- "[A] [B] [C] [D] [E]", getBodyText(page));
>+ "[A][B][C][D][E]", getBodyText(page));
>
> }
>
>@@ -299,7 +300,7 @@
> assertEquals("Correct page title",
> "jsp-include-03", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2c][2x] [3]", getBodyText(page));
>+ "[1][2c][2x][3]", getBodyText(page));
>
> }
>
>@@ -312,7 +313,7 @@
> assertEquals("Correct page title",
> "jsp-include-03", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2a][2z] [3]", getBodyText(page));
>+ "[1][2a][2z][3]", getBodyText(page));
>
> }
>
>@@ -324,7 +325,7 @@
> assertEquals("Correct page title",
> "jsp-include-03", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2b][2y] [3]", getBodyText(page));
>+ "[1][2b][2y][3]", getBodyText(page));
>
> }
>
>@@ -336,7 +337,7 @@
> assertEquals("Correct page title",
> "jsp-include-03", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2c][2x] [3]", getBodyText(page));
>+ "[1][2c][2x][3]", getBodyText(page));
>
> }
>
>@@ -346,7 +347,7 @@
> assertEquals("Correct page title",
> "jsp-include-04", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2c][2x] [3]", getBodyText(page));
>+ "[1][2c][2x][3]", getBodyText(page));
>
> }
>
>@@ -359,7 +360,7 @@
> assertEquals("Correct page title",
> "jsp-include-04", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2a][2z] [3]", getBodyText(page));
>+ "[1][2a][2z][3]", getBodyText(page));
>
> }
>
>@@ -371,7 +372,7 @@
> assertEquals("Correct page title",
> "jsp-include-04", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2b][2y] [3]", getBodyText(page));
>+ "[1][2b][2y][3]", getBodyText(page));
>
> }
>
>@@ -383,7 +384,7 @@
> assertEquals("Correct page title",
> "jsp-include-04", page.getTitleText());
> assertEquals("Correct body element",
>- "[1] [2c][2x] [3]", getBodyText(page));
>+ "[1][2c][2x][3]", getBodyText(page));
>
> }
>
>Index: systest/src/com/sun/faces/jsptest/ValidatorTestCase.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/jsptest/ValidatorTestCase.java,v
>retrieving revision 1.3
>diff -u -r1.3 ValidatorTestCase.java
>--- systest/src/com/sun/faces/jsptest/ValidatorTestCase.java 11 Mar 2005 18:59:24 -0000 1.3
>+++ systest/src/com/sun/faces/jsptest/ValidatorTestCase.java 26 Apr 2005 01:28:26 -0000
>@@ -106,11 +106,11 @@
> HtmlSubmitInput button = (HtmlSubmitInput) list.get(0);
> page = (HtmlPage) button.click();
>
>- assertTrue(-1 != page.asText().indexOf("_id0:dr1: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
>+ assertTrue(-1 != page.asText().indexOf("_id1:dr1: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
> assertTrue(-1 != page.asText().indexOf("DoubleRange2: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
>- assertTrue(-1 != page.asText().indexOf("_id0:l1: Validation Error: Value is less than allowable minimum of '2'"));
>+ assertTrue(-1 != page.asText().indexOf("_id1:l1: Validation Error: Value is less than allowable minimum of '2'"));
> assertTrue(-1 != page.asText().indexOf("Length2: Validation Error: Value is less than allowable minimum of '2'"));
>- assertTrue(-1 != page.asText().indexOf("id0:lr1: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
>+ assertTrue(-1 != page.asText().indexOf("id1:lr1: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
> assertTrue(-1 != page.asText().indexOf("LongRange2: Validation Error: Specified attribute is not between the expected values of 2 and 5."));
> }
>
>Index: systest/src/com/sun/faces/systest/DynamicComponent.java
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/systest/DynamicComponent.java,v
>retrieving revision 1.7
>diff -u -r1.7 DynamicComponent.java
>--- systest/src/com/sun/faces/systest/DynamicComponent.java 26 Feb 2004 20:33:39 -0000 1.7
>+++ systest/src/com/sun/faces/systest/DynamicComponent.java 26 Apr 2005 01:28:26 -0000
>@@ -121,7 +121,6 @@
>
>
> private void process(FacesContext context) {
>-
> Map map = context.getExternalContext().getRequestParameterMap();
> String mode = (String) map.get("mode");
> String id = (String) map.get("id");
>Index: systest/web/duplicateIds03.jsp
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/duplicateIds03.jsp,v
>retrieving revision 1.3
>diff -u -r1.3 duplicateIds03.jsp
>--- systest/web/duplicateIds03.jsp 4 Feb 2004 23:42:49 -0000 1.3
>+++ systest/web/duplicateIds03.jsp 26 Apr 2005 01:28:26 -0000
>@@ -8,7 +8,6 @@
>
> <%-- Confirm duplicate ID's are found --%>
>
>-<% try { %>
> <f:view>
> <h:outputText id="output1"/>
> <h:outputText />
>@@ -18,10 +17,4 @@
> </f:facet>
> </h:outputText>
> </f:view>
>-<%
>- } catch (JspException je) {
>- if (!(je.getRootCause() instanceof IllegalStateException)) {
>- throw je;
>- }
>- }
>-%>
>+
>Index: systest/web/methodref01.jsp
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/methodref01.jsp,v
>retrieving revision 1.10
>diff -u -r1.10 methodref01.jsp
>--- systest/web/methodref01.jsp 13 May 2004 01:06:05 -0000 1.10
>+++ systest/web/methodref01.jsp 26 Apr 2005 01:28:26 -0000
>@@ -24,6 +24,7 @@
> </h:commandLink>
> <h:commandButton id="button3" value="button3"
> actionListener="#{methodRef.button3Pressed}"/>
>+ <h:message for="buttonStatus"/>
> <hr>
> <p>the only valid value is batman</p>
> <h:inputText id="toValidate"
>@@ -36,6 +37,7 @@
> <h:inputText id="toChange"
> valueChangeListener="#{methodRef.valueChange}"/>
> <h:commandButton id="changeValue" value="changeValue"/>
>+ <h:message for="toChange"/>
> </h:form>
> </f:view>
>
>Index: systest/web/golden/factoryFinder.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/factoryFinder.txt,v
>retrieving revision 1.4
>diff -u -r1.4 factoryFinder.txt
>
>--- systest/web/golden/factoryFinder.txt 11 Mar 2005 18:14:11 -0000 1.4
>+++ systest/web/golden/factoryFinder.txt 26 Apr 2005 01:28:26 -0000
>@@ -9,25 +9,17 @@
> <body>
> <h1>Print out the names of the current Factories</h1>
>
>-
>-
>- <form id="_id0" method="post" action="/jsf-systest/faces/factoryFinder.jsp;jsessionid=A843CA16ADF67DD43245358177581F89" enctype="application/x-www-form-urlencoded">
>-
>-
>- ApplicationFactoryWrapper FacesContextFactoryWrapper LifecycleFactoryWrapper RenderKitFactoryWrapper
>-
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIElPjPFqAAAR+9SHQwAAAA=" />
>- <input type="hidden" name="_id0" value="_id0" />
>+<form id="_id1" method="post" action="/jsf-systest/faces/factoryFinder.jsp;jsessionid=2D23305B0FFD9889FC5711BD142A213B" enctype="application/x-www-form-urlencoded">
>+ApplicationFactoryWrapper FacesContextFactoryWrapper LifecycleFactoryWrapper RenderKitFactoryWrapper <input type="hidden" name="com.sun.faces.VIEW" value="_id2" />
>+ <input type="hidden" name="_id1" value="_id1" />
> <script type="text/javascript">
> <!--
>-function clearFormHiddenParams__id0(curFormName) {
>+function clearFormHiddenParams__id1(curFormName) {
> var curForm = document.forms[curFormName];
> }
> //-->
> </script>
> </form>
>-
>-
>
> <hr>
> </body>
>Index: systest/web/golden/managed04.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/managed04.txt,v
>retrieving revision 1.4
>diff -u -r1.4 managed04.txt
>--- systest/web/golden/managed04.txt 11 Mar 2005 18:14:12 -0000 1.4
>+++ systest/web/golden/managed04.txt 26 Apr 2005 01:28:26 -0000
>@@ -9,29 +9,17 @@
> <body>
> <h1>Verify property ordering</h1>
>
>-
>-
>- <form id="_id0" method="post" action="/jsf-systest/faces/managed04.jsp;jsessionid=F37CC431CBD7C1A35266BB011B26538D" enctype="application/x-www-form-urlencoded">
>-
>-
>- one two three four
>- five
>- six
>- seven
>- eight
>-
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIE1PjPF2LwAACygL3INAAAA" />
>- <input type="hidden" name="_id0" value="_id0" />
>+<form id="_id1" method="post" action="/jsf-systest/faces/managed04.jsp;jsessionid=73B0DD6DE0A8A9CBCE9B5CFAAE6D7B44" enctype="application/x-www-form-urlencoded">
>+ one two three fourfivesixseveneight <input type="hidden" name="com.sun.faces.VIEW" value="_id17" />
>+ <input type="hidden" name="_id1" value="_id1" />
> <script type="text/javascript">
> <!--
>-function clearFormHiddenParams__id0(curFormName) {
>+function clearFormHiddenParams__id1(curFormName) {
> var curForm = document.forms[curFormName];
> }
> //-->
> </script>
> </form>
>-
>-
>
> <hr>
> </body>
>Index: systest/web/golden/renderkit02A.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/renderkit02A.txt,v
>retrieving revision 1.2
>diff -u -r1.2 renderkit02A.txt
>--- systest/web/golden/renderkit02A.txt 14 Jan 2004 17:13:11 -0000 1.2
>+++ systest/web/golden/renderkit02A.txt 26 Apr 2005 01:28:26 -0000
>@@ -3,8 +3,8 @@
>
>
>
>-
>- <span id="simplelabel">Simple Label</span>
>-
>+ <span id="simplelabel">Simple Label</span>
>
> </HTML>
>+/renderkit02.jsp PASSED
>+
>Index: systest/web/golden/renderkit03A.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/renderkit03A.txt,v
>retrieving revision 1.1
>diff -u -r1.1 renderkit03A.txt
>--- systest/web/golden/renderkit03A.txt 18 Aug 2003 22:11:39 -0000 1.1
>+++ systest/web/golden/renderkit03A.txt 26 Apr 2005 01:28:26 -0000
>@@ -3,8 +3,8 @@
>
>
>
>-
>- This IS TEXT FROM THE CUSTOM RENDERER
>-
>+ This IS TEXT FROM THE CUSTOM RENDERER
>
> </HTML>
>+/renderkit03.jsp PASSED
>+
>Index: systest/web/golden/subview01.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview01.txt,v
>retrieving revision 1.2
>diff -u -r1.2 subview01.txt
>--- systest/web/golden/subview01.txt 5 Feb 2004 05:05:22 -0000 1.2
>+++ systest/web/golden/subview01.txt 26 Apr 2005 01:28:26 -0000
>@@ -13,35 +13,7 @@
> <title>subview01</title>
> </head>
> <body>
>-Begin test &lt;c:import&gt; with subview tag in imported page
>-foo01<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-subview01
>-bar01<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-End test &lt;c:import&gt; with subview tag in imported page
>+Begin test &lt;c:import&gt; with subview tag in imported pagefoo01subview01bar01End test &lt;c:import&gt; with subview tag in imported page
> </body>
> </html>
>
>Index: systest/web/golden/subview02.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview02.txt,v
>retrieving revision 1.2
>diff -u -r1.2 subview02.txt
>--- systest/web/golden/subview02.txt 5 Feb 2004 05:05:23 -0000 1.2
>+++ systest/web/golden/subview02.txt 26 Apr 2005 01:28:26 -0000
>@@ -13,39 +13,11 @@
> <title>subview02</title>
> </head>
> <body>
>-Begin test &lt;c:import&gt; with subview tag in importing page
>+Begin test &lt;c:import&gt; with subview tag in importing pagefoo02subview02bar02End test &lt;c:import&gt; with subview tag in importing page
>
>-foo02<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>
>
>
>-
>-
>-
>-
>-
>-
>-
>-subview02
>-
>-bar02<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-End test &lt;c:import&gt; with subview tag in importing page
> </body>
> </html>
>
>Index: systest/web/golden/subview03.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview03.txt,v
>retrieving revision 1.2
>diff -u -r1.2 subview03.txt
>--- systest/web/golden/subview03.txt 5 Feb 2004 05:05:23 -0000 1.2
>+++ systest/web/golden/subview03.txt 26 Apr 2005 01:28:26 -0000
>@@ -13,35 +13,7 @@
> <title>subview03</title>
> </head>
> <body>
>-Begin test &lt;c:include&gt; with subview tag in included page
>-foo01<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-subview03
>-bar01<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-End test &lt;c:include&gt; with subview tag in included page
>+Begin test &lt;c:include&gt; with subview tag in included pagefoo01subview03bar01End test &lt;c:include&gt; with subview tag in included page
> </body>
> </html>
>
>Index: systest/web/golden/subview04.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview04.txt,v
>retrieving revision 1.3
>diff -u -r1.3 subview04.txt
>--- systest/web/golden/subview04.txt 5 Oct 2004 21:36:45 -0000 1.3
>+++ systest/web/golden/subview04.txt 26 Apr 2005 01:28:26 -0000
>@@ -13,40 +13,11 @@
> <title>subview04</title>
> </head>
> <body>
>-[A]
>+[A]Begin test &lt;c:include&gt; with subview tag in including pagebar01subview04bar02End test &lt;c:include&gt; with subview tag in including page
>
>-Begin test &lt;c:include&gt; with subview tag in including page
>-bar01<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>
>
>
>-
>-
>-
>-
>-
>-
>-
>-subview04
>-
>-bar02<!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-End test &lt;c:include&gt; with subview tag in including page
> </body>
> </html>
>
>Index: systest/web/golden/subview05.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview05.txt,v
>retrieving revision 1.2
>diff -u -r1.2 subview05.txt
>--- systest/web/golden/subview05.txt 5 Feb 2004 05:05:25 -0000 1.2
>+++ systest/web/golden/subview05.txt 26 Apr 2005 01:28:26 -0000
>@@ -15,37 +15,24 @@
> <body>
> Begin test jsp:include with subview and iterator tag in included page
> <br>
>-This component has no ID This component has no ID This component has no ID This component has no ID <!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>
> <br>
>
> Array[0]:
>- <br>
>+ This component has no ID <br>
>
> Array[1]:
>- <br>
>+ This component has no ID <br>
>
> Array[2]:
>- <br>
>+ This component has no ID <br>
>
> Array[3]:
>- <br>
>+ This component has no ID <br>
>
>
>+Text from subview05.jspEnd test jsp:include with subview and iterator tag in included page
>
>-
>-
>-Text from subview05.jsp
>-End test jsp:include with subview and iterator tag in included page
> </body>
> </html>
>
>Index: systest/web/golden/subview06.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/subview06.txt,v
>retrieving revision 1.4
>diff -u -r1.4 subview06.txt
>--- systest/web/golden/subview06.txt 26 Feb 2004 20:33:52 -0000 1.4
>+++ systest/web/golden/subview06.txt 26 Apr 2005 01:28:26 -0000
>@@ -14,40 +14,27 @@
> </head>
> <body>
> Begin test &lt;c:import&gt; with iterator tag in imported page
>-
> <br>
>-This component has no ID This component has no ID This component has no ID This component has no ID <!--
>- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
>--->
>-
>-
>-
>-
>-
>-
>
> <br>
>
> Array[0]:
>- <br>
>+ This component has no ID <br>
>
> Array[1]:
>- <br>
>+ This component has no ID <br>
>
> Array[2]:
>- <br>
>+ This component has no ID <br>
>
> Array[3]:
>- <br>
>+ This component has no ID <br>
>
>
>+Text from subview06.jspEnd test &lt;c:import&gt; with iterator tag in imported page
>
>
>
>-
>-Text from subview06.jsp
>-End test &lt;c:import&gt; with iterator tag in imported page
> </body>
> </html>
>
>Index: systest/web/golden/standard/component01.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/standard/component01.txt,v
>retrieving revision 1.4
>diff -u -r1.4 component01.txt
>--- systest/web/golden/standard/component01.txt 9 Nov 2004 15:42:39 -0000 1.4
>+++ systest/web/golden/standard/component01.txt 26 Apr 2005 01:28:26 -0000
>@@ -9,8 +9,6 @@
>
> </head>
> <body>
>-
>- <input id="username" type="text" name="username" maxlength="32" size="20" />
>-
>+ <input id="username" type="text" name="username" maxlength="32" size="20" />
> </body>
> </html>
>Index: systest/web/golden/standard/converter02.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/standard/converter02.txt,v
>retrieving revision 1.2
>diff -u -r1.2 converter02.txt
>--- systest/web/golden/standard/converter02.txt 14 Jan 2004 17:13:12 -0000 1.2
>+++ systest/web/golden/standard/converter02.txt 26 Apr 2005 01:28:26 -0000
>@@ -4,6 +4,4 @@
>
>
>
>-
>- <span id="id1">$123.45</span>
>-
>+<span id="id1">$123.45</span>
>Index: systest/web/golden/standard/messages01.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/standard/messages01.txt,v
>retrieving revision 1.6
>diff -u -r1.6 messages01.txt
>--- systest/web/golden/standard/messages01.txt 15 Mar 2005 15:50:34 -0000 1.6
>+++ systest/web/golden/standard/messages01.txt 26 Apr 2005 01:28:26 -0000
>@@ -24,12 +24,7 @@
>
> <body>
>
>-
>-
>-
>-<ul class="errors"><li> {0}: Validation Error: Value is required. </li></ul>
>-
>-
>+<ul class="errors"><li> {0}: Validation Error: Value is required. </li></ul>
>
>
>
>Index: systest/web/golden/standard/messages02.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/standard/messages02.txt,v
>retrieving revision 1.1
>diff -u -r1.1 messages02.txt
>--- systest/web/golden/standard/messages02.txt 15 Mar 2005 15:50:35 -0000 1.1
>+++ systest/web/golden/standard/messages02.txt 26 Apr 2005 01:28:26 -0000
>@@ -24,16 +24,7 @@
> -->
> </STYLE>
>
>-
>-
>-
>-
>-
>-
>-
>-
>-
>- <table>
>+<table>
> <tbody>
> <tr>
> <td><ul dir="LTR" style="left: 48px; top: 100px; position: absolute"><li style="color: yellow"><span title="Information Summary"> Informational Detail</span></li><li><span title="Warning Summary"> Warning Detail</span></li><li style="color: red"><span title="Error Summary"> Error Detail</span></li><li style="color: blue"><span title="Fatal Summary"> Fatal Detail</span></li></ul></td>
>@@ -49,6 +40,5 @@
> </tr>
> </tbody>
> </table>
>-
>
> </html>
>Index: systest/web/golden/taglib/attributeTest.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/taglib/attributeTest.txt,v
>retrieving revision 1.2
>diff -u -r1.2 attributeTest.txt
>--- systest/web/golden/taglib/attributeTest.txt 7 Jan 2005 16:43:13 -0000 1.2
>+++ systest/web/golden/taglib/attributeTest.txt 26 Apr 2005 01:28:26 -0000
>@@ -11,14 +11,10 @@
>
>
> <p>
>-
>-
> <span style="color: red">This Should Be Red</span>
> </p>
>
> <p>
>-
>-
> New String Value
> </p>
>
>Index: systest/web/golden/taglib/commandButton_test.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/taglib/commandButton_test.txt,v
>retrieving revision 1.5
>diff -u -r1.5 commandButton_test.txt
>--- systest/web/golden/taglib/commandButton_test.txt 11 Mar 2005 18:14:12 -0000 1.5
>+++ systest/web/golden/taglib/commandButton_test.txt 26 Apr 2005 01:28:26 -0000
>@@ -10,15 +10,8 @@
> <body>
>
>
>-
>- <form id="form01" method="post" action="/jsf-systest/faces/taglib/commandButton_test.jsp;jsessionid=6C0871477E8CFDE6FF634D152A32C135" enctype="application/x-www-form-urlencoded">
>-
>- <input id="form01:button01" type="submit" name="form01:button01" value="My Label" onclick="clearFormHiddenParams_form01(this.form.id);" />
>- <input id="form01:button02" type="reset" name="form01:button02" value="This is a String property" onclick="clearFormHiddenParams_form01(this.form.id);" />
>- <input id="form01:button03" type="submit" name="form01:button03" value="RES-BUNDLE KEY" onclick="clearFormHiddenParams_form01(this.form.id);" />
>- <input id="form01:button04" type="image" src="duke.gif" name="form01:button04" onclick="clearFormHiddenParams_form01(this.form.id);" />
>- <input id="form01:button05" type="image" src="resbundle_image.gif" name="form01:button05" onclick="clearFormHiddenParams_form01(this.form.id);" />
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIE1PjPFwrwAAM1Pen4NAAAA" />
>+ <form id="form01" method="post" action="/jsf-systest/faces/taglib/commandButton_test.jsp;jsessionid=9FD0CB15C422E6321102C6CF9FABB63D" enctype="application/x-www-form-urlencoded">
>+<input id="form01:button01" type="submit" name="form01:button01" value="My Label" onclick="clearFormHiddenParams_form01(this.form.id);" /><input id="form01:button02" type="reset" name="form01:button02" value="This is a String property" onclick="clearFormHiddenParams_form01(this.form.id);" /><input id="form01:button03" type="submit" name="form01:button03" value="RES-BUNDLE KEY" onclick="clearFormHiddenParams_form01(this.form.id);" /><input id="form01:button04" type="image" src="duke.gif;jsessionid=9FD0CB15C422E6321102C6CF9FABB63D" name="form01:button04" onclick="clearFormHiddenParams_form01(this.form.id);" /><input id="form01:button05" type="image" src="resbundle_image.gif;jsessionid=9FD0CB15C422E6321102C6CF9FABB63D" name="form01:button05" onclick="clearFormHiddenParams_form01(this.form.id);" /> <input type="hidden" name="com.sun.faces.VIEW" value="_id45" />
> <input type="hidden" name="form01" value="form01" />
> <script type="text/javascript">
> <!--
>@@ -28,7 +21,6 @@
> //-->
> </script>
> </form>
>-
> </body>
> </html>
>
>Index: systest/web/golden/taglib/commandLink_multiform_test.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/taglib/commandLink_multiform_test.txt,v
>retrieving revision 1.4
>diff -u -r1.4 commandLink_multiform_test.txt
>--- systest/web/golden/taglib/commandLink_multiform_test.txt 11 Mar 2005 18:14:13 -0000 1.4
>+++ systest/web/golden/taglib/commandLink_multiform_test.txt 26 Apr 2005 01:28:26 -0000
>@@ -6,45 +6,28 @@
>
> <html>
> <body>
>-
>- <form id="_id0" method="post" action="/jsf-systest/faces/taglib/commandLink_multiform_test.jsp;jsessionid=BFF4F36C354132F7B6978D51C6B85BDA" enctype="application/x-www-form-urlencoded">
>-
>-
>-
>- <a href="#" onclick="clearFormHiddenParams__id0('_id0');document.forms['_id0']['_id0:_idcl'].value='_id0:_id1'; document.forms['_id0'].submit(); return false;">Link1</a>
>-
>-
>- <a href="#" onclick="clearFormHiddenParams__id0('_id0');document.forms['_id0']['_id0:_idcl'].value='_id0:_id3'; document.forms['_id0'].submit(); return false;">Link2</a>
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIE1PjPF2LQAAK7CGUANAAAA" />
>- <input type="hidden" name="_id0" value="_id0" /><input type="hidden" name="_id0:_idcl" />
>+ <form id="form01" method="post" action="/jsf-systest/faces/taglib/commandLink_multiform_test.jsp;jsessionid=2A0A18F251A1E7D69C3A84999CF9F4BE" enctype="application/x-www-form-urlencoded">
>+<a id="form01:Link1" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:Link1'; document.forms['form01'].submit(); return false;">Link1</a><a id="form01:Link2" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:Link2'; document.forms['form01'].submit(); return false;">Link2</a> <input type="hidden" name="com.sun.faces.VIEW" value="_id47" />
>+ <input type="hidden" name="form01" value="form01" /><input type="hidden" name="form01:_idcl" />
> <script type="text/javascript">
> <!--
>-function clearFormHiddenParams__id0(curFormName) {
>+function clearFormHiddenParams_form01(curFormName) {
> var curForm = document.forms[curFormName];
>- curForm.elements['_id0:_idcl'].value = null;
>+ curForm.elements['form01:_idcl'].value = null;
> }
> //-->
> </script>
>-</form>
>- <form id="_id5" method="post" action="/jsf-systest/faces/taglib/commandLink_multiform_test.jsp;jsessionid=BFF4F36C354132F7B6978D51C6B85BDA" enctype="application/x-www-form-urlencoded">
>-
>-
>-
>- <a href="#" onclick="clearFormHiddenParams__id5('_id5');document.forms['_id5']['_id5:_idcl'].value='_id5:_id6'; document.forms['_id5'].submit(); return false;">Link3</a>
>-
>-
>- <a href="#" onclick="clearFormHiddenParams__id5('_id5');document.forms['_id5']['_id5:_idcl'].value='_id5:_id8'; document.forms['_id5'].submit(); return false;">Link4</a>
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIE1PjPF2LQAAK7CGUANAAAA" />
>- <input type="hidden" name="_id5" value="_id5" /><input type="hidden" name="_id5:_idcl" />
>+</form><form id="form02" method="post" action="/jsf-systest/faces/taglib/commandLink_multiform_test.jsp;jsessionid=2A0A18F251A1E7D69C3A84999CF9F4BE" enctype="application/x-www-form-urlencoded">
>+<a id="form02:Link3" href="#" onclick="clearFormHiddenParams_form02('form02');document.forms['form02']['form02:_idcl'].value='form02:Link3'; document.forms['form02'].submit(); return false;">Link3</a><a id="form02:Link4" href="#" onclick="clearFormHiddenParams_form02('form02');document.forms['form02']['form02:_idcl'].value='form02:Link4'; document.forms['form02'].submit(); return false;">Link4</a> <input type="hidden" name="com.sun.faces.VIEW" value="_id47" />
>+ <input type="hidden" name="form02" value="form02" /><input type="hidden" name="form02:_idcl" />
> <script type="text/javascript">
> <!--
>-function clearFormHiddenParams__id5(curFormName) {
>+function clearFormHiddenParams_form02(curFormName) {
> var curForm = document.forms[curFormName];
>- curForm.elements['_id5:_idcl'].value = null;
>+ curForm.elements['form02:_idcl'].value = null;
> }
> //-->
> </script>
> </form>
>-
> </body>
> </html>
>Index: systest/web/golden/taglib/commandLink_test.txt
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/golden/taglib/commandLink_test.txt,v
>retrieving revision 1.9
>diff -u -r1.9 commandLink_test.txt
>--- systest/web/golden/taglib/commandLink_test.txt 11 Mar 2005 18:14:13 -0000 1.9
>+++ systest/web/golden/taglib/commandLink_test.txt 26 Apr 2005 01:28:26 -0000
>@@ -10,18 +10,8 @@
> </head>
> <body>
>
>-
>- <form id="form01" method="post" action="/jsf-systest/faces/taglib/commandLink_test.jsp;jsessionid=2803EA73FA925C6D8474064E9211EF42" enctype="application/x-www-form-urlencoded">
>-
>- <a id="form01:hyperlink01" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink01'; document.forms['form01'].submit(); return false;">My Link</a>
>- <a id="form01:hyperlink02" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink02'; document.forms['form01'].submit(); return false;">This is a String property</a>
>- <a id="form01:hyperlink03" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink03'; document.forms['form01'].submit(); return false;">RES-BUNDLE LINK</a>
>- <a id="form01:hyperlink04" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink04'; document.forms['form01'].submit(); return false;"><img src="duke.gif" /></a>
>- <a id="form01:hyperlink05" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink05'; document.forms['form01'].submit(); return false;"><img src="resbundle_image.gif;jsessionid=2803EA73FA925C6D8474064E9211EF42" /></a>
>-
>-
>- <a id="form01:hyperlink06" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink06';document.forms['form01']['param1'].value='value1'; document.forms['form01'].submit(); return false;">Paramter Link</a>
>- <input type="hidden" name="com.sun.faces.VIEW" value="H4sIAAAAAAAAAFvzloG1hIE1PjPFyLIAAJXnbu0NAAAA" />
>+ <form id="form01" method="post" action="/jsf-systest/faces/taglib/commandLink_test.jsp;jsessionid=4D7360EF570BB08D9175350DBE06CFA1" enctype="application/x-www-form-urlencoded">
>+<a id="form01:hyperlink01" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink01'; document.forms['form01'].submit(); return false;">My Link</a><a id="form01:hyperlink02" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink02'; document.forms['form01'].submit(); return false;">This is a String property</a><a id="form01:hyperlink03" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink03'; document.forms['form01'].submit(); return false;">RES-BUNDLE LINK</a><a id="form01:hyperlink04" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink04'; document.forms['form01'].submit(); return false;"><img src="duke.gif" /></a><a id="form01:hyperlink05" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink05'; document.forms['form01'].submit(); return false;"><img src="resbundle_image.gif;jsessionid=4D7360EF570BB08D9175350DBE06CFA1" /></a><a id="form01:hyperlink06" href="#" onclick="clearFormHiddenParams_form01('form01');document.forms['form01']['form01:_idcl'].value='form01:hyperlink06';document.forms['form01']['param1'].value='value1'; document.forms['form01'].submit(); return false;">Paramter Link</a> <input type="hidden" name="com.sun.faces.VIEW" value="_id46" />
> <input type="hidden" name="form01" value="form01" /><input type="hidden" name="param1" /><input type="hidden" name="form01:_idcl" />
> <script type="text/javascript">
> <!--
>@@ -33,7 +23,6 @@
> //-->
> </script>
> </form>
>-
> </body>
> </html>
>
>Index: systest/web/taglib/commandLink_multiform_test.jsp
>===================================================================
>RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/web/taglib/commandLink_multiform_test.jsp,v
>retrieving revision 1.1
>diff -u -r1.1 commandLink_multiform_test.jsp
>--- systest/web/taglib/commandLink_multiform_test.jsp 8 Jun 2004 13:49:22 -0000 1.1
>+++ systest/web/taglib/commandLink_multiform_test.jsp 26 Apr 2005 01:28:26 -0000
>@@ -7,19 +7,19 @@
> <html>
> <body>
> <f:view>
>- <h:form >
>- <h:commandLink action="redirect">
>+ <h:form id="form01">
>+ <h:commandLink id ="Link1" action="redirect">
> <h:outputText value="Link1"/>
> </h:commandLink>
>- <h:commandLink action="redirect">
>+ <h:commandLink id ="Link2" action="redirect">
> <h:outputText value="Link2"/>
> </h:commandLink>
> </h:form>
>- <h:form>
>- <h:commandLink action="redirect">
>+ <h:form id="form02">
>+ <h:commandLink id ="Link3" action="redirect">
> <h:outputText value="Link3"/>
> </h:commandLink>
>- <h:commandLink action="forward">
>+ <h:commandLink id ="Link4" action="forward">
> <h:outputText value="Link4"/>
> </h:commandLink>
> </h:form>
>
>
>
>------------------------------------------------------------------------
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
>For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net
>
>