Attachment 228456 Details for Bug 399524 – EJB Tools Patch r2 v1

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

[patch] EJB Tools Patch r2 v1

Bug399524.EjbToolsPatch.r2.v1.txt (text/plain), 3.14 KB, created by Konstantin Komissarchik

on 2013-03-15 01:06:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Komissarchik

Created: 2013-03-15 01:06:18 EDT

Size: 3.14 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
>index fbd69d7..3e1b4b8 100644
>--- a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
>+++ b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
>@@ -45,7 +45,8 @@
>  org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
>  org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
>- org.eclipse.jst.jee.ui;bundle-version="[1.0.100,2.0.0)"
>+ org.eclipse.jst.jee.ui;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)"
> Eclipse-LazyStart: true
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Import-Package: org.eclipse.emf.codegen.jet
>diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
>index 4e3a7eb..c8ab0dd 100644
>--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
>+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
>@@ -14,7 +14,7 @@
> import java.util.HashSet;
> import java.util.Set;
> 
>-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
>+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;
>@@ -54,22 +54,26 @@
> 	    else {
> 		    facets.add(primaryFacetVersion);
> 		    
>-		    if(primaryFacetVersion == IJ2EEFacetConstants.EJB_31)
>+		    if(primaryFacetVersion == IJ2EEFacetConstants.EJB_32)
> 		    {
>-		        facets.add(JavaFacetUtils.JAVA_60);
>+		        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(JavaFacetUtils.JAVA_50);
>+		        facets.add(JavaFacet.VERSION_1_5);
> 		    }
> 		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_21)
> 		    {
>-		        facets.add(JavaFacetUtils.JAVA_14);
>+		        facets.add(JavaFacet.VERSION_1_4);
> 		    }
> 		    else if(primaryFacetVersion == IJ2EEFacetConstants.EJB_20 || 
> 		    		primaryFacetVersion == IJ2EEFacetConstants.EJB_11)
> 		    {
>-		        facets.add(JavaFacetUtils.JAVA_13);
>+		        facets.add(JavaFacet.VERSION_1_3);
> 		    }
> 	    }
> 	    return Collections.unmodifiableSet( facets );
>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>index ae85a43..92d134c 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>@@ -201,7 +201,7 @@
> 	<project-facet-version facet="jst.ejb" version="3.2">
> 		<constraint>
>  	       <and>
>- 		       	<requires facet="jst.java" version="[7.0"/>
>+ 		       	<requires facet="jst.java" version="[1.7"/>
>  	         	<conflicts group="modules"/>
>  	       </and>
>     	</constraint>

Flags:

ccc: iplog+

Actions: View | Diff

Attachments on bug 399524: 226470 | 226472 | 226473 | 226474 | 226543 | 226544 | 227758 | 227759 | 227761 | 227762 | 227763 | 227764 | 227770 | 227772 | 228033 | 228379 | 228382 | 228456