Author: snjeza Date: 2011-01-06 12:38:46 -0500 (Thu, 06 Jan 2011) New Revision: 27950 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java Log: JBIDE-7932 New Seam EAR project fails to deploy to JBoss AS 6 CR1 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2011-01-06 16:02:51 UTC (rev 27949) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2011-01-06 17:38:46 UTC (rev 27950) @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.javaee.web.WebApp; +import org.eclipse.jst.jsf.core.JSFVersion; import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; import org.eclipse.jst.jsf.facesconfig.emf.DefaultLocaleType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; @@ -258,7 +259,13 @@ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp) */ @Override - protected void configure(WebApp webApp) { + protected void configure(WebApp webApp, IProject project) { + JSFVersion jsfVersion = JSFVersion.valueOfProject(project); + + if (JSFVersion.V2_0.compareTo(jsfVersion) > 0) { + createOrUpdateContextParam(webApp, ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME, + MOJARRA_1_2); + } // Ajax4jsf createOrUpdateContextParam(webApp, ORG_RICHFACES_SKIN, ORG_RICHFACES_SKIN_VALUE); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-01-06 16:02:51 UTC (rev 27949) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-01-06 17:38:46 UTC (rev 27950) @@ -106,6 +106,8 @@ public abstract class SeamFacetAbstractInstallDelegate implements ILogListener, IDelegate,ISeamFacetDataModelProperties { + public static final String MOJARRA_1_2 = "Mojarra-1.2"; //$NON-NLS-1$ + public static final String ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME = "org.jboss.jbossfaces.JSF_CONFIG_NAME"; //$NON-NLS-1$ public static String ORG_RICHFACES_SKIN = "org.richfaces.SKIN"; //$NON-NLS-1$ public static String ORG_RICHFACES_SKIN_VALUE = "blueSky"; //$NON-NLS-1$ public static String ORG_JBOSS_SEAM_SERVLET_SEAMLISTENER = "org.jboss.seam.servlet.SeamListener"; //$NON-NLS-1$ @@ -1231,7 +1233,7 @@ */ abstract protected void configureFacesConfigXml(final IProject project, IProgressMonitor monitor, String webConfigName); - protected abstract void configure(WebApp webApp); + protected abstract void configure(WebApp webApp, IProject project); protected WebApp configureWebXml(final IProject project) { IModelProvider modelProvider = ModelProviderManager @@ -1258,7 +1260,7 @@ return; } WebApp webApp = (WebApp) modelObject; - configure(webApp); + configure(webApp, project); } }, modelPath); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2011-01-06 16:02:51 UTC (rev 27949) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2011-01-06 17:38:46 UTC (rev 27950) @@ -21,6 +21,7 @@ import org.eclipse.jst.javaee.core.JavaeeFactory; import org.eclipse.jst.javaee.web.Filter; import org.eclipse.jst.javaee.web.WebApp; +import org.eclipse.jst.jsf.core.JSFVersion; import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; @@ -239,7 +240,7 @@ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp) */ @Override - protected void configure(WebApp webApp) { + protected void configure(WebApp webApp, IProject project) { // Ajax4jsf (must come first!) // FIXME supposing that the Ajax4jsf filter must come before the Seam filter createOrUpdateFilter(webApp, @@ -251,6 +252,12 @@ ORG_AJAX4JSF_FILTER_NAME, ORG_AJAX4JSF_FILTER_MAPPING); + JSFVersion jsfVersion = JSFVersion.valueOfProject(project); + + if (JSFVersion.V2_0.compareTo(jsfVersion) > 0) { + createOrUpdateContextParam(webApp, ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME, + MOJARRA_1_2); + } createOrUpdateContextParam(webApp, ORG_AJAX4JSF_VIEW_HANDLERS, ORG_JBOSS_SEAM_UI_SEAMFACELETVIEWHANDLER); createOrUpdateContextParam(webApp, ORG_AJAX4JSF_SKIN,