[jboss-cvs] JBossAS SVN: r105311 - in projects/jboss-jsf-int/trunk/jsf-deployer/src/main: resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2010-05-27 14:55:27 -0400 (Thu, 27 May 2010)
New Revision: 105311

Modified:
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml
Log:
JBAS-6638 Rename jsfImplementations property to jsfConfigurations


Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java	2010-05-27 18:51:42 UTC (rev 105310)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java	2010-05-27 18:55:27 UTC (rev 105311)
@@ -56,7 +56,7 @@
     private Collection<String> facesServlets;
 
     private String defaultJSFConfiguration;
-    private Map<String,URL> jsfImplementations;
+    private Map<String,URL> jsfConfigurations;
 
     private Map<String, JSFImplMetaData> jsfImplMetatData = new HashMap<String, JSFImplMetaData>();
 
@@ -77,18 +77,18 @@
     
     protected void createJSFImplMetaData() throws DeploymentException
     {
-        if (jsfImplementations == null)
+        if (jsfConfigurations == null)
         {
             log.warn("No JSF implementations specified in jsf-integration-deployer-jboss-beans.xml. Integrated JSF is disabled.");
             return;
         }
 
-        for (Iterator<String> impls = jsfImplementations.keySet().iterator(); impls.hasNext();)
+        for (Iterator<String> impls = jsfConfigurations.keySet().iterator(); impls.hasNext();)
         {
             String implName = impls.next();
             try
             {
-                jsfImplMetatData.put(implName, new JSFImplMetaData(implName, jsfImplementations.get(implName)));
+                jsfImplMetatData.put(implName, new JSFImplMetaData(implName, jsfConfigurations.get(implName)));
             }
             catch (Exception e)
             {
@@ -116,15 +116,15 @@
         this.defaultJSFConfiguration = defaultJSFConfig;
     }
 
-    public void setJsfImplementations(Map<String, String> jsfImpls) throws MalformedURLException
+    public void setJsfConfigurations(Map<String, String> jsfConfigs) throws MalformedURLException
     {
-        this.jsfImplementations = new HashMap<String, URL>(jsfImpls.size());
+        this.jsfConfigurations = new HashMap<String, URL>(jsfConfigs.size());
 
-        for (Iterator<String> impls = jsfImpls.keySet().iterator(); impls.hasNext();)
+        for (Iterator<String> configs = jsfConfigs.keySet().iterator(); configs.hasNext();)
         {
-            String implName = impls.next();
-            String strURL = StringPropertyReplacer.replaceProperties(jsfImpls.get(implName));
-            jsfImplementations.put(implName, new URL(strURL));
+            String configName = configs.next();
+            String strURL = StringPropertyReplacer.replaceProperties(jsfConfigs.get(configName));
+            jsfConfigurations.put(configName, new URL(strURL));
         }
     }
 

Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-05-27 18:51:42 UTC (rev 105310)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-05-27 18:55:27 UTC (rev 105311)
@@ -39,7 +39,7 @@
             http://www.test.com/jsfimpl/myfaces/
                  scans the specified WebDAV location
     -->
-    <property name="jsfImplementations">
+    <property name="jsfConfigurations">
       <map keyClass="java.lang.String" valueClass="java.lang.String">
         <entry>
           <key>Mojarra-1.2</key>