[317436] Session Bean wizard allows creation of EJBs in Web 2.5 projects.
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanClassWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanClassWizardPage.java
index 0fafb36..5661314 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanClassWizardPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanClassWizardPage.java
@@ -12,13 +12,17 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
+import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
public class NewEnterpriseBeanClassWizardPage extends NewJavaClassWizardPage {
@@ -40,13 +44,22 @@
@Override
protected boolean isProjectValid(IProject project) {
boolean result = super.isProjectValid(project);
- // bug 241670 - 3.x EJBs can be created in 3.x EJB project, or Web 2.5 or Web 3.0 or Web Fragment 3.0
+ // bug 241670 - 3.x EJBs can be created in 3.x EJB project, or Web 3.0 or Web Fragment 3.0
boolean isJEEProject = J2EEProjectUtilities.isJEEProject(project);
if (isJEEProject)
{
if (!result)
{
- result = (JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project));
+ result = JavaEEProjectUtilities.isWebFragmentProject(project);
+ if (!result)
+ {
+ IProjectFacetVersion webFacetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
+ if (webFacetVersion != null)
+ {
+ int version = J2EEVersionUtil.convertVersionStringToInt(webFacetVersion.getVersionString());
+ result = (version >= J2EEVersionConstants.VERSION_3_0);
+ }
+ }
}
}
else
