[jboss-cvs] JBossAS SVN: r104876 - projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer.

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

Author: stan.silvert at jboss.com
Date: 2010-05-17 12:52:18 -0400 (Mon, 17 May 2010)
New Revision: 104876

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/JSFImplMetaData.java
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFSharedWebMetaDataDeployer.java
Log:
JBAS-6638  Move JSF integration into a deployer 


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-17 16:01:44 UTC (rev 104875)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java	2010-05-17 16:52:18 UTC (rev 104876)
@@ -77,11 +77,9 @@
     
     protected void createJSFImplMetaData() throws DeploymentException
     {
-        log.info("Initializing JSF Implementations...");
-
         if (jsfImplementations == null)
         {
-            log.warn("No JSF implementations specified in jsf-integration-deployer.xml. Integrated JSF is disabled.");
+            log.warn("No JSF implementations specified in jsf-integration-deployer-jboss-beans.xml. Integrated JSF is disabled.");
             return;
         }
 
@@ -98,7 +96,7 @@
             }
         }
 
-        log.info("Initialized " + jsfImplMetatData.size() + " JSF implementations.");
+        log.info("Initialized " + jsfImplMetatData.size() + " JSF configurations. " + jsfImplMetatData.keySet());
     }
 
     /**
@@ -179,7 +177,7 @@
     public void deploy(VFSDeploymentUnit unit, WebMetaData metaData) throws DeploymentException
     {
         if (!isJSFDeployment(metaData) || isWarBundlesJSF(metaData)) return;
-
+        
         JSFImplMetaData jsfImpl = findWhichJSFImplToUse(metaData);
         unit.addAttachment(JSFImplMetaData.class, jsfImpl);
     }

Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplMetaData.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplMetaData.java	2010-05-17 16:01:44 UTC (rev 104875)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplMetaData.java	2010-05-17 16:52:18 UTC (rev 104876)
@@ -47,8 +47,10 @@
 import org.jboss.xb.builder.JBossXBBuilder;
 
 /**
+ * Bean that represents a single JSF implementation configuration (jars + web.xml)
  *
- * @author ssilvert
+ * @author Stan Silvert
+ * @since 1.0
  */
 public class JSFImplMetaData
 {
@@ -70,7 +72,6 @@
     {
         this.implName = implName;
         this.implURL = implURL;
-        System.out.println("JSFImplMetaData implURL=" + implURL.toString());
         findJSFJars();
         parseJSFImplWebMetaData();
     }

Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFSharedWebMetaDataDeployer.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFSharedWebMetaDataDeployer.java	2010-05-17 16:01:44 UTC (rev 104875)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFSharedWebMetaDataDeployer.java	2010-05-17 16:52:18 UTC (rev 104876)
@@ -42,9 +42,10 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.metadata.web.spec.ServletsMetaData;
 import org.jboss.metadata.web.spec.Web30MetaData;
+import org.jboss.web.deployers.MergedJBossWebMetaDataDeployer;
 
 /**
- * 
+ * Adds the values from the JSF configuration's web.xml to the deployment.
  *
  * @author Stan Silvert
  * @since 1.0
@@ -59,6 +60,14 @@
     {
         super(JSFImplMetaData.class);
         setStage(DeploymentStages.POST_CLASSLOADER);
+        addInput(JBossWebMetaData.class);
+
+        // make sure this runs after the MergedJBossWebMetaDataDeployer
+        addInput(MergedJBossWebMetaDataDeployer.WEB_ORDER_ATTACHMENT_NAME);
+        addInput(MergedJBossWebMetaDataDeployer.WEB_OVERLAYS_ATTACHMENT_NAME);
+        addInput(MergedJBossWebMetaDataDeployer.WEB_SCIS_ATTACHMENT_NAME);
+
+        setOutput(JBossWebMetaData.class);
     }
 
     
@@ -126,6 +135,7 @@
             {
                 contextParams = new ArrayList<ParamValueMetaData>();
             }
+
             contextParams.addAll(jsfImplWebMetaData.getContextParams());
             webMetaData.setContextParams(contextParams);
         }