You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2015/05/13 23:57:37 UTC
deltaspike git commit: DELTASPIKE-898 - Fix for License headers and
checkstyle issues
Repository: deltaspike
Updated Branches:
refs/heads/master ed0c2ef2e -> 5f5c82271
DELTASPIKE-898 - Fix for License headers and checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5f5c8227
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5f5c8227
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5f5c8227
Branch: refs/heads/master
Commit: 5f5c82271c0e647185e33a08e8d10b9a04cda075
Parents: ed0c2ef
Author: Rafael Benevides <ra...@gmail.com>
Authored: Wed May 13 17:54:09 2015 -0400
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Wed May 13 17:57:03 2015 -0400
----------------------------------------------------------------------
.../pom.xml | 4 +-
.../cdi/AuthenticationListener.java | 2 +-
.../src/main/webapp/index.html | 27 ++++++-----
.../src/main/webapp/login.xhtml | 27 ++++++-----
.../src/main/webapp/secured/home.xhtml | 47 +++++++++++++-------
.../README.md | 2 +-
.../pom.xml | 4 +-
.../requestedpage/picketlink/Initializer.java | 2 +-
8 files changed, 68 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml b/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
index fb1d4a3..bcee388 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
@@ -20,7 +20,6 @@
under the License.
-->
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
@@ -29,7 +28,8 @@
<artifactId>deltaspike-security-requested-page-after-login-cdi</artifactId>
<packaging>war</packaging>
- <name>DeltaSpike Example: Show requested page after login with CDI</name>
+ <name>Apache DeltaSpike Security Example CDI</name>
+ <description>DeltaSpike Example: Show requested page after login with CDI</description>
<properties>
<deploy.skip>true</deploy.skip>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
index ced26e7..cc7c372 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
@@ -24,7 +24,7 @@ import javax.enterprise.event.Observes;
import javax.inject.Inject;
public class AuthenticationListener
-{
+{
@Inject
private ViewNavigationHandler viewNavigationHandler;
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/index.html b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/index.html
index 12098c8..4e34817 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/index.html
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/index.html
@@ -1,18 +1,21 @@
<!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
+ 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.
+ 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>
<head>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/login.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/login.xhtml b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/login.xhtml
index 5256ada..254595c 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/login.xhtml
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/login.xhtml
@@ -1,18 +1,21 @@
<!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
+ 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.
+ 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">
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/secured/home.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/secured/home.xhtml b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/secured/home.xhtml
index 713d585..254595c 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/secured/home.xhtml
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/secured/home.xhtml
@@ -1,28 +1,43 @@
<!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
+ 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.
+ 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">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html">
<head>
- <title>Home Page</title>
+ <title>Login</title>
</head>
<body>
-<h1>Hello, #{loginController.name}!</h1>
+<h1>Log in</h1>
+<h:messages globalOnly="true"></h:messages>
+<h:form id="loginForm">
+ <h:outputLabel value="Username:" for="username"/><br/>
+ <h:inputText value="#{loginController.username}" id="username"/><br/><br/>
+ <h:outputLabel value="Password:" for="password"/><br/>
+ <h:inputSecret value="#{loginController.password}" id="password"/><br/>
+ <h:commandButton value="Log in" action="#{loginController.login()}" id="loginBtn"/>
+</h:form>
-<p>Welcome Home</p>
+<p>
+ <b>Hint:</b> log in as john / 123456
+</p>
+<br/>
</body>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-picketlink/README.md
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/README.md b/deltaspike/examples/security-requested-page-after-login-picketlink/README.md
index 1c6b9cf..c7592f1 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/README.md
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/README.md
@@ -14,7 +14,7 @@ Notice: Licensed to the Apache Software Foundation (ASF) under one
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
Making initially requested secured page available for redirect after login with PicketLink
==========================================================================================
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
index 2027234..a5d957e 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
@@ -20,7 +20,6 @@
under the License.
-->
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
@@ -29,7 +28,8 @@
<artifactId>deltaspike-security-requested-page-after-login-picketlink</artifactId>
<packaging>war</packaging>
- <name>DeltaSpike Example: Show requested page after login with PicketLink</name>
+ <name>Apache DeltaSpike Security Example PicketLink</name>
+ <description>DeltaSpike Example: Show requested page after login with PicketLink</description>
<properties>
<deploy.skip>true</deploy.skip>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5f5c8227/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
index 47323b8..35a287e 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
@@ -40,7 +40,7 @@ public class Initializer
private PartitionManager partitionManager;
@PostConstruct
- public void create()
+ public void create()
{
// Create user john