Index: src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java =================================================================== --- src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java (revision 15134) +++ src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java (working copy) @@ -35,10 +35,13 @@ public class Seam2FacetInstallDelegate extends SeamFacetAbstractInstallDelegate{ public static final AntCopyUtils.FileSet JBOSS_EAR_CONTENT = new AntCopyUtils.FileSet() + .include("jboss-seam.jar"); //$NON-NLS-1$ + + public static final AntCopyUtils.FileSet JBOSS_EAR_LIB = new AntCopyUtils.FileSet() .include("antlr-runtime.jar") //$NON-NLS-1$ + .include("commons-beanutils\\.jar") //$NON-NLS-1$ .include("drools-compiler.*\\.jar") //$NON-NLS-1$ .include("drools-core.*\\.jar") //$NON-NLS-1$ - .include("jboss-seam.jar") //$NON-NLS-1$ .include("jboss-el.*.jar") //$NON-NLS-1$ .include("mvel.*\\.jar") //$NON-NLS-1$ .include("jbpm-jpdl.*\\.jar") //$NON-NLS-1$ @@ -76,7 +79,6 @@ public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet() .include("richfaces-impl\\.jar") //$NON-NLS-1$ .include("richfaces-ui\\.jar") //$NON-NLS-1$ - .include("commons-beanutils\\.jar") //$NON-NLS-1$ .include("commons-digester\\.jar") //$NON-NLS-1$ .include("jboss-seam-debug\\.jar") //$NON-NLS-1$ .include("jboss-seam-ioc\\.jar") //$NON-NLS-1$ @@ -137,8 +139,8 @@ 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); AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false); + AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_LIB).dir(seamLibFolder)), false); AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false); - AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false); AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false); } Index: src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java (revision 15134) +++ src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java (working copy) @@ -63,6 +63,19 @@ droolsLibFolder = new File(seamHomePath, Seam2FacetInstallDelegate.DROOLS_LIB_SEAM_RELATED_PATH); } + /* + * (non-Javadoc) + * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#createEarProject() + */ + @Override + protected void createEarProject() { + super.createEarProject(); + File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$ + File earLibFolder = new File(earContentsFolder, "lib"); //$NON-NLS-1$ + AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(Seam2FacetInstallDelegate.JBOSS_EAR_LIB).dir(seamLibFolder))); + } + + @Override protected void createTestProject() { File testProjectDir = new File(seamWebProject.getLocation().removeLastSegments(1).toFile(), testProjectName); //$NON-NLS-1$ Index: src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java (revision 15134) +++ src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java (working copy) @@ -457,7 +457,6 @@ AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamHomeFolder))); AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamLibFolder))); AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(droolsLibFolder))); - AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamLibFolder))); AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamGenResFolder))); File resources = new File(earProjectFolder, "resources"); Index: src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java (revision 15134) +++ src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java (working copy) @@ -507,7 +507,8 @@ } } - protected File earContentsFolder; + protected File earContentsFolder; + protected File earLibFolder; /** * @@ -527,6 +528,7 @@ IVirtualFolder rootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ earContentsFolder = rootVirtFolder.getUnderlyingFolder().getLocation().toFile(); + earLibFolder = new File(earContentsFolder, "lib"); File metaInfFolder = new File(earContentsFolder, "META-INF"); //$NON-NLS-1$ File applicationXml = new File(metaInfFolder, "application.xml"); //$NON-NLS-1$ File earProjectFolder = project.getLocation().toFile(); Index: src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java =================================================================== --- src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java (revision 15134) +++ src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java (working copy) @@ -147,7 +147,6 @@ AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false); AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false); AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false); - AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false); AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false); }