Attachment 227764 Details for Bug 399524 – EJB Tools Patch r1 v2

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

[patch] EJB Tools Patch r1 v2

Bug399524.EjbToolsPatch.v2.txt (text/plain), 4.12 KB, created by Konstantin Komissarchik

on 2013-02-28 17:11:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Komissarchik

Created: 2013-02-28 17:11:27 EST

Size: 4.12 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>index 7b425fd..12a563e 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
>@@ -102,7 +102,7 @@
> 				}
> 			}
> 			
>-			if( fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
>+			if( fv == IJ2EEFacetConstants.EJB_32 || fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
>             {
>                 if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
>                     // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
>@@ -110,7 +110,9 @@
>                     if (!ejbJarXmlFile.exists()) {
>                         try {
>                         	String ejbJarXmlContents = null;
>-                        	if(fv == IJ2EEFacetConstants.EJB_31) {
>+                        	if(fv == IJ2EEFacetConstants.EJB_32) {
>+	                            ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.2\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>+                        	} else if(fv == IJ2EEFacetConstants.EJB_31) {
> 	                            ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.1\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>                         	} else {
>                         		ejbJarXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ejb-jar version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\">\n  <display-name>" + XMLWriter.getEscaped(project.getName()) +" </display-name> \n </ejb-jar>"; //$NON-NLS-1$ //$NON-NLS-2$
>diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>index 75ef855..ae85a43 100644
>--- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>+++ b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
>@@ -198,16 +198,26 @@
>       	<group-member id="modules"/>
>     </project-facet-version>
>     
>-    <action facet="jst.ejb" version="[1.1-3.1]" type="INSTALL" id="jst.ejb.install">
>+	<project-facet-version facet="jst.ejb" version="3.2">
>+		<constraint>
>+ 	       <and>
>+ 		       	<requires facet="jst.java" version="[7.0"/>
>+ 	         	<conflicts group="modules"/>
>+ 	       </and>
>+    	</constraint>
>+      	<group-member id="modules"/>
>+    </project-facet-version>
>+    
>+    <action facet="jst.ejb" type="INSTALL" id="jst.ejb.install">
>       <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
>       <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
>     </action>
>     
>-    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="POST_INSTALL">
>+    <event-handler facet="jst.ejb" type="POST_INSTALL">
>       <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
>     </event-handler>
>     
>-    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="RUNTIME_CHANGED">
>+    <event-handler facet="jst.ejb" type="RUNTIME_CHANGED">
>       <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
>     </event-handler>
>

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