Author: akazakov Date: 2012-05-03 20:15:22 -0400 (Thu, 03 May 2012) New Revision: 40775 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/SeamFacetAbstractInstallDelegate.java Log: https://issues.jboss.org/browse/JBIDE-11490 don't copy jboss-web.xml for Seam 2.3 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-05-04 00:01:57 UTC (rev 40774) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-05-04 00:15:22 UTC (rev 40775) @@ -30,6 +30,11 @@ */ public class Seam23FacetInstallDelegate extends Seam2FacetInstallDelegate { + 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$ + .include("WEB-INF/componets\\.xml"); //$NON-NLS-1$ + /* * (non-Javadoc) * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#copyFilesToWarProject(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor) @@ -55,6 +60,15 @@ return new Seam23ProjectCreator(model, project); } + /* + * (non-Javadoc) + * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#getJBossWarWebinfSet() + */ + @Override + protected AntCopyUtils.FileSet getJBossWarWebinfSet() { + return JBOOS_WAR_WEBINF_SET; + } + /** * Copies and deploys the driver jar from connection profile to the server. * @param project 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 2012-05-04 00:01:57 UTC (rev 40774) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2012-05-04 00:15:22 UTC (rev 40775) @@ -151,7 +151,7 @@ .exclude(".*/CVS") //$NON-NLS-1$ .exclude(".*/\\.svn"); //$NON-NLS-1$ - public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet() + public static AntCopyUtils.FileSet DEFAULT_JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet() .include("WEB-INF") //$NON-NLS-1$ //.include("WEB-INF/web\\.xml") //$NON-NLS-1$ .include("WEB-INF/pages\\.xml") //$NON-NLS-1$ @@ -179,7 +179,11 @@ return ALL; } }; - + + protected AntCopyUtils.FileSet getJBossWarWebinfSet() { + return DEFAULT_JBOOS_WAR_WEBINF_SET; + } + /* (non-Javadoc) * @see org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) */ @@ -433,7 +437,7 @@ // ******************************************************************* // Copy manifest and configuration resources the same way as view // ******************************************************************* - AntCopyUtils.FileSet webInfSet = new AntCopyUtils.FileSet(JBOOS_WAR_WEBINF_SET).dir(seamGenResFolder); + AntCopyUtils.FileSet webInfSet = new AntCopyUtils.FileSet(getJBossWarWebinfSet()).dir(seamGenResFolder); WebApp webApp = configureWebXml(project);