[jboss-cvs] JBossAS SVN: r107246 - in projects/jboss-jsf-int/trunk: jsf-deployer/src/main/java/org/jboss/jsf/deployer and 1 other directories.

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

Author: stan.silvert at jboss.com
Date: 2010-07-30 14:33:10 -0400 (Fri, 30 Jul 2010)
New Revision: 107246

Modified:
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml
   projects/jboss-jsf-int/trunk/releasenotes.txt
Log:
JBAS-8272 Change property name on JSFUrlIntegrationDeployer


Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java	2010-07-30 18:00:50 UTC (rev 107245)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java	2010-07-30 18:33:10 UTC (rev 107246)
@@ -41,7 +41,7 @@
  */
 public class JSFUrlIntegrationDeployer extends UrlIntegrationDeployer<JSFImplMetaData>
 {
-   private String jsfImplName;
+   private String jsfConfigName;
    private JSFImplManagementDeployer implManager;
    private Collection<String> additionalURLs = new HashSet<String>(0);
 
@@ -54,14 +54,14 @@
       setDisableOptional(true);
    }
 
-   public void setJSFImplName(String jsfImplName)
+   public void setJSFConfigName(String jsfConfigName)
    {
-      this.jsfImplName = jsfImplName;
+      this.jsfConfigName = jsfConfigName;
    }
 
-   public String getJSFImplName()
+   public String getJSFConfigName()
    {
-      return this.jsfImplName;
+      return this.jsfConfigName;
    }
 
    public void setJSFImplManagementDeployer(JSFImplManagementDeployer implManager)
@@ -77,9 +77,9 @@
    @Override
    public void start()
    {
-      JSFImplMetaData jsfImpl = implManager.getJSFImpl(jsfImplName);
+      JSFImplMetaData jsfImpl = implManager.getJSFImpl(jsfConfigName);
       if (jsfImpl == null)
-         throw new IllegalStateException("JSF implementation " + jsfImplName + " not defined in JSFImplManagementDeployer.");
+         throw new IllegalStateException("JSF implementation " + jsfConfigName + " not defined in JSFImplManagementDeployer.");
       
       Set<URL> integrationURLs = new HashSet<URL>();
       integrationURLs.addAll(jsfImpl.getJars());
@@ -131,7 +131,7 @@
    @Override
    protected boolean isIntegrationDeployment(VFSDeploymentUnit unit, JSFImplMetaData jsfImpl)
    {
-      return jsfImpl.getImplName().equals(this.jsfImplName);
+      return jsfImpl.getImplName().equals(this.jsfConfigName);
    }
 
    @Override

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-07-30 18:00:50 UTC (rev 107245)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-07-30 18:33:10 UTC (rev 107246)
@@ -62,7 +62,7 @@
 
   <!-- Adds JSF Jars to the deployment -->
   <bean name="JSFUrlIntegrationDeployer-12" class="org.jboss.jsf.deployer.JSFUrlIntegrationDeployer">
-    <property name="JSFImplName">
+    <property name="JSFConfigName">
       <value>Mojarra-1.2</value>
     </property>
     <property name="JSFImplManagementDeployer">
@@ -71,7 +71,7 @@
   </bean> 
 
   <bean name="JSFUrlIntegrationDeployer-20" class="org.jboss.jsf.deployer.JSFUrlIntegrationDeployer">
-    <property name="JSFImplName">
+    <property name="JSFConfigName">
       <value>Mojarra-2.0</value>
     </property>
     <property name="JSFImplManagementDeployer">

Modified: projects/jboss-jsf-int/trunk/releasenotes.txt
===================================================================
--- projects/jboss-jsf-int/trunk/releasenotes.txt	2010-07-30 18:00:50 UTC (rev 107245)
+++ projects/jboss-jsf-int/trunk/releasenotes.txt	2010-07-30 18:33:10 UTC (rev 107246)
@@ -4,4 +4,8 @@
 * Mojarra 2.0.2-FCS (default)
 
 2010-07-12 Release 1.0.1
-* JBAS-7739 Upgrade Mojarra to 2.0.3
\ No newline at end of file
+* JBAS-7739 Upgrade Mojarra to 2.0.3
+
+2010-xx-xx Release 1.0.2
+* JBAS-8264 Fix for @FacesValidator annotation
+*JBAS-8272 Change property name on JSFUrlIntegrationDeployer