From 91ada486796b6c315239fc43ec01719d2c1ca264 Mon Sep 17 00:00:00 2001
From: subaochen <subaochen@126.com>
Date: Sun, 4 Sep 2016 14:13:34 +0800
Subject: [PATCH 1/2] add wildfly deploy support add logout button in
 secured/home.xhtml page and logout action in AuthenticationListener.java move
 @Secured annotation of Pages.java to folder,in order to protected the whole
 folder

---
 deltaspike/examples/pom.xml                   |  7 +++-
 .../picketlink/AuthenticationListener.java    |  6 +++-
 .../requestedpage/picketlink/Pages.java       | 10 +++---
 .../src/main/webapp/index.html                |  5 +--
 .../src/main/webapp/secured/home.xhtml        |  6 +++-
 .../src/main/webapp/secured/test.xhtml        | 33 +++++++++++++++++++
 6 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/test.xhtml

diff --git a/deltaspike/examples/pom.xml b/deltaspike/examples/pom.xml
index cfbe3d171..2bc058acf 100644
--- a/deltaspike/examples/pom.xml
+++ b/deltaspike/examples/pom.xml
@@ -94,6 +94,11 @@
                     <skip>${deploy.skip}</skip> <!-- we don't deploy our samples upstream -->
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.wildfly.plugins</groupId>
+                <artifactId>wildfly-maven-plugin</artifactId>
+                <version>1.1.0.Alpha8</version>
+            </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
index 5a048df9b..90122177f 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
@@ -21,6 +21,7 @@
 import org.apache.deltaspike.core.api.config.view.navigation.ViewNavigationHandler;
 import org.picketlink.authentication.event.LoggedInEvent;
 import org.picketlink.authentication.event.LoginFailedEvent;
+import org.picketlink.authentication.event.PostLoggedOutEvent;
 
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
@@ -43,5 +44,8 @@ public void handleFailed(@Observes LoginFailedEvent event)
     {
         this.viewNavigationHandler.navigateTo(Pages.Login.class);
     }
-
+    
+    public void handleLogout(@Observes PostLoggedOutEvent event) {
+        this.viewNavigationHandler.navigateTo(Pages.Login.class);
+    }
 }
\ No newline at end of file
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Pages.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Pages.java
index 973968f05..53db50d90 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Pages.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Pages.java
@@ -31,14 +31,16 @@ class Login extends DefaultErrorView
     }
 
     @Folder(name = "/secured")
+    @Secured(LoggedInAccessDecisionVoter.class)
     interface Secure
-    {
-
-        @Secured(LoggedInAccessDecisionVoter.class)
+    {   
         class Home implements ViewConfig
         {
         }
-
+        
+        class Test implements ViewConfig
+        {
+        }
     }
 
 }
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/index.html b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/index.html
index d6ecf0bd1..99c5c01b0 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/index.html
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/index.html
@@ -25,9 +25,10 @@
 <h1>Index</h1>
 
 <p>
-    This link points to a secured page and should redirect to login page:
+    These link points to secured pages and should redirect to login page:
     <br>
-    <a href="secured/home.xhtml">Go Home</a>
+    <a href="secured/home.xhtml">Go Home</a></br>
+    <a href="secured/test.xhtml">Go Test Page</a>
 </p>
 </body>
 </html>
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/home.xhtml b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/home.xhtml
index 55a6120b8..38929da1b 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/home.xhtml
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/home.xhtml
@@ -17,7 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html">
 <head>
     <title>Home Page</title>
 </head>
@@ -26,6 +27,9 @@
 <h1>Hello!</h1>
 
 <p>Welcome Home</p>
+<h:form>
+    <h:commandButton value="logout" action="#{identity.logout}"/>
+</h:form>
 
 </body>
 
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/test.xhtml b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/test.xhtml
new file mode 100644
index 000000000..6ec9de9a9
--- /dev/null
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/secured/test.xhtml
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html">
+<head>
+    <title>Test Page</title>
+</head>
+
+<body>
+<h1>Hello!</h1>
+
+<p>Welcome to Secured Test Page</p>
+
+</body>
+
+</html>

From c85d24d2c3cfe61d42ad3d2175c1a7119fe32f09 Mon Sep 17 00:00:00 2001
From: subaochen <subaochen@126.com>
Date: Tue, 6 Sep 2016 09:07:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20checkstyle#=20=E6=82=A8=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E4=B8=8E=E4=B8=8A=E6=B8=B8=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=20'origin/master'=20=E4=B8=80=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../requestedpage/picketlink/AuthenticationListener.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
index 90122177f..2d2d53bdf 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
@@ -44,8 +44,9 @@ public void handleFailed(@Observes LoginFailedEvent event)
     {
         this.viewNavigationHandler.navigateTo(Pages.Login.class);
     }
-    
-    public void handleLogout(@Observes PostLoggedOutEvent event) {
+
+    public void handleLogout(@Observes PostLoggedOutEvent event)
+    {
         this.viewNavigationHandler.navigateTo(Pages.Login.class);
     }
-}
\ No newline at end of file
+}