Merge branch 'master' of git@github.com:javaee-samples/javaee7-samples.git

Author: arjantijms

jaspic/common/pom.xml

@@ -10,7 +10,6 @@
         <groupId>org.javaee7</groupId>
         <artifactId>jaspic</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jaspic-common</artifactId>
@@ -33,7 +32,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.13</version>
+            <version>2.31</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java

@@ -119,7 +119,7 @@ public void setUp() {
     @After
     public void tearDown() {
         webClient.getCookieManager().clearCookies();
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
 

jaxrs/jaxrs-security-declarative/src/test/java/org/javaee7/jaxrs/security/declarative/MyResourceTest.java

@@ -53,7 +53,7 @@ public void setup() {
 
     @After
     public void tearDown() {
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
     @Deployment(testable = false)

pom.xml

@@ -238,7 +238,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.13</version>
+            <version>2.31</version>
             <scope>test</scope>
         </dependency>
         <dependency>

servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java

@@ -56,7 +56,7 @@ public void setup() {
     @After
     public void tearDown() {
         webClient.getCookieManager().clearCookies();
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
     @Test

servlet/security-basicauth-omission/src/test/java/org/javaee7/servlet/security/basicauth/omission/SecureServletTest.java

@@ -60,7 +60,7 @@ public void setup() {
     @After
     public void tearDown() {
         webClient.getCookieManager().clearCookies();
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
     @Test

servlet/security-basicauth/src/test/java/org/javaee7/servlet/security/basicauth/SecureServletTest.java

@@ -62,7 +62,7 @@ public void setup() {
     @After
     public void tearDown() {
         webClient.getCookieManager().clearCookies();
-        webClient.closeAllWindows();
+        webClient.close();
     }
 
     @Test

servlet/security-clientcert/.gitignore

@@ -0,0 +1,2 @@
+/clientKeyStore.jks
+/clientTrustStore.jks

servlet/security-clientcert/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee7</groupId>
+        <artifactId>servlet</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>servlet-security-clientcert</artifactId>
+    <packaging>war</packaging>
+
+    <name>Java EE 7 Sample: servlet - security-clientcert</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.59</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.59</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>payara-micro-managed</id>
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                        <filtering>true</filtering>
+                    </testResource>
+                </testResources>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <payara.extraMicroOptions>--postdeploycommandfile ${project.build.directory}/test-classes/addUsersPayara.txt</payara.extraMicroOptions>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

servlet/security-clientcert/src/main/java/org/javaee7/servlet/security/clientcert/SecureServlet.java

@@ -0,0 +1,25 @@
+/** Copyright Payara Services Limited **/
+package org.javaee7.servlet.security.clientcert;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author Arjan Tijms
+ */
+@WebServlet(urlPatterns = { "/SecureServlet" })
+public class SecureServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        response.getWriter().print("principal " + request.getUserPrincipal() + " in role g1:" + request.isUserInRole("g1"));
+    }
+
+}