Modify web module descrimination code in DelegateToGlassfishAnnotationScanner http://java.net/jira/browse/GLASSFISH-16847


SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/config/DelegateToGlassFishAnnotationScanner.java

- In order to keep JAVASERVERFACES-1995 from re-opening, we need to
  specifically account for the EAR case and the WAR case when working
  through the information returned from
  getAnnotatedClassesInCurrentModule() in the jsf-connector.jar module.  

M       jsf-test/build.xml

Hook up new test

A       jsf-test/GLASSFISH-16847
A       jsf-test/GLASSFISH-16847/jsftest
A       jsf-test/GLASSFISH-16847/jsftest/src
A       jsf-test/GLASSFISH-16847/jsftest/src/test
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest
A       jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
A       jsf-test/GLASSFISH-16847/jsftest/src/main
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/test
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java
A       jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
A       jsf-test/GLASSFISH-16847/jsftest/src/main/webapp
A       jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/index.xhtml
A       jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF
A       jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/sun-web.xml
A       jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/web.xml
A       jsf-test/GLASSFISH-16847/jsftest/pom.xml
A       jsf-test/GLASSFISH-16847/build.xml

- The new test.


SECTION: Diffs
----------------------------
Index: jsf-ri/src/main/java/com/sun/faces/config/DelegateToGlassFishAnnotationScanner.java
===================================================================
--- jsf-ri/src/main/java/com/sun/faces/config/DelegateToGlassFishAnnotationScanner.java	(revision 9175)
+++ jsf-ri/src/main/java/com/sun/faces/config/DelegateToGlassFishAnnotationScanner.java	(working copy)
@@ -45,15 +45,21 @@
 import com.sun.faces.util.FacesLogger;
 import static com.sun.faces.spi.AnnotationScanner.ScannedAnnotation;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.el.PropertyNotFoundException;
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletContext;
 
@@ -86,9 +92,52 @@
 
         return processClassList(classList);
     }
