commit f1f635d31ec4fcbb330f4853b764830fd6c2a9b6
author Carl Anderson <ccc@us.ibm.com> Wed May 01 15:17:21 2013 -0500
committer Roberto Sanchez <rsanchez@mx1.ibm.com> Wed May 01 15:17:21 2013 -0500
tree 9d3330e8ff83a100dd601341060b894c28a6f84c
parent 90b6b79795d4d42a377cf08e676bcabb79d26991

[405873] "Generate Deployment Descriptor Stub" generates incorrect web.xml for web 3.1

plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java

diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
index fe6f497..dac4e8f 100644
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
+++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
@@ -66,10 +66,15 @@
 			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.EJB_JAR_SCHEMA_LOC_3_0);
 			jar.setVersion(J2EEVersionConstants.VERSION_3_0_TEXT);
 		}
-		else {
+		else if(version != null && version.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {
 			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.EJB_JAR_SCHEMA_LOC_3_1);
 			jar.setVersion(J2EEVersionConstants.VERSION_3_1_TEXT);
 		}
+		else {
+			dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL);  //$NON-NLS-1$
+			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.EJB_JAR_SCHEMA_LOC_3_2);
+			jar.setVersion(J2EEVersionConstants.VERSION_3_2_TEXT);
+		}
 		dd.setEjbJar(jar);
 		res.getContents().add((EObject) dd);
 	}