Attachment #228456 for bug #399524

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

Lines 45-51 Link Here

(-)a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF (-1 / +2 lines)
45	org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",	45	org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
46	org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",	46	org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
47	org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",	47	org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
48	org.eclipse.jst.jee.ui;bundle-version="[1.0.100,2.0.0)"	48	org.eclipse.jst.jee.ui;bundle-version="[1.0.100,2.0.0)",
		49	org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)"
49	Eclipse-LazyStart: true	50	Eclipse-LazyStart: true
50	Bundle-RequiredExecutionEnvironment: J2SE-1.5	51	Bundle-RequiredExecutionEnvironment: J2SE-1.5
51	Import-Package: org.eclipse.emf.codegen.jet	52	Import-Package: org.eclipse.emf.codegen.jet




import java.util.HashSet;
import java.util.Set;

import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;

	    else {
		    facets.add(primaryFacetVersion);
		    
		    if(primaryFacetVersion == IJ2EEFacetConstants.EJB_32)
		    {
		        facets.add(JavaFacet.VERSION_1_7);
		    }
		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_31)
		    {
		        facets.add(JavaFacet.VERSION_1_6);
		    }
		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_30)
		    {
		        facets.add(JavaFacet.VERSION_1_5);
		    }
		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_21)
		    {
		        facets.add(JavaFacet.VERSION_1_4);
		    }
		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_20 || 
		    		primaryFacetVersion == IJ2EEFacetConstants.EJB_11)
		    {
		        facets.add(JavaFacet.VERSION_1_3);
		    }
	    }
	    return Collections.unmodifiableSet( facets );

Lines 201-207 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml (-1 / +1 lines)
201	<project-facet-version facet="jst.ejb" version="3.2">	201	<project-facet-version facet="jst.ejb" version="3.2">
202	<constraint>	202	<constraint>
203	<and>	203	<and>
204	<requires facet="jst.java" version="[7.0"/>	204	<requires facet="jst.java" version="[1.7"/>
205	<conflicts group="modules"/>	205	<conflicts group="modules"/>
206	</and>	206	</and>
207	</constraint>	207	</constraint>

Return to bug 399524

Lines 14-20 Link Here

(-)a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java (-6 / +10 lines)
14	import java.util.HashSet;	14	import java.util.HashSet;
15	import java.util.Set;	15	import java.util.Set;
16		16
17	import org.eclipse.jst.common.project.facet.JavaFacetUtils;	17	import org.eclipse.jst.common.project.facet.core.JavaFacet;
18	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;	18	import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
19	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;	19	import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
20	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;	20	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
Lines 54-75 Link Here
54	else {	54	else {
55	facets.add(primaryFacetVersion);	55	facets.add(primaryFacetVersion);
56		56
57	if(primaryFacetVersion == IJ2EEFacetConstants.EJB_31)	57	if(primaryFacetVersion == IJ2EEFacetConstants.EJB_32)
58	{	58	{
59	facets.add(JavaFacetUtils.JAVA_60);	59	facets.add(JavaFacet.VERSION_1_7);
		60	}
		61	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_31)
		62	{
		63	facets.add(JavaFacet.VERSION_1_6);
60	}	64	}
61	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_30)	65	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_30)
62	{	66	{
63	facets.add(JavaFacetUtils.JAVA_50);	67	facets.add(JavaFacet.VERSION_1_5);
64	}	68	}
65	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_21)	69	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_21)
66	{	70	{
67	facets.add(JavaFacetUtils.JAVA_14);	71	facets.add(JavaFacet.VERSION_1_4);
68	}	72	}
69	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_20 \|\|	73	else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_20 \|\|
70	primaryFacetVersion == IJ2EEFacetConstants.EJB_11)	74	primaryFacetVersion == IJ2EEFacetConstants.EJB_11)
71	{	75	{
72	facets.add(JavaFacetUtils.JAVA_13);	76	facets.add(JavaFacet.VERSION_1_3);
73	}	77	}
74	}	78	}
75	return Collections.unmodifiableSet( facets );	79	return Collections.unmodifiableSet( facets );