[jbosstools-commits] JBoss Tools SVN: r11797 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/core/project/facet and 1 other directories.

Author: snjeza Date: 2008-11-14 14:53:13 -0500 (Fri, 14 Nov 2008) New Revision: 11797 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java Log: JBIDE-3130 Seam 2.1 support: Facet and Runtime Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-14 19:20:25 UTC (rev 11796) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-14 19:53:13 UTC (rev 11797) @@ -105,6 +105,36 @@ </or> </constraint> </project-facet-version> + <project-facet-version + facet="jst.seam" + version="2.1"> + <constraint> + <or> + <requires + facet="jst.ear" + version="[5.0"> + </requires> + <requires + facet="jst.ejb" + version="[3.0"> + </requires> + <and> + <requires + facet="jst.web" + version="[2.5"> + </requires> + <requires + facet="jst.jsf" + version="[1.2"> + </requires> + <requires + facet="jst.java" + version="5.0"> + </requires> + </and> + </or> + </constraint> + </project-facet-version> <action facet="jst.seam" id="jst.seam.1.2.install" @@ -131,6 +161,18 @@ </action> <action facet="jst.seam" + id="jst.seam.2.1.install" + type="install" + version="2.1"> + <delegate + class="org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate"> + </delegate> + <config-factory + class="org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider"> + </config-factory> + </action> + <action + facet="jst.seam" id="jst.seam.1.2.uninstall" type="uninstall" version="1.2"> @@ -215,6 +257,17 @@ Configures a Dynamic Web application to use Seam v2.0 </description> </static-preset> + <static-preset + id="jst.seam21.preset"> + <label>Dynamic Web Project with Seam 2.1</label> + <facet id="jst.java" version="5.0"/> + <facet id="jst.web" version="2.5"/> + <facet id="jst.jsf" version="1.2"/> + <facet id="jst.seam" version="2.1"/> + <description> + Configures a Dynamic Web application to use Seam v2.1 + </description> + </static-preset> </extension> <extension Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-11-14 19:20:25 UTC (rev 11796) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-11-14 19:53:13 UTC (rev 11797) @@ -27,8 +27,13 @@ /** * Seam versions 2.0.X */ - SEAM_2_0("2.0"); //$NON-NLS-1$ //$NON-NLS-2$ + SEAM_2_0("2.0"), //$NON-NLS-1$ //$NON-NLS-2$ + /** + * Seam versions 2.1.X + */ + SEAM_2_1("2.1"); //$NON-NLS-1$ + String version = ""; //$NON-NLS-1$ SeamVersion(String version) { @@ -45,7 +50,7 @@ return version; } - public static SeamVersion[] ALL_VERSIONS = new SeamVersion[]{SEAM_1_2, SEAM_2_0}; + public static SeamVersion[] ALL_VERSIONS = new SeamVersion[]{SEAM_1_2, SEAM_2_0, SEAM_2_1}; /** * Get enumeration by string @@ -61,6 +66,8 @@ return SEAM_1_2; } else if (SEAM_2_0.toString().equals(version)) { return SEAM_2_0; + } else if (SEAM_2_1.toString().equals(version)) { + return SEAM_2_1; } throw new IllegalArgumentException(NLS.bind( "Seam version ''{0}'' is not supported", version)); //$NON-NLS-1$ //$NON-NLS-2$ @@ -80,6 +87,8 @@ return SEAM_1_2; } else if (SEAM_2_0.toString().equals(version)) { return SEAM_2_0; + } else if (SEAM_2_1.toString().equals(version)) { + return SEAM_2_1; } return null; } 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-11-14 19:20:25 UTC (rev 11796) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-11-14 19:53:13 UTC (rev 11797) @@ -63,13 +63,15 @@ .include("jboss-seam-pdf\\.jar") //$NON-NLS-1$ .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$ .include("jboss-seam-ui\\.jar") //$NON-NLS-1$ + .include("jboss-seam-excel\\.jar") //$NON-NLS-1$ .include("jboss-seam\\.jar") //$NON-NLS-1$ .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("mvel.*\\.jar") //$NON-NLS-1$ - .include("jboss-el.jar"); //$NON-NLS-1$ + .include("jboss-el.jar") //$NON-NLS-1$ + .include("jxl\\.jar"); //$NON-NLS-1$ public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet() .include("richfaces-impl\\.jar") //$NON-NLS-1$ @@ -82,6 +84,8 @@ .include("jboss-seam-pdf\\.jar") //$NON-NLS-1$ .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$ .include("jboss-seam-ui\\.jar") //$NON-NLS-1$ + .include("jboss-seam-excel\\.jar") //$NON-NLS-1$ + .include("jxl\\.jar") //$NON-NLS-1$ .include("jsf-facelets\\.jar"); //$NON-NLS-1$ public static String DROOLS_LIB_SEAM_RELATED_PATH = "lib"; //$NON-NLS-1$