Fixes #121: Updates deployment descriptors to Java EE 6

sculptor · Feb 22, 2015 · 9f27f8d · 9f27f8d
1 parent cc25fd1
commit 9f27f8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...ator-templates/src/main/java/org/sculptor/generator/template/rest/RestWebConfigTmpl.xtend b/...ator-templates/src/main/java/org/sculptor/generator/template/rest/RestWebConfigTmpl.xtend
@@ -43,8 +43,8 @@ def String config(Application it) {
 def String webXml(Application it) {
 	fileOutput("WEB-INF/web.xml", OutputSlot::TO_WEBROOT, '''
 	<?xml version="1.0" encoding="UTF-8"?>
-	<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<web-app 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/web-app_3_0.xsd">
 
 	<display-name>«name»</display-name>
 	<description>«name»</description>

diff --git a/...-templates/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend b/...-templates/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend
@@ -50,12 +50,12 @@ def String serviceJUnitSubclassOpenEjb(Service it) {
 	 */
 	public class «name»Test extends «IF jpa()»«fw("test.AbstractOpenEJBDbUnitTest")»«ELSE»«fw("test.AbstractOpenEJBTest")»«ENDIF» implements «name»TestBase {
 
-	@javax.ejb.EJB
+		@javax.ejb.EJB
 		private «it.getServiceapiPackage()».«name» «name.toFirstLower()»;
 
 		«serviceTestTmpl.serviceJUnitGetDataSetFile(it)»
 
-		«it.operations.filter(op | op.isPublicVisibility()).map(op| op.name).toSet().map[serviceTestTmpl.testMethod(it)].join()»
+		«it.operations.filter(op | op.isPublicVisibility()).map(op| op.name).toSet().map[serviceTestTmpl.testMethod(it)].join()»
 	}
 	'''
 	)
@@ -68,10 +68,8 @@ def String ejbJarXml(Application it) {
 	<?xml version="1.0" encoding="UTF-8"?>  
 	<!-- need this for OpenEJB testing -->
 
-	<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">
+	<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">
 
 	</ejb-jar>
 	'''