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 399524 | Differences between
and this patch

Collapse All | Expand All

(-)a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java (-2 / +4 lines)
Lines 102-108 Link Here
102 
				}
 102 
				}
103 
			}
 103 
			}
104
104
105 
			if( fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
 105 
			if( fv == IJ2EEFacetConstants.EJB_32 || fv == IJ2EEFacetConstants.EJB_31 || fv == IJ2EEFacetConstants.EJB_30)
106 
            {
 106 
            {
107 
                if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
 107 
                if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
108 
                    // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
 108 
                    // Create the deployment descriptor (ejb-jar.xml) if one doesn't exist
Lines 110-116 Link Here
110 
                    if (!ejbJarXmlFile.exists()) {
 110 
                    if (!ejbJarXmlFile.exists()) {
111 
                        try {
 111 
                        try {
112 
                        	String ejbJarXmlContents = null;
 112 
                        	String ejbJarXmlContents = null;
113 
                        	if(fv == IJ2EEFacetConstants.EJB_31) {
 113 
                        	if(fv == IJ2EEFacetConstants.EJB_32) {
114 
	                            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$
115 
                        	} else if(fv == IJ2EEFacetConstants.EJB_31) {
114 
	                            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$
 116 
	                            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$
115 
                        	} else {
 117 
                        	} else {
116 
                        		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$
 118 
                        		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$
(-)a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml (-3 / +13 lines)
Lines 198-213 Link Here
198 
      	<group-member id="modules"/>
 198 
      	<group-member id="modules"/>
199 
    </project-facet-version>
 199 
    </project-facet-version>
200
200
201 
    <action facet="jst.ejb" version="[1.1-3.1]" type="INSTALL" id="jst.ejb.install">
 201 
	<project-facet-version facet="jst.ejb" version="3.2">
202 
		<constraint>
203 
 	       <and>
204 
 		       	<requires facet="jst.java" version="[7.0"/>
205 
 	         	<conflicts group="modules"/>
206 
 	       </and>
207 
    	</constraint>
208 
      	<group-member id="modules"/>
209 
    </project-facet-version>
210
211 
    <action facet="jst.ejb" type="INSTALL" id="jst.ejb.install">
202 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
 212 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
203 
      <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
 213 
      <config-factory class="org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider"/>
204 
    </action>
 214 
    </action>
205
215
206 
    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="POST_INSTALL">
 216 
    <event-handler facet="jst.ejb" type="POST_INSTALL">
207 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
 217 
      <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetPostInstallDelegate"/>
208 
    </event-handler>
 218 
    </event-handler>
209
219
210 
    <event-handler facet="jst.ejb" version="[1.1-3.1]" type="RUNTIME_CHANGED">
 220 
    <event-handler facet="jst.ejb" type="RUNTIME_CHANGED">
211 
      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
 221 
      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
212 
    </event-handler>
 222 
    </event-handler>
213
223

Return to bug 399524