Author: dgolovin Date: 2008-01-16 20:21:02 -0500 (Wed, 16 Jan 2008) New Revision: 5753 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: 1. core.jar is added to test/lib folder 2. security.drl moved to ejb/ejbModule for EAR deployment 3. checks for that are added to JUnit test for seam 2 EAR project 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 2008-01-16 21:45:15 UTC (rev 5752) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-01-17 01:21:02 UTC (rev 5753) @@ -101,6 +101,7 @@ .include("jboss-deployers.jar") //$NON-NLS-1$ .include("test/thirdparty-all\\.jar") //$NON-NLS-1$ .include("thirdparty-all\\.jar") //$NON-NLS-1$ + .include("core.jar") //$NON-NLS-1$ .exclude(".*/CVS") //$NON-NLS-1$ .exclude(".*/\\.svn"); //$NON-NLS-1$ @@ -126,8 +127,7 @@ .include("jboss-el.*.jar") //$NON-NLS-1$ .include("mvel14.*.jar") //$NON-NLS-1$ .include("jbpm-jpdl.*\\.jar") //$NON-NLS-1$ - .include("richfaces-api.*\\.jar") //$NON-NLS-1$ - .include("security\\.drl"); //$NON-NLS-1$ + .include("richfaces-api.*\\.jar"); //$NON-NLS-1$ /*public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT_META_INF = new AntCopyUtils.FileSet() .include("META-INF/application\\.xml") //$NON-NLS-1$ @@ -411,6 +411,11 @@ // Copy seam project indicator // ******************************************************************************************** AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$ + + // ******************************************************************************************** + // Copy security.drl to source folder + // ******************************************************************************************** + AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"security.drl"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$ File resources = new File(ear,"resources"); AntCopyUtils.copyFileToFile( 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 2008-01-16 21:45:15 UTC (rev 5752) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2008-01-17 01:21:02 UTC (rev 5753) @@ -128,6 +128,7 @@ Set<String> onlyInWar = new HashSet<String>(); Set<String> onlyInEar = new HashSet<String>(); + Set<String> onlyInEjbSrc = new HashSet<String>(); onlyInEar.add("jboss-seam.jar"); onlyInEar.add("antlr-runtime.jar"); @@ -138,7 +139,6 @@ onlyInEar.add("richfaces-api.jar"); onlyInEar.add("jbpm-jpdl.jar"); onlyInEar.add("META-INF"); - onlyInEar.add("security.drl"); onlyInWar.add("commons-beanutils.jar"); onlyInWar.add("commons-digester.jar"); @@ -165,10 +165,16 @@ assertOnlyContainsTheseFiles(onlyInEarMeta, earMeta); - assertOnlyContainsTheseFiles(onlyInWar, (IContainer)war.findMember("WebContent/WEB-INF/lib").getAdapter(IContainer.class)); + + IProject ejb = seamProjectsSet.getEjbProject(); + + onlyInEjbSrc.add("security.drl"); + onlyInEjbSrc.add("seam.properties"); + onlyInEjbSrc.add("import.sql"); + onlyInEjbSrc.add("components.properties"); - + assertOnlyContainsTheseFiles(onlyInEjbSrc, ear.findMember("ejbModule")); } @@ -230,6 +236,7 @@ libs.add("jboss-embedded-all.jar"); libs.add("thirdparty-all.jar"); libs.add("jboss-embedded-api.jar"); + libs.add("core.jar"); assertOnlyContainsTheseFiles(libs, testProject.findMember("lib")); assertNotNull(testProject.findMember("lib/testng.jar")); @@ -238,8 +245,6 @@ assertNotNull(testProject.findMember("lib/jboss-embedded-all.jar")); assertNotNull(testProject.findMember("lib/thirdparty-all.jar")); - - } public void testSeamProperties() {