[jbosstools-commits] JBoss Tools SVN: r41895 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2012-06-12 14:09:56 -0400 (Tue, 12 Jun 2012)
New Revision: 41895

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-12154 Seam 2 war project creation generate old context parameter in web.xml

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java	2012-06-12 18:08:33 UTC (rev 41894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java	2012-06-12 18:09:56 UTC (rev 41895)
@@ -39,6 +39,8 @@
  */
 public class Seam23FacetInstallDelegate extends Seam2FacetInstallDelegate {
 
+	private static String RICHFACES_SKIN = "org.richfaces.skin"; //$NON-NLS-1$
+
 	public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet()
 		.include("WEB-INF") //$NON-NLS-1$
 		.include("WEB-INF/pages\\.xml") //$NON-NLS-1$
@@ -167,6 +169,15 @@
 		return fileSet;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getSkinParamName()
+	 */
+	@Override
+	protected String getSkinParamName() {
+		return RICHFACES_SKIN;
+	}
+
 	private static SeamRuntime getSeamRuntime(IDataModel model) {
 		Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
 		SeamRuntime runtime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString());
@@ -202,7 +213,7 @@
 						} catch (CoreException e) {
 							SeamCorePlugin.getDefault().logError(e);
 						}
-						
+
 						IServer server = getServer(model);
 						if (serverSupportsSingleFileModule(server)) {
 							ChainedJob dsJob = new ResourceDeployer(project, server, resource.getFullPath().removeFirstSegments(1));
@@ -214,7 +225,7 @@
 			}
 		}
 	}
-	
+
 	private static boolean serverSupportsSingleFileModule(IServer s) {
 		IRuntimeType rt = s.getServerType().getRuntimeType();
 		if (ServerUtil.isSupportedModule(rt.getModuleTypes(),

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	2012-06-12 18:08:33 UTC (rev 41894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java	2012-06-12 18:09:56 UTC (rev 41895)
@@ -155,7 +155,7 @@
 			IDataModel model, IProgressMonitor monitor) throws CoreException {
 		if(!shouldCopyLibrariesAndTemplates(model))
 			return;
-		
+
 		super.copyFilesToWarProject(project, fv, model, monitor);
 		final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
 		if(isWarConfiguration(model)) {
@@ -186,7 +186,7 @@
 	protected void fillEarContents(IProject project, IDataModel model) {
 		if(!shouldCopyLibrariesAndTemplates(model))
 			return;
-		
+
 		if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
 			final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
 			AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
@@ -289,6 +289,10 @@
 		}
 	}
 
+	protected String getSkinParamName() {
+		return ORG_RICHFACES_SKIN;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp)
@@ -296,13 +300,13 @@
 	@Override
 	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,
+		createOrUpdateContextParam(webApp, getSkinParamName(),
 				ORG_RICHFACES_SKIN_VALUE);
 		// Seam
 		createOrUpdateListener(webApp,