Author: max.andersen(a)jboss.com Date: 2007-10-26 08:43:46 -0400 (Fri, 26 Oct 2007) New Revision: 4535 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml Log: JBIDE-939 EL not allowed in pages.xml Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-26 11:37:38 UTC (rev 4534) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-26 12:43:46 UTC (rev 4535) @@ -91,7 +91,9 @@ .include("jbpm.*\\.jar") //$NON-NLS-1$ .include("jsf-facelets\\.jar") //$NON-NLS-1$ .include("oscache.*\\.jar") //$NON-NLS-1$ - .include("stringtemplate.*\\.jar"); //$NON-NLS-1$ + .include("stringtemplate.*\\.jar") //$NON-NLS-1$ + // el-ri needed for JBIDE-939 + .include("el-ri.*\\.jar"); //$NON-NLS-1$ public static AntCopyUtils.FileSet JBOSS_TEST_LIB_FILESET = new AntCopyUtils.FileSet() .include("testng-.*-jdk15\\.jar") //$NON-NLS-1$ @@ -101,8 +103,6 @@ .include("hibernate-all\\.jar") //$NON-NLS-1$ .include("jboss-ejb3-all\\.jar") //$NON-NLS-1$ .include("thirdparty-all\\.jar") //$NON-NLS-1$ - .include("el-api\\.jar") //$NON-NLS-1$ - .include("el-ri\\.jar") //$NON-NLS-1$ .exclude(".*/CVS") //$NON-NLS-1$ .exclude(".*/\\.svn"); //$NON-NLS-1$ @@ -120,6 +120,7 @@ .include("jboss-seam-ui\\.jar") //$NON-NLS-1$ .include("jsf-facelets\\.jar") //$NON-NLS-1$ .include("oscache.*\\.jar"); //$NON-NLS-1$ + public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT = new AntCopyUtils.FileSet() .include("antlr.*\\.jar") //$NON-NLS-1$ @@ -131,7 +132,9 @@ .include("jboss-seam.jar") //$NON-NLS-1$ .include("jbpm.*\\.jar") //$NON-NLS-1$ .include("security\\.drl") //$NON-NLS-1$ - .include("stringtemplate.*\\.jar"); //$NON-NLS-1$ + .include("stringtemplate.*\\.jar") //$NON-NLS-1$ + // el-ri needed for JBIDE-939 + .include("el-ri.*\\.jar"); //$NON-NLS-1$ public static AntCopyUtils.FileSet JBOSS_EAR_CONTENT_META_INF = new AntCopyUtils.FileSet() .include("META-INF/application\\.xml") //$NON-NLS-1$ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2007-10-26 11:37:38 UTC (rev 4534) +++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2007-10-26 12:43:46 UTC (rev 4535) @@ -21,7 +21,10 @@ <module> <java>jboss-seam.jar</java> </module> - + <module> + <java>el-ri.jar</java> + </module> + <!-- jBPM --> <module> <java>jbpm-3.1.4.jar</java> @@ -51,6 +54,7 @@ </module> <module> <java>stringtemplate-2.3b6.jar</java> - </module> + </module> + </application>