Author: max.andersen(a)jboss.com Date: 2007-11-21 20:25:56 -0500 (Wed, 21 Nov 2007) New Revision: 5031 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java Log: JBIDE-1348 bring back jboss-app.xml in Seam 2 ears 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 2007-11-22 01:23:30 UTC (rev 5030) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-11-22 01:25:56 UTC (rev 5031) @@ -64,16 +64,16 @@ public static AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_WAR_CONFIG = new AntCopyUtils.FileSet() .include("ajax4jsf.*\\.jar") //$NON-NLS-1$ .include("richfaces.*\\.jar") - .include("antlr.*\\.jar") //$NON-NLS-1$ + .include("antlr-runtime.*\\.jar") //$NON-NLS-1$ .include("commons-beanutils.*\\.jar") //$NON-NLS-1$ - .include("commons-collections.*\\.jar") //$NON-NLS-1$ + //.include("commons-collections.*\\.jar") //$NON-NLS-1$ .include("commons-digester.*\\.jar") //$NON-NLS-1$ .include("commons-jci-core.*\\.jar") //$NON-NLS-1$ .include("commons-jci-janino.*\\.jar") //$NON-NLS-1$ .include("drools-compiler.*\\.jar") //$NON-NLS-1$ .include("drools-core.*\\.jar") //$NON-NLS-1$ .include("core.jar") //$NON-NLS-1$ - .include("janino.*\\.jar") //$NON-NLS-1$ + //.include("janino.*\\.jar") //$NON-NLS-1$ .include("jboss-seam-debug\\.jar") //$NON-NLS-1$ .include("jboss-seam-ioc\\.jar") //$NON-NLS-1$ .include("jboss-seam-mail\\.jar") //$NON-NLS-1$ @@ -129,9 +129,10 @@ .include("richfaces-api.*\\.jar") //$NON-NLS-1$ .include("security\\.drl"); //$NON-NLS-1$ - public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT_META_INF = new AntCopyUtils.FileSet() - .include("META-INF/application\\.xml"); //$NON-NLS-1$ - //.include("META-INF/jboss-app\\.xml"); //$NON-NLS-1$ + /*public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT_META_INF = new AntCopyUtils.FileSet() + .include("META-INF/application\\.xml") //$NON-NLS-1$ + .include("META-INF/jboss-app\\.xml"); //$NON-NLS-1$ + */ public static AntCopyUtils.FileSet VIEW_FILESET = new AntCopyUtils.FileSet() .include("home\\.xhtml") //$NON-NLS-1$ @@ -236,7 +237,7 @@ //final File hibernateConsolePref = new File(seamGenHomeFolder, "hibernatetools/.settings/org.hibernate.eclipse.console.prefs"); //$NON-NLS-1$ final File persistenceFile = new File(seamGenResFolder,"META-INF/persistence-" + (isWarConfiguration(model)?DEV_WAR_PROFILE:DEV_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ - final File applicationFile = new File(seamGenResFolder,"META-INF/application.xml"); //$NON-NLS-1$ + //final File applicationFile = new File(seamGenResFolder,"META-INF/application.xml"); //$NON-NLS-1$ final FilterSet jdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model); final FilterSet projectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model); @@ -445,10 +446,10 @@ FilterSet earFilterSet = new FilterSet(); earFilterSet.addFilter("projectName",ear.getName()+".ear"); //$NON-NLS-1$ //$NON-NLS-2$ - /* jboss-app.xml not needed anymore AntCopyUtils.copyFileToFolder( + AntCopyUtils.copyFileToFolder( new File(seamGenResFolder,"META-INF/jboss-app.xml"), //$NON-NLS-1$ new File(earContentsFolder,"META-INF"), //$NON-NLS-1$ - new FilterSetCollection(earFilterSet),true);*/ + new FilterSetCollection(earFilterSet),true); // Copy configuration files from template AntCopyUtils.copyFilesAndFolders( Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-22 01:23:30 UTC (rev 5030) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-22 01:25:56 UTC (rev 5031) @@ -88,32 +88,32 @@ public void testWarLibs() throws CoreException { - Set<String> warlibs = new HashSet<String>(); + Set<String> seamgenlibs = new HashSet<String>(); - warlibs.add("core.jar"); - warlibs.add("antlr-runtime.jar"); - warlibs.add("commons-beanutils.jar"); - warlibs.add("commons-digester.jar"); - warlibs.add("drools-compiler.jar"); - warlibs.add("drools-core.jar"); - warlibs.add("core.jar"); - warlibs.add("jboss-el.jar"); - warlibs.add("jboss-seam-debug.jar"); - warlibs.add("jboss-seam-ioc.jar"); - warlibs.add("jboss-seam.jar"); - warlibs.add("jboss-seam-mail.jar"); - warlibs.add("jboss-seam-pdf.jar"); - warlibs.add("jboss-seam-remoting.jar"); - warlibs.add("jboss-seam-ui.jar"); - warlibs.add("jbpm-jpdl.jar"); - warlibs.add("jsf-facelets.jar"); - warlibs.add("mvel14.jar"); - warlibs.add("richfaces-api.jar"); - warlibs.add("richfaces-impl.jar"); - warlibs.add("richfaces-ui.jar"); + + seamgenlibs.add("antlr-runtime.jar"); + seamgenlibs.add("commons-beanutils.jar"); + seamgenlibs.add("commons-digester.jar"); + seamgenlibs.add("drools-compiler.jar"); + seamgenlibs.add("drools-core.jar"); + seamgenlibs.add("core.jar"); + seamgenlibs.add("jboss-el.jar"); + seamgenlibs.add("jboss-seam-debug.jar"); + seamgenlibs.add("jboss-seam-ioc.jar"); + seamgenlibs.add("jboss-seam.jar"); + seamgenlibs.add("jboss-seam-mail.jar"); + seamgenlibs.add("jboss-seam-pdf.jar"); + seamgenlibs.add("jboss-seam-remoting.jar"); + seamgenlibs.add("jboss-seam-ui.jar"); + seamgenlibs.add("jbpm-jpdl.jar"); + seamgenlibs.add("jsf-facelets.jar"); + seamgenlibs.add("mvel14.jar"); + seamgenlibs.add("richfaces-api.jar"); + seamgenlibs.add("richfaces-impl.jar"); + seamgenlibs.add("richfaces-ui.jar"); final IContainer warLibs = (IContainer) warProject.getProject().findMember("WebContent/WEB-INF/lib").getAdapter(IContainer.class); - assertOnlyContainsTheseFiles(warlibs, warLibs); + assertOnlyContainsTheseFiles(seamgenlibs, warLibs); } @@ -135,8 +135,7 @@ onlyInEar.add("drools-core.jar"); onlyInEar.add("jboss-el.jar"); onlyInEar.add("mvel14.jar"); - onlyInEar.add("richfaces-api.jar"); - onlyInEar.add("richfaces-api.jar"); + onlyInEar.add("richfaces-api.jar"); onlyInEar.add("jbpm-jpdl.jar"); onlyInEar.add("META-INF"); onlyInEar.add("security.drl"); @@ -157,9 +156,16 @@ assertOnlyContainsTheseFiles(onlyInEar, earLibs); - //earLibs.findMember(path) + final IContainer earMeta = (IContainer) ear.findMember("EarContent/META-INF").getAdapter(IContainer.class); + Set onlyInEarMeta = new HashSet(); + onlyInEarMeta.add("jboss-app.xml"); + onlyInEarMeta.add("application.xml"); + + assertOnlyContainsTheseFiles(onlyInEarMeta, earMeta); + + assertOnlyContainsTheseFiles(onlyInWar, (IContainer)war.findMember("WebContent/WEB-INF/lib").getAdapter(IContainer.class)); @@ -193,7 +199,7 @@ foundFiles.removeAll(fileNames); - assertTrue("Found additional files (" + foundFiles + " in " + dir, foundFiles.isEmpty()); + assertTrue("Found additional files (" + foundFiles + " in " + dir + " at " + dir.getLocation(), foundFiles.isEmpty()); } public void testBootstrapDirPresent() throws CoreException, IOException {