-
+    
+    private String getCurrentWebModulePrefix(ExternalContext extContext) {
+        String result = null;
+        Object deploymentContext = extContext.getApplicationMap().get("com.sun.enterprise.web.WebModule.DeploymentContext");
+        if (null != deploymentContext) {
+            try {
+                // If this module is a war or an exploded war, then this will give the 
+                // prefix.
+                Method getSource = deploymentContext.getClass().getDeclaredMethod("getSource");
+                Object source = getSource.invoke(deploymentContext, (Object[]) null);
+                if (null != source) {
+                    Method getName = source.getClass().getDeclaredMethod("getName");
+                    if (null != getName) {
+                        result = (String) getName.invoke(source, (Object[]) null);
+                    }
+                
+                }
+                
+            } catch (Exception e) {
+            }
+        }
+        if (null == result) {
+            try {
+                // If this module is an ear, then this will give the prefix.
+                Method getModuleUri = deploymentContext.getClass().getMethod("getModuleUri");
+                if (null != getModuleUri) {
+                    result = (String) getModuleUri.invoke(deploymentContext, (Object[]) null);
+                    if (null != result && result.endsWith(".war")) {
+                        result = result.substring(0, result.length() - 4);
+                    }
+                }
+                
+            } catch (Exception e) {
+                
+            }
+        }
+                
+        if (null == result) {
+            result = extContext.getApplicationContextPath();
+        }
+        
+        return result;
+    }
+    
     private void processAnnotations(Set<String> classList) {
-        String contextPath = FacesContext.getCurrentInstance().getExternalContext().getApplicationContextPath();
+        String archiveName = getCurrentWebModulePrefix(FacesContext.getCurrentInstance().getExternalContext());
         try {
             Map<String, List<ScannedAnnotation>> classesByAnnotation = annotationScanner.getAnnotatedClassesInCurrentModule(this.sc);
 
@@ -107,11 +156,11 @@
                             // If the class is in the current web module
                             boolean currentClassIsInCurrentWebModule =
                                 (uriString.endsWith("WEB-INF/classes") || uriString.endsWith("WEB-INF/classes/")) &&
-                                uriString.contains(contextPath);
+                                uriString.contains(archiveName);
                             // or it is from a jar that is *not* within a web module...
                             boolean currentClassIsInJarNotInAnyWebModule = 
                                     uriString.endsWith(".jar") && 
-                                    !uriString.contains(contextPath) &&
+                                    !uriString.contains(archiveName) &&
                                     !uriString.contains("WEB-INF/classes");
                             if (currentClassIsInCurrentWebModule || 
                                 currentClassIsInJarNotInAnyWebModule) {
Index: jsf-test/build.xml
===================================================================
--- jsf-test/build.xml	(revision 9175)
+++ jsf-test/build.xml	(working copy)
@@ -62,7 +62,8 @@
               value="GLASSFISH-11636,
                      GLASSFISH-15985,
                      JAVASERVERFACES-1856,JAVASERVERFACES-1655,
-                     JAVASERVERFACES-2033" />
+                     JAVASERVERFACES-2033,
+                     GLASSFISH-16847" />
 
     <property name="container-agnostic-applications" value="
                     JAVASERVERFACES-1958,
Index: jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java	(revision 0)
@@ -0,0 +1,138 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2010-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 org.glassfish.tests.embedded.jsftest;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+
+public class JSFTest {
+
+    @Test
+    public void testWeb() throws Exception {
+
+        disableCertValidation();
+
+        goGet("http://localhost:8080/hellojsf/JSFTestServlet", "Created viewRoot");
+        
+        // test non secure access.
+        goGet("http://localhost:8080/hellojsf", "BHAVANI", "SHANKAR", "Mr. X");
+
+        // test secure access.
+        goGet("https://localhost:8181/hellojsf", "BHAVANI", "SHANKAR", "Mr. X");
+    }
+
+    private static void goGet(String url, String... match) throws Exception {
+        try {
+
+            URL servlet = new URL(url);
+            HttpURLConnection uc = (HttpURLConnection) servlet.openConnection();
+            System.out.println("\nURLConnection = " + uc + " : ");
+            if (uc.getResponseCode() != 200) {
+                throw new Exception("Servlet did not return 200 OK response code");
+            }
+
+            BufferedReader in = new BufferedReader(new InputStreamReader(
+                    uc.getInputStream()));
+            String line = null;
+            boolean[] found = new boolean[match.length];
+
+            int count = 0;
+            while ((line = in.readLine()) != null) {
+                System.out.println(line);
+                for (String m : match) {
+                    int index = line.indexOf(m);
+                    if (index != -1 && count < match.length) {
+                        found[count++] = true;
+                        System.out.println("Found [" + m + "] in the response, index = " + count);
+                        break;
+                    }
+                }
+            }
+
+            for (boolean f : found) {
+                Assert.assertTrue(f);
+            }
+            System.out.println("\n***** SUCCESS **** Found all matches in the response.*****\n");
+            in.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    public static void disableCertValidation() {
+        // Create a trust manager that does not validate certificate chains
+        TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+            public X509Certificate[] getAcceptedIssuers() {
+                return null;
+            }
+
+            public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                return;
+            }
+
+            public void checkServerTrusted(X509Certificate[] certs, String authType) {
+                return;
+            }
+        }};
+
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        } catch (Exception e) {
+            return;
+        }
+    }
+
+
+}
Index: jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java	(revision 0)
@@ -0,0 +1,92 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 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 org.glassfish.tests.embedded.jsftest;
+
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
+import javax.faces.lifecycle.LifecycleFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author bhavanishankar@java.net
+ */
+
+public class JSFTestServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request,
+                         HttpServletResponse response) throws ServletException, IOException {
+        FacesContextFactory facesContextFactory =
+                (FacesContextFactory) FactoryFinder.getFactory(
+                        FactoryFinder.FACES_CONTEXT_FACTORY);
+
+        LifecycleFactory lifecycleFactory =
+                (LifecycleFactory) FactoryFinder.getFactory(
+                        FactoryFinder.LIFECYCLE_FACTORY);
+
+        ServletContext context = getServletContext();
+        FacesContext facesContext =
+                facesContextFactory.getFacesContext(context,
+                        request,
+                        response,
+                        lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE));
+
+        Application application = facesContext.getApplication();
+        ViewHandler viewHandler = application.getViewHandler();
+        UIViewRoot viewRoot = viewHandler.createView(facesContext, null);
+        facesContext.setViewRoot(viewRoot);
+
+        PrintWriter pw = response.getWriter();
+        pw.println("Created viewRoot " + viewRoot);
+        pw.flush();
+        pw.close();
+    }
+}
Index: jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java	(revision 0)
@@ -0,0 +1,87 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2010 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 org.glassfish.tests.embedded.jsftest;
+
+import javax.faces.bean.ManagedBean;
+
+/**
+ * @author bhavanishankar@java.net
+ */
+
+@ManagedBean(name = "testbean")
+public class JSFTestBean {
+
+    public TestTable[] getTestTable() {
+        return testTable;
+    }
+
+    private TestTable[] testTable = new TestTable[]{
+            new TestTable("BHAVANI", "+91999000000", "INDIA"),
+            new TestTable("SHANKAR", "+199999999999", "USA"),
+            new TestTable("Mr. X", "+122222222", "SFO"),
+    };
+
+    
+    public class TestTable {
+        String name;
+        String number;
+        String country;
+
+        public TestTable(String name, String phone, String country) {
+            this.name = name;
+            this.number = phone;
+            this.country = country;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+
+        public String getCountry() {
+            return country;
+        }
+    }
+
+}
Index: jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/index.xhtml
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/index.xhtml	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/index.xhtml	(revision 0)
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+  ~
+  ~ Copyright (c) 2010 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.
+  -->
+
+<!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:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+    <title>JSF Test</title>
+</h:head>
+<h:body>
+    <f:view>
+        <h:form>
+            <h:dataTable value="#{testbean.testTable}" var="tableEntry">
+                
+                <f:facet name="header">
+                    <h:outputText value="JSF Table"/>
+                </f:facet>
+
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="name"/>
+                    </f:facet>
+                    <h:outputText value="#{tableEntry.name}"></h:outputText>
+                </h:column>
+
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="number"/>
+                    </f:facet>
+                    <h:outputText value="#{tableEntry.number}"></h:outputText>
+                </h:column>
+
+                <h:column>
+                    <f:facet name="header">
+                        <h:outputText value="country"/>
+                    </f:facet>
+                    <h:outputText value="#{tableEntry.country}"></h:outputText>
+                </h:column>
+
+            </h:dataTable>
+        </h:form>
+    </f:view>
+</h:body>
+</html>
+
Index: jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/sun-web.xml
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/sun-web.xml	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/sun-web.xml	(revision 0)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+  ~
+  ~ Copyright (c) 2010 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.
+  -->
+
+<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD GlassFish Application Server 3.0 Servlet 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_3_0-0.dtd">
+<sun-web-app error-url="">
+  <context-root>/hellojsf</context-root>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class' java code.</description>
+    </property>
+  </jsp-config>
+</sun-web-app>
Index: jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/web.xml	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/src/main/webapp/WEB-INF/web.xml	(revision 0)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+  ~
+  ~ Copyright (c) 2010-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.
+  -->
+
+<web-app version="3.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-app_3_0.xsd">
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</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>
+        <servlet-name>JSFTestServlet</servlet-name>
+        <servlet-class>org.glassfish.tests.embedded.jsftest.JSFTestServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>JSFTestServlet</servlet-name>
+        <url-pattern>/JSFTestServlet</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>faces/index.xhtml</welcome-file>
+    </welcome-file-list>
+</web-app>
Index: jsf-test/GLASSFISH-16847/jsftest/pom.xml
===================================================================
--- jsf-test/GLASSFISH-16847/jsftest/pom.xml	(revision 0)
+++ jsf-test/GLASSFISH-16847/jsftest/pom.xml	(revision 0)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2010-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>org.glassfish.tests.embedded.maven-plugin</groupId>
+    <artifactId>jsftest</artifactId>
+    <packaging>war</packaging>
+    <version>3.2-SNAPSHOT</version>
+    <name>Test JSF (maven-plugin/jsftest)</name>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <finalName>jsftest</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+        <extensions>
+            <extension>
+                <groupId>org.jvnet.wagon-svn</groupId>
+                <artifactId>wagon-svn</artifactId>
+                <version>1.8</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>
+
+</project>
+
Index: jsf-test/GLASSFISH-16847/build.xml
===================================================================
--- jsf-test/GLASSFISH-16847/build.xml	(revision 0)
+++ jsf-test/GLASSFISH-16847/build.xml	(revision 0)
@@ -0,0 +1,91 @@
+<?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="GLASSFISH-16847" default="test" basedir=".">
+
+    <property file="../../build.properties"/>
+    <path id="16847.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}/jsftest" goals="install" />
+    </target>    
+
+    <target name="clean">
+        <jsf.mvn dir="${basedir}/jsftest" goals="clean" />
+    </target>    
+
+    <target name="install">
+    </target>    
+
+    <target name="remove">
+        <undeploy.artifact
+              artifact="${basedir}/i_jsf_2052/target/jsftest.war"
+              appName="jsftest"/>
+    </target>    
+
+    <target name="test" depends="define.scenario.aware.port">
+        <deploy.artifact
+              artifact="${basedir}/jsftest/target/jsftest.war"
+              appName="jsftest"/>
+         <jsf.tester request="/" 
+                    context-path="/hellojsf"
+                    classpath-refid="16847.classpath"    
+                    regexp="(?s).*BHAVANI.*.91999000000.*INDIA.*SHANKAR.*.199999999999.*USA.*Mr.*X.*.122222222.*SFO.*"
+                    test-results-dir="${regression.test.results.dir}"/>
+         <antcall target="remove" />
+         <deploydir.artifact
+              explodedWarDir="${basedir}/jsftest/target/jsftest"
+              appName="jsftest"/>
+          <jsf.tester request="/" 
+                    context-path="/jsftest"
+                    classpath-refid="16847.classpath"    
+                    regexp="(?s).*BHAVANI.*.91999000000.*INDIA.*SHANKAR.*.199999999999.*USA.*Mr.*X.*.122222222.*SFO.*"
+                    test-results-dir="${regression.test.results.dir}"/>
+    </target>    
+
+</project>


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