Merge pull request #189 from sguilhen/master

arun-gupta · arun-gupta · commit dba0a2ec195d · 2014-01-08T13:22:15.000-08:00
Add jboss-web.xml to web deployments
diff --git a/jaspic/basic-authentication/src/main/webapp/WEB-INF/jboss-web.xml b/jaspic/basic-authentication/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<jboss-web>
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java
@@ -16,7 +16,8 @@ public class ArquillianBase {
 
     public static WebArchive defaultArchive() {
         return ShrinkWrap.create(WebArchive.class).addPackages(true, "org.javaee7.jaspic")
-                .addAsWebInfResource(resource("web.xml")).addAsWebInfResource(resource("glassfish-web.xml"));
+                .addAsWebInfResource(resource("web.xml")).addAsWebInfResource(resource("glassfish-web.xml"))
+                .addAsWebInfResource(resource("jboss-web.xml"));
     }
 
     private static File resource(String name) {
diff --git a/jaspic/ejb-propagation/src/main/webapp/WEB-INF/jboss-web.xml b/jaspic/ejb-propagation/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<jboss-web>
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
diff --git a/jaspic/lifecycle/src/main/webapp/WEB-INF/jboss-web.xml b/jaspic/lifecycle/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<jboss-web>
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
diff --git a/jaspic/register-session/src/main/webapp/WEB-INF/jboss-web.xml b/jaspic/register-session/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<jboss-web>
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
diff --git a/jaspic/wrapping/src/main/webapp/WEB-INF/jboss-web.xml b/jaspic/wrapping/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<jboss-web>
+    <security-domain>jaspitest</security-domain>
+</jboss-web>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ public class ArquillianBase {`
`16`	`16`
`17`	`17`	`public static WebArchive defaultArchive() {`
`18`	`18`	`return ShrinkWrap.create(WebArchive.class).addPackages(true, "org.javaee7.jaspic")`
`19`		`- .addAsWebInfResource(resource("web.xml")).addAsWebInfResource(resource("glassfish-web.xml"));`
	`19`	`+ .addAsWebInfResource(resource("web.xml")).addAsWebInfResource(resource("glassfish-web.xml"))`
	`20`	`+ .addAsWebInfResource(resource("jboss-web.xml"));`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`private static File resource(String name) {`