svn commit: r1471819 - in /myfaces/core/trunk: api/src/main/java/javax/faces/ api/src/main/java/javax/faces/application/ impl/src/main/java/org/apache/myfaces/config/

[lu...@apache.org]

Author: lu4242
Date: Thu Apr 25 03:07:40 2013
New Revision: 1471819

URL: http://svn.apache.org/r1471819
Log:
MYFACES-3679 rename to ApplicationConfigurationPopulator

Added:
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationConfigurationPopulator.java
      - copied, changed from r1470662, myfaces/core/trunk/api/src/main/java/javax/faces/ApplicationConfigurationResourceDocumentPopulator.java
Removed:
    myfaces/core/trunk/api/src/main/java/javax/faces/ApplicationConfigurationResourceDocumentPopulator.java
Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java

Copied: myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationConfigurationPopulator.java (from r1470662, myfaces/core/trunk/api/src/main/java/javax/faces/ApplicationConfigurationResourceDocumentPopulator.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationConfigurationPopulator.java?p2=myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationConfigurationPopulator.java&p1=myfaces/core/trunk/api/src/main/java/javax/faces/ApplicationConfigurationResourceDocumentPopulator.java&r1=1470662&r2=1471819&rev=1471819&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/ApplicationConfigurationResourceDocumentPopulator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationConfigurationPopulator.java Thu Apr 25 03:07:40 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package javax.faces;
+package javax.faces.application;
 
 import org.w3c.dom.Document;
 
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
  *
  * @author Leonardo Uribe
  */
-public abstract class ApplicationConfigurationResourceDocumentPopulator
+public abstract class ApplicationConfigurationPopulator
 {
     
     public abstract void populateApplicationConfigurationResource(Document toPopulate);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java?rev=1471819&r1=1471818&r2=1471819&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java Thu Apr 25 03:07:40 2013
@@ -48,7 +48,7 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.faces.ApplicationConfigurationResourceDocumentPopulator;
+import javax.faces.application.ApplicationConfigurationPopulator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -439,8 +439,8 @@ public class DefaultFacesConfigurationPr
     public List<FacesConfig> getApplicationConfigurationResourceDocumentPopulatorFacesConfig(ExternalContext ectx)
     {
         ServiceProviderFinder spff = ServiceProviderFinderFactory.getServiceProviderFinder(ectx);
-        ServiceLoader<ApplicationConfigurationResourceDocumentPopulator> instances = 
-            spff.load(ApplicationConfigurationResourceDocumentPopulator.class);
+        ServiceLoader<ApplicationConfigurationPopulator> instances = 
+            spff.load(ApplicationConfigurationPopulator.class);
         if (instances != null)
         {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -465,7 +465,7 @@ public class DefaultFacesConfigurationPr
             {
                 List<FacesConfig> facesConfigList = new ArrayList<FacesConfig>();
                 List<Document> documentList = new ArrayList<Document>();
-                for (ApplicationConfigurationResourceDocumentPopulator populator : instances)
+                for (ApplicationConfigurationPopulator populator : instances)
                 {
                     // Spec says "... For each implementation, create a fresh org.w3c.dom.Document 
                     // instance, configured to be in the XML namespace of the