Author: akazakov Date: 2012-05-07 20:52:06 -0400 (Mon, 07 May 2012) New Revision: 40832 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java Log: https://issues.jboss.org/browse/JBIDE-11490 don't copy jboss-app.xml for Seam 2.3 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-05-07 22:06:00 UTC (rev 40831) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-05-08 00:52:06 UTC (rev 40832) @@ -12,6 +12,8 @@ import java.io.File; +import org.apache.tools.ant.types.FilterSet; +import org.apache.tools.ant.types.FilterSetCollection; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -28,6 +30,22 @@ /* * (non-Javadoc) + * @see org.jboss.tools.seam.internal.core.project.facet.Seam2ProjectCreator#configureJBossAppXml() + */ + @Override + protected void configureJBossAppXml() { + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#copyJBossApp() + */ + @Override + protected void copyJBossApp() { + } + + /* + * (non-Javadoc) * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#execute(org.eclipse.core.runtime.IProgressMonitor) */ @Override Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-05-07 22:06:00 UTC (rev 40831) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-05-08 00:52:06 UTC (rev 40832) @@ -620,14 +620,7 @@ return lm.generateUniqueLaunchConfigurationNameFrom(baseName); } - protected void createEarProject() { - if(!shouldCopyLibrariesAndTemplates(model)) - return; - - earProjectFolder.mkdir(); - - File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$ - + protected void copyJBossApp() { FilterSet earFilterSet = new FilterSet(); earFilterSet.addFilter("projectName", earProjectFolder.getName() + ".ear"); //$NON-NLS-1$ //$NON-NLS-2$ earFilterSet.addFilter("earProjectName", earProjectName); //$NON-NLS-1$ @@ -638,7 +631,18 @@ new File(seamGenResFolder, "META-INF/jboss-app.xml"), //$NON-NLS-1$ new File(earContentsFolder, "META-INF"), //$NON-NLS-1$ new FilterSetCollection(earFilterSet), true); + } + protected void createEarProject() { + if(!shouldCopyLibrariesAndTemplates(model)) + return; + + earProjectFolder.mkdir(); + + File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$ + + copyJBossApp(); + // Copy configuration files from template try { AntCopyUtils.copyFilesAndFolders(