[jbosstools-commits] JBoss Tools SVN: r11855 - in trunk/seam/plugins/org.jboss.tools.seam.core: META-INF and 1 other directories.

Author: akazakov Date: 2008-11-17 14:29:46 -0500 (Mon, 17 Nov 2008) New Revision: 11855 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2194 Set compilation level and java facet to the same ones for ejb,web,test seam projects. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-11-17 19:18:56 UTC (rev 11854) +++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-11-17 19:29:46 UTC (rev 11855) @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Eclipse-LazyStart: true +Bundle-ActivationPolicy: lazy Bundle-Name: Seam Core Plug-in Bundle-ClassPath: seam-core.jar Bundle-Activator: org.jboss.tools.seam.core.SeamCorePlugin @@ -48,14 +48,11 @@ org.eclipse.jst.jsf.common, org.eclipse.emf.ecore, org.eclipse.jst.j2ee.core, - org.eclipse.jst.jsf.facesconfig;bundle-version="1.1.0" -Provide-Package: org.jboss.tools.seam.core, - org.jboss.tools.seam.internal.core, - org.jboss.tools.seam.internal.core.scanner, - org.jboss.tools.seam.internal.core.preferences, - org.jboss.tools.seam.internal.core.refactoring + org.eclipse.jst.jsf.facesconfig, + org.eclipse.jst.common.frameworks Bundle-Version: 2.0.0 -Export-Package: org.jboss.tools.seam.core, +Export-Package: + org.jboss.tools.seam.core, org.jboss.tools.seam.core.event, org.jboss.tools.seam.core.project.facet, org.jboss.tools.seam.internal.core, Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-17 19:18:56 UTC (rev 11854) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-17 19:29:46 UTC (rev 11855) @@ -99,7 +99,7 @@ </requires> <requires facet="jst.java" - version="5.0"> + version="[5.0"> </requires> </and> </or> @@ -129,7 +129,7 @@ </requires> <requires facet="jst.java" - version="5.0"> + version="[5.0"> </requires> </and> </or> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2008-11-17 19:18:56 UTC (rev 11854) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2008-11-17 19:29:46 UTC (rev 11855) @@ -13,6 +13,7 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import java.util.Collections; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; @@ -27,14 +28,17 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action; import org.jboss.tools.common.util.ResourcesUtils; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamRuntime; @@ -232,7 +236,18 @@ if (!SeamFacetAbstractInstallDelegate.isWarConfiguration(model)) { IProject ejbProjectToBeImported = wsRoot.getProject(ejbProjectName); + ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath + "/" + ejbProjectName, ejbProjectName, monitor, false); + // Set up compilation level and java facet for ejb project. + String level = JavaFacetUtils.getCompilerLevel(seamWebProject); + String ejbLevel = JavaFacetUtils.getCompilerLevel(ejbProjectToBeImported); + if (!ejbLevel.equals(level)) { + JavaFacetUtils.setCompilerLevel(ejbProjectToBeImported, level); + } + Action action = new Action(Action.Type.VERSION_CHANGE, JavaFacetUtils.compilerLevelToFacet(level), null); + IFacetedProject facetedProject = ProjectFacetsManager.create(ejbProjectToBeImported); + facetedProject.modify(Collections.singleton(action), null); + SeamFacetAbstractInstallDelegate.toggleHibernateOnProject(ejbProjectToBeImported, consoleName); IProjectFacet sf = ProjectFacetsManager.getProjectFacet("jst.ejb"); IProjectFacetVersion pfv = ProjectFacetsManager.create(ejbProjectToBeImported).getInstalledVersion(sf); @@ -245,6 +260,13 @@ IProject testProjectToBeImported = wsRoot.getProject(testProjectName); ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath + "/" + testProjectName, testProjectName, monitor, true); + // Set up compilation level for test project. + String level = JavaFacetUtils.getCompilerLevel(seamWebProject); + String testLevel = JavaFacetUtils.getCompilerLevel(testProjectToBeImported); + if (!testLevel.equals(level)) { + JavaFacetUtils.setCompilerLevel(testProjectToBeImported, level); + } + SeamFacetAbstractInstallDelegate.toggleHibernateOnProject(testProjectToBeImported, consoleName); createSeamProjectPreferenes();