
<< http://java.net/jira/browse/JAVASERVERFACES-1943 >>


SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/facelets/el/ContextualCompositeMethodExpression.java
--- Make UIComponent "cc" ivar transient
M       jsf-test/build.xml
--- Include JAVASERVERFACES-1943 in test harness.


A       jsf-test/JAVASERVERFACES-1943
A       jsf-test/JAVASERVERFACES-1943/htmlunit
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces/systest
A       jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces/systest/Issue1943TestCase.java
--- HtmlUnit test
A       jsf-test/JAVASERVERFACES-1943/htmlunit/pom.xml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java/vc
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java/vc/Bean.java
--- Test Bean
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index_action.xhtml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index.xhtml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/template.xhtml
--- Test pages
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/faces-config.xml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/web.xml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/classes
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/classes/test
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/vccomponent.xhtml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/outer.xhtml
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/component1.xhtml
--- Test composite component pages
A       jsf-test/JAVASERVERFACES-1943/i_jsf_1943/pom.xml
A       jsf-test/JAVASERVERFACES-1943/build.xml


SECTION: Diffs
----------------------------
Index: jsf-ri/src/main/java/com/sun/faces/facelets/el/ContextualCompositeMethodExpression.java
===================================================================
--- jsf-ri/src/main/java/com/sun/faces/facelets/el/ContextualCompositeMethodExpression.java	(revision 9035)
+++ jsf-ri/src/main/java/com/sun/faces/facelets/el/ContextualCompositeMethodExpression.java	(working copy)
@@ -129,7 +129,7 @@
     private final MethodExpression delegate;
     private final ValueExpression source;
     private final Location location;
-    private final UIComponent cc;
+    private final transient UIComponent cc;
 
 
     // -------------------------------------------------------- Constructors
