[jboss-cvs] JBossAS SVN: r105597 - in projects/jboss-jsf-int/trunk: jboss-faces/src/main/resources and 4 other directories.

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

Author: stan.silvert at jboss.com
Date: 2010-06-02 16:58:13 -0400 (Wed, 02 Jun 2010)
New Revision: 105597

Added:
   projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/
   projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/
   projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/services/
   projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/services/com.sun.faces.spi.annotationprovider
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
Log:
JBAS-8061 Integrate JSF with new Annotation Scanning


Added: projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/services/com.sun.faces.spi.annotationprovider
===================================================================
--- projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/services/com.sun.faces.spi.annotationprovider	                        (rev 0)
+++ projects/jboss-jsf-int/trunk/jboss-faces/src/main/resources/META-INF/services/com.sun.faces.spi.annotationprovider	2010-06-02 20:58:13 UTC (rev 105597)
@@ -0,0 +1 @@
+org.jboss.scanning.jsf.JBossAnnotationProvider
\ No newline at end of file

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-06-02 20:42:51 UTC (rev 105596)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java	2010-06-02 20:58:13 UTC (rev 105597)
@@ -22,9 +22,15 @@
 package org.jboss.jsf.deployer;
 
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.plugins.classloader.UrlIntegrationDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.util.StringPropertyReplacer;
 
 /**
  * The JSFUrlIntegrationDeployer adds the jars from the given JSF implementation
@@ -37,6 +43,7 @@
 {
    private String jsfImplName;
    private JSFImplManagementDeployer implManager;
+   Collection<String> additionalURLs = new HashSet<String>(0);
 
    /**
     * Create a new deployer.
@@ -61,12 +68,30 @@
       this.implManager = implManager;
    }
 
+   public void setAdditionalURLs(Collection<String> additionalURLs)
+   {
+      this.additionalURLs = additionalURLs;
+   }
+
    @Override
    public void start()
    {
       JSFImplMetaData jsfImpl = implManager.getJSFImpl(jsfImplName);
       if (jsfImpl == null) throw new IllegalStateException("JSF implementation " + jsfImplName + " not defined in JSFImplManagementDeployer.");
-      setIntegrationURLs(jsfImpl.getJars());
+      Set<URL> integrationURLs = new HashSet<URL>();
+      integrationURLs.addAll(jsfImpl.getJars());
+      for (String url : this.additionalURLs)
+      {
+         try
+         {
+            integrationURLs.add(new URL(StringPropertyReplacer.replaceProperties(url)));
+         }
+         catch (MalformedURLException e)
+         {
+            throw new IllegalArgumentException("additionalURL " + url + " is invalid.", e);
+         }
+      }
+      setIntegrationURLs(integrationURLs);
    } 
 
    @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-06-02 20:42:51 UTC (rev 105596)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-06-02 20:58:13 UTC (rev 105597)
@@ -73,6 +73,11 @@
     <property name="JSFImplManagementDeployer">
       <inject bean="JSFImplManagementDeployer"/>
     </property>
+    <property name="additionalURLs">
+      <collection elementClass="java.lang.String">
+        <value>${jboss.lib.url}scanning-plugins.jar</value>
+      </collection>
+    </property>
   </bean>