Index: jsf-ri/src/main/java/com/sun/faces/spi/HighAvailabilityEnabler.java =================================================================== --- jsf-ri/src/main/java/com/sun/faces/spi/HighAvailabilityEnabler.java (revision 0) +++ jsf-ri/src/main/java/com/sun/faces/spi/HighAvailabilityEnabler.java (revision 0) @@ -0,0 +1,55 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-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 com.sun.faces.spi; + +import javax.servlet.ServletContext; + +/** + * This interface is for JSF to check if the app server has HA enabled. + * + * @author sheetalv + */ +public interface HighAvailabilityEnabler { + + public void enableHighAvailability(ServletContext ctx); + +} Index: jsf-ri/src/main/java/com/sun/faces/spi/AnnotationScanner.java =================================================================== --- jsf-ri/src/main/java/com/sun/faces/spi/AnnotationScanner.java (revision 0) +++ jsf-ri/src/main/java/com/sun/faces/spi/AnnotationScanner.java (revision 0) @@ -0,0 +1,65 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-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 com.sun.faces.spi; + +import java.net.URI; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; + +/** + * + */ +public interface AnnotationScanner { + + public abstract Map> getAnnotatedClassesInCurrentModule(ServletContext extContext) + throws InjectionProviderException; + + public interface ScannedAnnotation { + + public Collection getDefiningURIs(); + + public String getFullyQualifiedClassName(); + + } +} Index: jsf-ri/src/main/java/com/sun/faces/config/ConfigManager.java =================================================================== --- jsf-ri/src/main/java/com/sun/faces/config/ConfigManager.java (revision 8807) +++ jsf-ri/src/main/java/com/sun/faces/config/ConfigManager.java (working copy) @@ -110,6 +110,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.lang.annotation.Annotation; +import java.net.URI; +import java.util.Iterator; import org.w3c.dom.*; import org.xml.sax.SAXParseException; @@ -1090,7 +1092,28 @@ * ConfigurationResourceProvider */ public Collection call() throws Exception { - return provider.getResources(sc); + Collection result = Collections.emptyList(); + Collection collection = provider.getResources(sc); + if (!collection.isEmpty()) { + result = new ArrayList(); + Iterator iter = collection.iterator(); + Object cur = iter.next(); + if (cur instanceof URL) { + do { + result.add((URL)cur); + cur = (iter.hasNext()) ? iter.next() : null; + } while (null != cur); + } else if (cur instanceof URI) { + do { + result.add(((URI)cur).toURL()); + cur = (iter.hasNext()) ? iter.next() : null; + } while (null != cur); + } else { + throw new IllegalArgumentException("Expected argument of type URI or URL, instead type is " + + cur.getClass().getName()); + } + } + return result; } } // END URLTask