Index: jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces/systest/Issue1943TestCase.java
===================================================================
--- jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces/systest/Issue1943TestCase.java	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/htmlunit/src/main/java/com/sun/faces/systest/Issue1943TestCase.java	(revision 0)
@@ -0,0 +1,116 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.faces.systest;
+
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlOption;
+import com.gargoylesoftware.htmlunit.html.HtmlSelect;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
+import com.sun.faces.htmlunit.HtmlUnitFacesTestCase;
+import java.util.ArrayList;
+import java.util.List;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+public class Issue1943TestCase extends HtmlUnitFacesTestCase {
+
+    public Issue1943TestCase(String name) {
+        super(name);
+    }
+
+    /**
+     * Set up instance variables required by this test case.
+     */
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+
+    /**
+     * Return the tests included in this test suite.
+     */
+    public static Test suite() {
+        return (new TestSuite(Issue1943TestCase.class));
+    }
+
+    /**
+     * Tear down instance variables required by this test case.
+     */
+    public void tearDown() {
+        super.tearDown();
+    }
+
+
+    // ------------------------------------------------------------ Test Methods
+
+    public void testBasicAppFunctionality() throws Exception {
+
+        HtmlPage page = null;
+
+        page = getPage("/faces/Index.xhtml");
+        List<HtmlSelect> selectList = getAllElementsOfGivenClass(page,
+            new ArrayList<HtmlSelect>(), HtmlSelect.class);
+        HtmlSelect select = selectList.get(0);
+        List<HtmlOption> options = select.getOptions();
+        select.setSelectedAttribute(options.get(0), true);
+        List<HtmlSubmitInput> buttonList = new ArrayList<HtmlSubmitInput>(1);
+        getAllElementsOfGivenClass(page, buttonList, HtmlSubmitInput.class);
+        HtmlSubmitInput submitButton = buttonList.get(0);
+        page = (HtmlPage)submitButton.click();
+        assertTrue(page.asText().contains("valueChange Called"));
+
+        page = getPage("/faces/Index_action.xhtml");
+        buttonList = new ArrayList<HtmlSubmitInput>(2);
+        getAllElementsOfGivenClass(page, buttonList, HtmlSubmitInput.class);
+        HtmlSubmitInput submitButton1 = buttonList.get(0);
+        HtmlSubmitInput submitButton2 = buttonList.get(1);
+        page = (HtmlPage)submitButton1.click();
+        assertTrue(page.asText().contains("removeGroup Called"));
+        page = (HtmlPage)submitButton2.click();
+        assertTrue(!page.asText().contains("removeGroup Called"));
+
+    }
+
+}
+
+
Index: jsf-test/JAVASERVERFACES-1943/htmlunit/pom.xml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/htmlunit/pom.xml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/htmlunit/pom.xml	(revision 0)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>com.sun.faces.test</groupId>
+   <artifactId>i_jsf_1943_htmlunit</artifactId>
+   <packaging>jar</packaging>
+   <name>i_jsf_1943_htmlunit</name>
+   <version>2.0</version>
+
+   <description></description>
+
+   <properties>
+
+   </properties>
+
+   <dependencies>
+
+      <dependency>
+	<artifactId>htmlunit</artifactId>
+	<groupId>net.sourceforge.htmlunit</groupId>
+	<version>2.4</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>3.8.1</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+	<groupId>com.sun.faces.extensions</groupId>
+	<artifactId>jsf-extensions-test-time</artifactId>
+	<version>2.0</version>
+	<scope>provided</scope>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.0.2</version>
+            <configuration>
+               <source>1.6</source>
+               <target>1.6</target>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <version>2.1-alpha-2</version>
+            <configuration>
+               <failOnMissingWebXml>false</failOnMissingWebXml>
+            </configuration>
+         </plugin>
+
+      </plugins>
+      <finalName>i_jsf_1943_htmlunit</finalName>
+   </build>
+
+   <repositories>
+     <repository>
+       <id>java.net</id>
+       <name>java.net</name>
+       <url>http://download.java.net/maven/2</url>
+       <layout>default</layout>
+     </repository>
+   </repositories>
+
+</project>
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java/vc/Bean.java
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java/vc/Bean.java	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/java/vc/Bean.java	(revision 0)
@@ -0,0 +1,46 @@
+package vc;
+
+import java.io.Serializable;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ValueChangeEvent;
+
+@ManagedBean
+@SessionScoped
+public class Bean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public Bean() {
+    }
+
+    public void valueChange(ValueChangeEvent vce) throws AbortProcessingException {
+        System.err.println("VALUECHANGE CALLED!!!");
+        FacesMessage fMsg = new FacesMessage(FacesMessage.SEVERITY_INFO,
+            "valueChange Called...", null);
+        FacesContext.getCurrentInstance().addMessage(null, fMsg); 
+
+    }
+
+    private String groupToAdd = "select one";
+
+    public String getGroupToAdd() { return groupToAdd; }
+
+    public void setGroupToAdd(String groupToAdd) {
+        this.groupToAdd = groupToAdd;
+    }
+
+    public String removeGroup() { 
+        System.err.println("REMOVEGROUP CALLED!!!");
+        FacesMessage fMsg = new FacesMessage(FacesMessage.SEVERITY_INFO,
+            "removeGroup Called...", null);
+        FacesContext.getCurrentInstance().addMessage(null, fMsg); 
+        return null; 
+    }
+
+
+}
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index_action.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index_action.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index_action.xhtml	(revision 0)
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+<body>
+
+
+<ui:composition template="/template.xhtml">
+
+
+
+    <ui:define name="body">
+        <gc:component1 bean="#{bean}"/>
+
+    <h:commandButton value="Refresh"/>
+
+        <h:messages styleClass="errorMessage" showDetail="true"/>
+
+    </ui:define>
+
+    This text will not be displayed.
+
+
+</ui:composition>
+
+This text below will also not be displayed.
+
+</body>
+</html>
\ No newline at end of file
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/Index.xhtml	(revision 0)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+<body>
+
+
+<ui:composition template="/template.xhtml">
+
+
+
+    <ui:define name="body">
+        <gc:vccomponent bean="#{bean}"/>
+
+
+        <h:messages styleClass="errorMessage" showDetail="true"/>
+
+    </ui:define>
+
+    This text will not be displayed.
+
+
+</ui:composition>
+
+This text below will also not be displayed.
+
+</body>
+</html>
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/template.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/template.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/template.xhtml	(revision 0)
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+<h:head>
+</h:head>
+<h:body>
+
+    <table width="100%">
+        <tr>
+            <td>
+
+                <table cellpadding="0" width="100%">
+                    <tr>
+                        <td>
+                            <table width="100%">
+                                <tr>
+                                    <td style="vertical-align: top; width: 90%">
+                                    </td>
+                                    <td align="right" style="vertical-align: top;">
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+
+                            <h:form id="form"> <!-- for easy ajax -->
+                                <!--<ui:debug hotkey="i"/> -->
+                                <!-- ctrl+shift+i - shows popup with some debug info, not very useful, but try it -->
+
+                                <table width="100%">
+                                    <tr valign="top">
+                                        <td>
+                                            <table width="100%">
+                                                <tr>
+                                                    <td style="width: 100%;" colspan="2">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="2">
+                                                        <h:panelGroup rendered="#{not notitle}">
+                                                            <h1>
+                                                                <ui:insert name="pagetitle">
+                                                                    <ui:insert name="title">Unspecified title
+                                                                    </ui:insert>
+                                                                </ui:insert>
+                                                            </h1>
+                                                        </h:panelGroup>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td width="50%" valign="top">
+                                                        <ui:insert name="status"></ui:insert>
+                                                    </td>
+                                                    <td width="50%" valign="top" align="right">
+                                                        <ui:insert name="action"></ui:insert>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="2" height="100%">
+                                                        <ui:insert name="body">Unspecified body</ui:insert>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </h:form>
+
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div align="center">
+                                <h:outputText value="DEVELOPMENT, build timestamp 20110211-0255"/>
+                                <br/>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+
+            </td>
+        </tr>
+    </table>
+
+</h:body>
+</html>
+  
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/faces-config.xml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/faces-config.xml	(revision 0)
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<faces-config version="2.0"
+              xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+
+</faces-config>
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/web.xml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/WEB-INF/web.xml	(revision 0)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>Test Frontend</display-name>
+
+
+    <context-param>
+        <param-name>com.sun.faces.verifyObjects</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>com.sun.faces.validateXml</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>server</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+        <param-value>.xhtml</param-value>
+    </context-param>
+
+    <!--<context-param>-->
+    <!--<param-name>javax.faces.PARTIAL_STATE_SAVING</param-name>-->
+    <!--<param-value>true</param-value>-->
+    <!--</context-param>-->
+
+    <!--<context-param>-->
+    <!--<param-name>javax.faces.FACELETS_LIBRARIES</param-name>-->
+    <!--<param-value>/WEB-INF/jobgraph.taglib.xml</param-value>-->
+    <!--</context-param>-->
+
+    <context-param>
+        <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>faces/Index.xhtml</welcome-file>
+    </welcome-file-list>
+
+</web-app>
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/vccomponent.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/vccomponent.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/vccomponent.xhtml	(revision 0)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:composite="http://java.sun.com/jsf/composite"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+
+<body>
+<composite:interface name="groupsTable">
+    <composite:attribute name="bean" required="true" shortDescription="a controller"/>
+</composite:interface>
+<composite:implementation>
+<h:selectOneListbox value="#{cc.attrs.bean.groupToAdd}"
+                    valueChangeListener="#{cc.attrs.bean.valueChange}"
+                    immediate="true"
+                    hideNoSelectionOption="false">
+   <f:selectItem itemValue="4" itemLabel="Bobby Orr" />
+   <f:selectItem itemValue="10" itemLabel="Guy Lafleur"/>
+</h:selectOneListbox>
+<h:commandButton id="submit" value="submit"/>
+</composite:implementation>
+</body>
+</html>
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/outer.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/outer.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/outer.xhtml	(revision 0)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:composite="http://java.sun.com/jsf/composite"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+
+<body>
+<composite:interface name="outer"/>
+<composite:implementation>
+    (<composite:insertChildren/>)
+</composite:implementation>
+</body>
+</html>
\ No newline at end of file
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/component1.xhtml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/component1.xhtml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/src/main/webapp/resources/components/component1.xhtml	(revision 0)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:composite="http://java.sun.com/jsf/composite"
+      xmlns:gc="http://java.sun.com/jsf/composite/components">
+
+<body>
+<composite:interface name="groupsTable">
+    <composite:attribute name="bean" required="true" shortDescription="a controller"/>
+</composite:interface>
+<composite:implementation>
+    <gc:outer>
+        <h:commandButton action="#{cc.attrs.bean.removeGroup}" value="Remove"/>
+    </gc:outer>
+</composite:implementation>
+</body>
+</html>
\ No newline at end of file
Index: jsf-test/JAVASERVERFACES-1943/i_jsf_1943/pom.xml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/i_jsf_1943/pom.xml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/i_jsf_1943/pom.xml	(revision 0)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.sun.faces.regression</groupId>
+    <artifactId>i_jsf_1943</artifactId>
+    <version>1.0</version>
+    <packaging>war</packaging>
+    <build>
+        <finalName>i_jsf_1943</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                                    
+                        <configuration>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+        <extensions>
+            <extension>
+                <groupId>org.jvnet.wagon-svn</groupId>
+                <artifactId>wagon-svn</artifactId>
+                <version>1.12</version>
+            </extension>
+        </extensions>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>6.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+
+    <distributionManagement>
+        <repository>
+            <uniqueVersion>false</uniqueVersion>
+            <id>java.net-maven2-repository</id>
+            <url>java-net:/maven2-repository~svn/trunk/repository/</url>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <name>java.net</name>
+            <url>http://download.java.net/maven/2</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+</project>
+
+
Index: jsf-test/JAVASERVERFACES-1943/build.xml
===================================================================
--- jsf-test/JAVASERVERFACES-1943/build.xml	(revision 0)
+++ jsf-test/JAVASERVERFACES-1943/build.xml	(revision 0)
@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+
+<!-- ************ JSF build file ************************************** -->
+
+<project name="JAVASERVERFACES-1943" default="test" basedir=".">
+
+    <property file="../../build.properties"/>
+    <path id="1943.classpath">  
+        <path refid="html.classpath" />
+        <pathelement location="${basedir}/htmlunit/target/classes"/>
+    </path>
+
+    <import file="${jsf.build.home}/common/ant/common.xml"/>
+
+    <target name="build">
+
+      <jsf.mvn dir="${basedir}/i_jsf_1943" goals="install" />
+      <jsf.mvn dir="${basedir}/htmlunit" goals="install" />
+
+    </target>    
+
+    <target name="clean">
+
+      <jsf.mvn dir="${basedir}/i_jsf_1943" goals="clean" />
+      <jsf.mvn dir="${basedir}/htmlunit" goals="clean" />
+
+    </target>    
+
+    <target name="install">
+      <deploy.artifact
+              artifact="${basedir}/i_jsf_1943/target/i_jsf_2025.war"
+              appName="i_jsf_1943"/>
+
+    </target>    
+
+    <target name="remove">
+
+      <undeploy.artifact
+              artifact="${basedir}/i_jsf_1943/target/i_jsf_2025.war"
+              appName="i_jsf_1943"/>
+
+    </target>    
+
+    <target name="test" depends="define.scenario.aware.port">
+
+      <jsf.junit context-path="/i_jsf_1943"
+                 classpath-refid="1943.classpath"    
+                 test-results-dir="${regression.test.results.dir}">
+          <tests>
+            <fileset dir="${basedir}/htmlunit/target/classes"
+                     includes="com/sun/faces/systest/Issue1943TestCase.class"/> 
+          </tests>
+      </jsf.junit>
+
+    </target>    
+
+
+        
+</project>
Index: jsf-test/build.xml
===================================================================
--- jsf-test/build.xml	(revision 9035)
+++ jsf-test/build.xml	(working copy)
@@ -64,7 +64,7 @@
                      JAVASERVERFACES-1856,JAVASERVERFACES-1655,JAVASERVERFACES-1542" />
 
     <property name="container-agnostic-applications" value="
-                    JAVASERVERFACES-1958,JAVASERVERFACES-2038,JAVASERVERFACES-2025,JAVASERVERFACES-1637,JAVASERVERFACES-2052,JAVASERVERFACES_SPEC_PUBLIC-997" />
+                    JAVASERVERFACES-1958,JAVASERVERFACES-2038,JAVASERVERFACES-2025,JAVASERVERFACES-1637,JAVASERVERFACES-2052,JAVASERVERFACES_SPEC_PUBLIC-997,JAVASERVERFACES-1943" />
 
     <target name="main" depends="define.applications"
             description="">


SECTION: New Files
----------------------------
SEE ATTACHMENTS