@@ -232,7 +232,9 @@ public String getNamespace(EPackage ePackage)
 		initURIs();
 		if (ePackage instanceof ApplicationPackage || ePackage instanceof ApplicationclientPackage ||ePackage instanceof EjbPackage ||ePackage instanceof JcaPackage || ePackage instanceof WebPackage)
 		{
-			retVal = uri;
+			// bug 409872 - we need to return the Java EE namespace, not the xsd URI
+//			retVal = uri;
+			retVal = javaeeUri;
 		}
 		else if (ePackage instanceof JavaeePackage)
 		{
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,9 @@ public String getNamespace(EPackage ePackage)`
`232`	`232`	`initURIs();`
`233`	`233`	`if (ePackage instanceof ApplicationPackage \|\| ePackage instanceof ApplicationclientPackage \|\|ePackage instanceof EjbPackage \|\|ePackage instanceof JcaPackage \|\| ePackage instanceof WebPackage)`
`234`	`234`	`{`
`235`		`- retVal = uri;`
	`235`	`+ // bug 409872 - we need to return the Java EE namespace, not the xsd URI`
	`236`	`+// retVal = uri;`
	`237`	`+ retVal = javaeeUri;`
`236`	`238`	`}`
`237`	`239`	`else if (ePackage instanceof JavaeePackage)`
`238`	`240`	`{`