[jboss-cvs] JBossAS SVN: r105750 - in projects/jboss-jsf-int/trunk/jsf-deployer/src/main: resources/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 5 17:04:22 EDT 2010
Author: alesj
Date: 2010-06-05 17:04:22 -0400 (Sat, 05 Jun 2010)
New Revision: 105750
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/JSFSharedWebMetaDataDeployer.java
projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFTldMetaDataDeployer.java
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:
Add missing config to avoid checks.
TODO -- on lazy jsf metadata initialization.
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-06-05 16:07:24 UTC (rev 105749)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java 2010-06-05 21:04:22 UTC (rev 105750)
@@ -26,7 +26,6 @@
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.jboss.deployers.spi.DeploymentException;
@@ -48,8 +47,7 @@
* @since 1.0
*/
public class JSFImplManagementDeployer extends AbstractSimpleVFSRealDeployer<WebMetaData>
-{
-
+{
private static final String JSF_CONFIG_PARAM = "org.jboss.jbossfaces.JSF_CONFIG_NAME";
private static final String WAR_BUNDLES_JSF_PARAM = "org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL";
@@ -63,7 +61,7 @@
/**
* Create a new deployer.
*/
- public JSFImplManagementDeployer() throws MalformedURLException
+ public JSFImplManagementDeployer()
{
super(WebMetaData.class);
setStage(DeploymentStages.POST_PARSE);
@@ -83,27 +81,26 @@
return;
}
- for (Iterator<String> impls = jsfConfigurations.keySet().iterator(); impls.hasNext();)
- {
- String implName = impls.next();
- try
- {
- jsfImplMetatData.put(implName, new JSFImplMetaData(implName, jsfConfigurations.get(implName)));
- }
- catch (Exception e)
- {
- throw DeploymentException.rethrowAsDeploymentException("Malformed URL", e);
- }
- }
+ for (Map.Entry<String, URL> implEntry : jsfConfigurations.entrySet())
+ {
+ try
+ {
+ jsfImplMetatData.put(implEntry.getKey(), new JSFImplMetaData(implEntry.getKey(), implEntry.getValue()));
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Malformed URL", e);
+ }
+ }
- log.info("Initialized " + jsfImplMetatData.size() + " JSF configurations. " + jsfImplMetatData.keySet());
+ log.info("Initialized " + jsfImplMetatData.size() + " JSF configurations: " + jsfImplMetatData.keySet());
}
/**
* Set the collection of servlets that signal this deployer to add JSF to a
* WAR.
*
- * @param jsfServlets The servlet classes that signal this deployer to add
+ * @param facesServlets The servlet classes that signal this deployer to add
* JSF to a WAR.
*/
public void setFacesServlets(Collection<String> facesServlets)
@@ -120,12 +117,11 @@
{
this.jsfConfigurations = new HashMap<String, URL>(jsfConfigs.size());
- for (Iterator<String> configs = jsfConfigs.keySet().iterator(); configs.hasNext();)
- {
- String configName = configs.next();
- String strURL = StringPropertyReplacer.replaceProperties(jsfConfigs.get(configName));
- jsfConfigurations.put(configName, new URL(strURL));
- }
+ for (Map.Entry<String, String> configEntry : jsfConfigs.entrySet())
+ {
+ String strURL = StringPropertyReplacer.replaceProperties(jsfConfigs.get(configEntry.getValue()));
+ jsfConfigurations.put(configEntry.getKey(), new URL(strURL));
+ }
}
public JSFImplMetaData getJSFImpl(String implName)
@@ -138,32 +134,31 @@
// need to check in web fragments as well?
if (metaData.getServlets() == null) return false;
- for (Iterator<ServletMetaData> servlets = metaData.getServlets().iterator(); servlets.hasNext();)
- {
- String servletClass = servlets.next().getServletClass();
- if (this.facesServlets.contains(servletClass))
- {
- return true;
- }
- }
+ for (ServletMetaData servletMetaData : metaData.getServlets())
+ {
+ String servletClass = servletMetaData.getServletClass();
+ if (this.facesServlets.contains(servletClass))
+ {
+ return true;
+ }
+ }
return false;
}
private String getContextParam(String paramName, WebMetaData metaData)
{
- List<ParamValueMetaData> contextParams = metaData.getContextParams();
- if (contextParams == null) return null;
-
- for (Iterator<ParamValueMetaData> params = contextParams.iterator(); params.hasNext();)
- {
- ParamValueMetaData param = params.next();
- if (param.getParamName().equals(paramName))
- {
- return param.getParamValue();
- }
- }
+ List<ParamValueMetaData> contextParams = metaData.getContextParams();
+ if (contextParams == null) return null;
+ for (ParamValueMetaData param : contextParams)
+ {
+ if (param.getParamName().equals(paramName))
+ {
+ return param.getParamValue();
+ }
+ }
+
return null;
}
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-06-05 16:07:24 UTC (rev 105749)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFSharedWebMetaDataDeployer.java 2010-06-05 21:04:22 UTC (rev 105750)
@@ -21,12 +21,11 @@
*/
package org.jboss.jsf.deployer;
-import java.net.MalformedURLException;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
@@ -35,13 +34,7 @@
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.FilterMappingMetaData;
-import org.jboss.metadata.web.spec.FiltersMetaData;
-import org.jboss.metadata.web.spec.ListenerMetaData;
-import org.jboss.metadata.web.spec.ServletMappingMetaData;
-import org.jboss.metadata.web.spec.ServletMetaData;
-import org.jboss.metadata.web.spec.ServletsMetaData;
-import org.jboss.metadata.web.spec.Web30MetaData;
+import org.jboss.metadata.web.spec.*;
import org.jboss.web.deployers.MergedJBossWebMetaDataDeployer;
/**
@@ -52,15 +45,14 @@
*/
public class JSFSharedWebMetaDataDeployer extends AbstractSimpleVFSRealDeployer<JSFImplMetaData>
{
-
/**
* Create a new deployer.
*/
- public JSFSharedWebMetaDataDeployer() throws MalformedURLException
+ public JSFSharedWebMetaDataDeployer()
{
super(JSFImplMetaData.class);
setStage(DeploymentStages.POST_CLASSLOADER);
- addInput(JBossWebMetaData.class);
+ addRequiredInput(JBossWebMetaData.class);
// make sure this runs after the MergedJBossWebMetaDataDeployer
addInput(MergedJBossWebMetaDataDeployer.WEB_ORDER_ATTACHMENT_NAME);
@@ -74,8 +66,6 @@
@Override
public void deploy(VFSDeploymentUnit unit, JSFImplMetaData jsfImpl) throws DeploymentException
{
- if (jsfImpl == null) return;
-
JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
mergeWebMetaData(webMetaData, jsfImpl.getSharedWebXml());
}
Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFTldMetaDataDeployer.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFTldMetaDataDeployer.java 2010-06-05 16:07:24 UTC (rev 105749)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFTldMetaDataDeployer.java 2010-06-05 21:04:22 UTC (rev 105750)
@@ -25,31 +25,31 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.spec.TldMetaData;
/**
- *
+ * TLD metadata deployer.
*
* @author Stan Silvert
* @since 1.0
*/
-public class JSFTldMetaDataDeployer extends AbstractDeployer
+public class JSFTldMetaDataDeployer extends AbstractSimpleRealDeployer<JSFImplMetaData>
{
private static final String SHARED_TLDS_ATTACHMENT_NAME = TldMetaData.class.getName();
public JSFTldMetaDataDeployer()
{
+ super(JSFImplMetaData.class);
setStage(DeploymentStages.POST_CLASSLOADER);
- setInput(JSFImplMetaData.class);
addOutput(SHARED_TLDS_ATTACHMENT_NAME);
}
-
- public void deploy(DeploymentUnit unit) throws DeploymentException
+
+ @Override
+ public void deploy(DeploymentUnit unit, JSFImplMetaData jsfImpl) throws DeploymentException
{
- JSFImplMetaData jsfImpl = unit.getAttachment(JSFImplMetaData.class);
List<TldMetaData> sharedTldMetaData = jsfImpl.getTldMetaData();
String attachmentName = SHARED_TLDS_ATTACHMENT_NAME + ":" + jsfImpl.getImplName() + ":";
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-05 16:07:24 UTC (rev 105749)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFUrlIntegrationDeployer.java 2010-06-05 21:04:22 UTC (rev 105750)
@@ -43,7 +43,7 @@
{
private String jsfImplName;
private JSFImplManagementDeployer implManager;
- Collection<String> additionalURLs = new HashSet<String>(0);
+ private Collection<String> additionalURLs = new HashSet<String>(0);
/**
* Create a new deployer.
@@ -51,6 +51,7 @@
public JSFUrlIntegrationDeployer()
{
super(JSFImplMetaData.class);
+ setDisableOptional(true);
}
public void setJSFImplName(String jsfImplName)
@@ -77,7 +78,9 @@
public void start()
{
JSFImplMetaData jsfImpl = implManager.getJSFImpl(jsfImplName);
- if (jsfImpl == null) throw new IllegalStateException("JSF implementation " + jsfImplName + " not defined in JSFImplManagementDeployer.");
+ if (jsfImpl == null)
+ throw new IllegalStateException("JSF implementation " + jsfImplName + " not defined in JSFImplManagementDeployer.");
+
Set<URL> integrationURLs = new HashSet<URL>();
integrationURLs.addAll(jsfImpl.getJars());
for (String url : this.additionalURLs)
@@ -128,7 +131,6 @@
@Override
protected boolean isIntegrationDeployment(VFSDeploymentUnit unit, JSFImplMetaData jsfImpl)
{
- if (jsfImpl == null) return false; // need this because it's a subclass of an OptionalDeployer
return jsfImpl.getImplName().equals(this.jsfImplName);
}
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-05 16:07:24 UTC (rev 105749)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml 2010-06-05 21:04:22 UTC (rev 105750)
@@ -54,7 +54,6 @@
</bean>
<bean name="JSFTldDeployer" class="org.jboss.jsf.deployer.JSFTldMetaDataDeployer"/>
-
<!-- Adds JSF Jars to the deployment -->
<bean name="JSFUrlIntegrationDeployer-12" class="org.jboss.jsf.deployer.JSFUrlIntegrationDeployer">
More information about the jboss-cvs-commits
mailing list