summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Anderson2013-05-01 16:17:21 (EDT)
committer Roberto Sanchez2013-05-01 16:17:21 (EDT)
commitf1f635d31ec4fcbb330f4853b764830fd6c2a9b6 (patch)
tree9d3330e8ff83a100dd601341060b894c28a6f84c
parent90b6b79795d4d42a377cf08e676bcabb79d26991 (diff)
downloadwebtools.ejb-f1f635d31ec4fcbb330f4853b764830fd6c2a9b6.zip
webtools.ejb-f1f635d31ec4fcbb330f4853b764830fd6c2a9b6.tar.gz
webtools.ejb-f1f635d31ec4fcbb330f4853b764830fd6c2a9b6.tar.bz2
[405873] "Generate Deployment Descriptor Stub" generates incorrect web.xml for web 3.1
-rw-r--r--plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java7
1 files changed, 6 insertions, 1 deletions
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 @@ public class Ejb3ModelProvider extends JEE5ModelProvider {
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);
}