Attachment #160896 for bug #241670

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 241670
Collapse All | Expand All

Lines 17-22 Link Here

(-)jee-models/org/eclipse/jst/javaee/webfragment/internal/util/WebfragmentResourceImpl.java (-1 / +2 lines)
17	import org.eclipse.emf.ecore.xmi.XMLLoad;	17	import org.eclipse.emf.ecore.xmi.XMLLoad;
18	import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;	18	import org.eclipse.jst.javaee.core.JEEXMLLoadImpl;
19	import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;	19	import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
		20	import org.eclipse.jst.javaee.web.IWebFragmentResource;
20	import org.eclipse.jst.javaee.web.WebFragment;	21	import org.eclipse.jst.javaee.web.WebFragment;
21	import org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor;	22	import org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor;
22	import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;	23	import org.eclipse.wst.common.internal.emf.resource.IRootObjectResource;
Lines 28-34 Link Here
28	* @see org.eclipse.jst.javaee.webfragment.internal.util.WebfragmentResourceFactoryImpl	29	* @see org.eclipse.jst.javaee.webfragment.internal.util.WebfragmentResourceFactoryImpl
29	* @generated	30	* @generated
30	*/	31	*/
31	public class WebfragmentResourceImpl extends JavaeeResourceImpl implements IRootObjectResource {	32	public class WebfragmentResourceImpl extends JavaeeResourceImpl implements IRootObjectResource, IWebFragmentResource {
32	/**	33	/**
33	* Creates an instance of the resource.	34	* Creates an instance of the resource.
34	* <!-- begin-user-doc -->	35	* <!-- begin-user-doc -->

Lines 13-19 Link Here

(-)property_files/web_ui.properties (-1 / +1 lines)
13	_2=Servlet version:	13	_2=Servlet version:
14	_3=Dynamic Web Project	14	_3=Dynamic Web Project
15	_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.	15	_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
16	_5=Project:	16	_5=Web &project:
17	_6=WAR file:	17	_6=WAR file:
18	_7=Import a WAR file from the file system	18	_7=Import a WAR file from the file system
19	_8=WAR Import	19	_8=WAR Import




import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;
import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;

import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;

	protected Composite createTopLevelComposite(Composite parent) {
		Composite composite = super.createTopLevelComposite(parent);
		
		//bug 303931
		// projectNameLabel.setText(WEBUIMessages.WEB_PROJECT_LBL);
		
		addSeperator(composite, 3);
		createUseExistingGroup(composite);

		existingButton.notifyListeners(SWT.Selection, new Event());
	}
	
	@Override
	protected boolean isProjectValid(IProject project) {
		boolean result;
		try {
			result = project.isAccessible() && 
				project.hasNature(IModuleConstants.MODULE_NATURE_ID) && 
			 	(JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project));
		} catch (CoreException ce) {
			result = false;
		}
		return result;
	}
	
}





import org.eclipse.core.resources.IProject;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
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.jee.ui.internal.navigator.AbstractDDNode;
import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
import org.eclipse.swt.widgets.Composite;

	protected Composite createTopLevelComposite(Composite parent) {
		Composite composite = super.createTopLevelComposite(parent);
		
		// bug 303917
		//projectNameLabel.setText(EJBUIMessages.EJB_PROJECT_LBL);
		
		return composite;
	}

	@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
		boolean isJEEProject = J2EEProjectUtilities.isJEEProject(project);
		if (isJEEProject)
		{
			if (!result)
			{
				result = (JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project));
			}
		}
		else
		{
			result = false;
		}
		return result;
	}
	

Lines 229-235 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java (-1 / +1 lines)
229	try {	229	try {
230	result = project.isAccessible() &&	230	result = project.isAccessible() &&
231	project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&	231	project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
232	(JavaEEProjectUtilities.isDynamicWebProject(project) \|\| JavaEEProjectUtilities.isWebFragmentProject(project));	232	JavaEEProjectUtilities.getJ2EEProjectType(project).equals(projectType);
233	} catch (CoreException ce) {	233	} catch (CoreException ce) {
234	result = false;	234	result = false;
235	}	235	}




import java.util.List;
import java.util.Set;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.jst.javaee.ejb.EJBJar;
import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
import org.eclipse.jst.javaee.ejb.SessionBean;

		// check if an EJB with the same name already exists
		String projectName = getStringProperty(PROJECT_NAME);
		if (projectName != null && projectName.length() > 0) {
			IProject project = getTargetProject();
			if (JavaEEProjectUtilities.isEJBProject(project))
			EnterpriseBeans enterpriseBeans = modelObject.getEnterpriseBeans();
			if (enterpriseBeans != null)
			{
				IModelProvider provider = ModelProviderManager.getModelProvider(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));
				EJBJar modelObject = (EJBJar) provider.getModelObject();
				EnterpriseBeans enterpriseBeans = modelObject.getEnterpriseBeans();
				if (enterpriseBeans != null)
				{
					List sessionBeans = enterpriseBeans.getSessionBeans();
					for (Object object : sessionBeans) {
						SessionBean session = (SessionBean) object;
						if (session.getEjbName().equals(getDataModel().getStringProperty(EJB_NAME).trim())){
							return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.ERR_BEAN_ALREADY_EXISTS);
						}
					}
				}
			}
			// TODO - load/check the validity of the name in a web project/ web fragment
		}
		return Status.OK_STATUS;
	}




import org.eclipse.jdt.core.Signature;
import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;

	}

	private boolean ejb31OrLater() {
		boolean retVal = false;
		IProject project = getTargetProject();
		if (JavaEEProjectUtilities.isEJBProject(project))
		{
			IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
			int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
			retVal = version >= J2EEVersionConstants.VERSION_3_1;
		}
		else if (JavaEEProjectUtilities.isDynamicWebProject(project))
		{
			IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
			int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
			retVal = version >= J2EEVersionConstants.VERSION_3_0;
		}
		else if (JavaEEProjectUtilities.isWebFragmentProject(project))
		{
			IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.WEBFRAGMENT);
			int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
			retVal = version >= J2EEVersionConstants.VERSION_3_0;
		}
		return retVal;
	}
	
}

Return to bug 241670

Lines 48-54 Link Here

(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java (-2 / +16 lines)
48	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;	48	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
49	import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;	49	import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;
50	import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;	50	import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
51	import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
52	import org.eclipse.swt.SWT;	51	import org.eclipse.swt.SWT;
53	import org.eclipse.swt.events.SelectionAdapter;	52	import org.eclipse.swt.events.SelectionAdapter;
54	import org.eclipse.swt.events.SelectionEvent;	53	import org.eclipse.swt.events.SelectionEvent;
Lines 61-66 Link Here
61	import org.eclipse.ui.IWorkbenchWindow;	60	import org.eclipse.ui.IWorkbenchWindow;
62	import org.eclipse.ui.PlatformUI;	61	import org.eclipse.ui.PlatformUI;
63	import org.eclipse.wst.common.componentcore.ComponentCore;	62	import org.eclipse.wst.common.componentcore.ComponentCore;
		63	import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
64	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	64	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
65	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;	65	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
66	import org.eclipse.wst.common.project.facet.core.IFacetedProject;	66	import org.eclipse.wst.common.project.facet.core.IFacetedProject;
Lines 83-89 Link Here
83	protected Composite createTopLevelComposite(Composite parent) {	83	protected Composite createTopLevelComposite(Composite parent) {
84	Composite composite = super.createTopLevelComposite(parent);	84	Composite composite = super.createTopLevelComposite(parent);
85		85
86	projectNameLabel.setText(WEBUIMessages.WEB_PROJECT_LBL);	86	//bug 303931
		87	// projectNameLabel.setText(WEBUIMessages.WEB_PROJECT_LBL);
87		88
88	addSeperator(composite, 3);	89	addSeperator(composite, 3);
89	createUseExistingGroup(composite);	90	createUseExistingGroup(composite);
Lines 433-436 Link Here
433	existingButton.notifyListeners(SWT.Selection, new Event());	434	existingButton.notifyListeners(SWT.Selection, new Event());
434	}	435	}
435		436
		437	@Override
		438	protected boolean isProjectValid(IProject project) {
		439	boolean result;
		440	try {
		441	result = project.isAccessible() &&
		442	project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
		443	(JavaEEProjectUtilities.isDynamicWebProject(project) \|\| JavaEEProjectUtilities.isWebFragmentProject(project));
		444	} catch (CoreException ce) {
		445	result = false;
		446	}
		447	return result;
		448	}
		449
436	}	450	}

Lines 12-20 Link Here

(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/NewEnterpriseBeanClassWizardPage.java (-3 / +16 lines)
12		12
13	import org.eclipse.core.resources.IProject;	13	import org.eclipse.core.resources.IProject;
14	import org.eclipse.jem.util.emf.workbench.ProjectUtilities;	14	import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
15	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
16	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;	15	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
17	import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;	16	import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
		17	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
18	import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;	18	import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
19	import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;	19	import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
20	import org.eclipse.swt.widgets.Composite;	20	import org.eclipse.swt.widgets.Composite;
Lines 31-37 Link Here
31	protected Composite createTopLevelComposite(Composite parent) {	31	protected Composite createTopLevelComposite(Composite parent) {
32	Composite composite = super.createTopLevelComposite(parent);	32	Composite composite = super.createTopLevelComposite(parent);
33		33
34	projectNameLabel.setText(EJBUIMessages.EJB_PROJECT_LBL);	34	// bug 303917
		35	//projectNameLabel.setText(EJBUIMessages.EJB_PROJECT_LBL);
35		36
36	return composite;	37	return composite;
37	}	38	}
Lines 39-45 Link Here
39	@Override	40	@Override
40	protected boolean isProjectValid(IProject project) {	41	protected boolean isProjectValid(IProject project) {
41	boolean result = super.isProjectValid(project);	42	boolean result = super.isProjectValid(project);
42	result = result && J2EEProjectUtilities.isJEEProject(project);	43	// 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
		44	boolean isJEEProject = J2EEProjectUtilities.isJEEProject(project);
		45	if (isJEEProject)
		46	{
		47	if (!result)
		48	{
		49	result = (JavaEEProjectUtilities.isDynamicWebProject(project) \|\| JavaEEProjectUtilities.isWebFragmentProject(project));
		50	}
		51	}
		52	else
		53	{
		54	result = false;
		55	}
43	return result;	56	return result;
44	}	57	}
45		58

Lines 44-49 Link Here

(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassOperation.java (-3 / +7 lines)
44	import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;	44	import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
45	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;	45	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
46	import org.eclipse.jst.j2ee.project.EJBUtilities;	46	import org.eclipse.jst.j2ee.project.EJBUtilities;
		47	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
47	import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;	48	import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
48	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;	49	import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
49	import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;	50	import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
Lines 191-197 Link Here
191		192
192	protected void generateInterfacesUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment, CreateSessionBeanTemplateModel tempModel)	193	protected void generateInterfacesUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment, CreateSessionBeanTemplateModel tempModel)
193	throws JETException, JavaModelException {	194	throws JETException, JavaModelException {
194	boolean useClientJar = EJBUtilities.hasEJBClientJARProject(getTargetProject());	195	IProject project = getTargetProject();
		196	boolean useClientJar = false;
		197	if (JavaEEProjectUtilities.isEJBProject(project))
		198	{
		199	useClientJar = EJBUtilities.hasEJBClientJARProject(getTargetProject());
		200	}
195	List<BusinessInterface> interfaces = tempModel.getBusinessInterfaces();	201	List<BusinessInterface> interfaces = tempModel.getBusinessInterfaces();
196	for (BusinessInterface iface : interfaces) {	202	for (BusinessInterface iface : interfaces) {
197	if (!iface.exists()) {	203	if (!iface.exists()) {
Lines 217-223 Link Here
217	String remoteFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_HOME_INTERFACE);	223	String remoteFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_HOME_INTERFACE);
218	String remoteComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE);	224	String remoteComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.REMOTE_COMPONENT_INTERFACE);
219		225
220	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(model.getStringProperty(INewSessionBeanClassDataModelProperties.PROJECT_NAME));
221	IJavaProject javaProject = JavaCore.create(project);	226	IJavaProject javaProject = JavaCore.create(project);
222	IType type = javaProject.findType(remoteFullName);	227	IType type = javaProject.findType(remoteFullName);
223		228
Lines 250-256 Link Here
250	String localFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE);	255	String localFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_HOME_INTERFACE);
251	String localComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE);	256	String localComponentFullName = model.getStringProperty(INewSessionBeanClassDataModelProperties.LOCAL_COMPONENT_INTERFACE);
252		257
253	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(model.getStringProperty(INewSessionBeanClassDataModelProperties.PROJECT_NAME));
254	IJavaProject javaProject = JavaCore.create(project);	258	IJavaProject javaProject = JavaCore.create(project);
255	IType type = javaProject.findType(localFullName);	259	IType type = javaProject.findType(localFullName);
256		260

Lines 20-25 Link Here

(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java (-9 / +16 lines)
20	import java.util.List;	20	import java.util.List;
21	import java.util.Set;	21	import java.util.Set;
22		22
		23	import org.eclipse.core.resources.IProject;
23	import org.eclipse.core.resources.ResourcesPlugin;	24	import org.eclipse.core.resources.ResourcesPlugin;
24	import org.eclipse.core.runtime.IStatus;	25	import org.eclipse.core.runtime.IStatus;
25	import org.eclipse.core.runtime.Status;	26	import org.eclipse.core.runtime.Status;
Lines 28-33 Link Here
28	import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;	29	import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBCreationResourceHandler;
29	import org.eclipse.jst.j2ee.model.IModelProvider;	30	import org.eclipse.jst.j2ee.model.IModelProvider;
30	import org.eclipse.jst.j2ee.model.ModelProviderManager;	31	import org.eclipse.jst.j2ee.model.ModelProviderManager;
		32	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
31	import org.eclipse.jst.javaee.ejb.EJBJar;	33	import org.eclipse.jst.javaee.ejb.EJBJar;
32	import org.eclipse.jst.javaee.ejb.EnterpriseBeans;	34	import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
33	import org.eclipse.jst.javaee.ejb.SessionBean;	35	import org.eclipse.jst.javaee.ejb.SessionBean;
Lines 155-173 Link Here
155	// check if an EJB with the same name already exists	157	// check if an EJB with the same name already exists
156	String projectName = getStringProperty(PROJECT_NAME);	158	String projectName = getStringProperty(PROJECT_NAME);
157	if (projectName != null && projectName.length() > 0) {	159	if (projectName != null && projectName.length() > 0) {
158	IModelProvider provider = ModelProviderManager.getModelProvider(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));	160	IProject project = getTargetProject();
159	EJBJar modelObject = (EJBJar) provider.getModelObject();	161	if (JavaEEProjectUtilities.isEJBProject(project))
160	EnterpriseBeans enterpriseBeans = modelObject.getEnterpriseBeans();
161	if (enterpriseBeans != null)
162	{	162	{
163	List sessionBeans = enterpriseBeans.getSessionBeans();	163	IModelProvider provider = ModelProviderManager.getModelProvider(ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));
164	for (Object object : sessionBeans) {	164	EJBJar modelObject = (EJBJar) provider.getModelObject();
165	SessionBean session = (SessionBean) object;	165	EnterpriseBeans enterpriseBeans = modelObject.getEnterpriseBeans();
166	if (session.getEjbName().equals(getDataModel().getStringProperty(EJB_NAME).trim())){	166	if (enterpriseBeans != null)
167	return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.ERR_BEAN_ALREADY_EXISTS);	167	{
		168	List sessionBeans = enterpriseBeans.getSessionBeans();
		169	for (Object object : sessionBeans) {
		170	SessionBean session = (SessionBean) object;
		171	if (session.getEjbName().equals(getDataModel().getStringProperty(EJB_NAME).trim())){
		172	return new Status(IStatus.ERROR, EjbPlugin.PLUGIN_ID, EJBCreationResourceHandler.ERR_BEAN_ALREADY_EXISTS);
		173	}
168	}	174	}
169	}	175	}
170	}	176	}
		177	// TODO - load/check the validity of the name in a web project/ web fragment
171	}	178	}
172	return Status.OK_STATUS;	179	return Status.OK_STATUS;
173	}	180	}

Lines 44-49 Link Here

(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewSessionBeanClassDataModelProvider.java (-4 / +21 lines)
44	import org.eclipse.jdt.core.Signature;	44	import org.eclipse.jdt.core.Signature;
45	import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;	45	import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
46	import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;	46	import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin;
		47	import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
47	import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;	48	import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages;
48	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;	49	import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
49	import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;	50	import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
Lines 500-510 Link Here
500	}	501	}
501		502
502	private boolean ejb31OrLater() {	503	private boolean ejb31OrLater() {
		504	boolean retVal = false;
503	IProject project = getTargetProject();	505	IProject project = getTargetProject();
504	IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);	506	if (JavaEEProjectUtilities.isEJBProject(project))
505	int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());	507	{
506	int ejb31version = J2EEVersionUtil.convertVersionStringToInt(IJ2EEFacetConstants.EJB_31.getVersionString());	508	IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.EJB);
507	return version >= ejb31version;	509	int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
		510	retVal = version >= J2EEVersionConstants.VERSION_3_1;
		511	}
		512	else if (JavaEEProjectUtilities.isDynamicWebProject(project))
		513	{
		514	IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
		515	int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
		516	retVal = version >= J2EEVersionConstants.VERSION_3_0;
		517	}
		518	else if (JavaEEProjectUtilities.isWebFragmentProject(project))
		519	{
		520	IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.WEBFRAGMENT);
		521	int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
		522	retVal = version >= J2EEVersionConstants.VERSION_3_0;
		523	}
		524	return retVal;
508	}	525	}
509		526
510	}	527	}