You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/04/13 01:21:04 UTC
git commit: DELTASPIKE-127 unified package name
Updated Branches:
refs/heads/master d89f26a7b -> e2b7a35db
DELTASPIKE-127 unified package name
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/e2b7a35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/e2b7a35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/e2b7a35d
Branch: refs/heads/master
Commit: e2b7a35db930d5f791bf9ccd62a0c2e68e41d3ef
Parents: d89f26a
Author: gpetracek <gp...@apache.org>
Authored: Fri Apr 13 01:16:59 2012 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Fri Apr 13 01:16:59 2012 +0200
----------------------------------------------------------------------
.../apache/deltaspike/security/api/Identity.java | 9 ++-
.../authentication/event/AlreadyLoggedInEvent.java | 28 ++++++++++
.../api/authentication/event/LoggedInEvent.java | 27 ++++++++++
.../api/authentication/event/LoginFailedEvent.java | 38 ++++++++++++++
.../event/PostAuthenticateEvent.java | 28 ++++++++++
.../authentication/event/PostLoggedOutEvent.java | 39 +++++++++++++++
.../authentication/event/PreAuthenticateEvent.java | 27 ++++++++++
.../authentication/event/PreLoggedOutEvent.java | 39 +++++++++++++++
.../events/AlreadyLoggedInEvent.java | 28 ----------
.../api/authentication/events/LoggedInEvent.java | 27 ----------
.../authentication/events/LoginFailedEvent.java | 38 --------------
.../events/PostAuthenticateEvent.java | 28 ----------
.../authentication/events/PostLoggedOutEvent.java | 39 ---------------
.../events/PreAuthenticateEvent.java | 27 ----------
.../authentication/events/PreLoggedOutEvent.java | 39 ---------------
.../impl/authentication/DefaultIdentity.java | 14 +++---
.../impl/credential/DefaultLoginCredential.java | 4 +-
.../authentication/FailedLoginFailedObserver.java | 2 +-
18 files changed, 242 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
index 3003c63..093e9d7 100644
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
@@ -45,9 +45,12 @@ public interface Identity extends Serializable
* to whether authentication is successful or not. The following events may be raised
* during the call to login():
* <p/>
- * org.jboss.seam.security.events.LoggedInEvent - raised when authentication is successful
- * org.jboss.seam.security.events.LoginFailedEvent - raised when authentication fails
- * org.jboss.seam.security.events.AlreadyLoggedInEvent - raised if the user is already authenticated
+ * {@link org.apache.deltaspike.security.api.authentication.event.LoggedInEvent}
+ * - raised when authentication is successful
+ * {@link org.apache.deltaspike.security.api.authentication.event.LoginFailedEvent}
+ * - raised when authentication fails
+ * {@link org.apache.deltaspike.security.api.authentication.event.AlreadyLoggedInEvent}
+ * - raised if the user is already authenticated
*
* @return AuthenticationResult returns SUCCESS if user is authenticated,
* FAILED if authentication FAILED, or
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
new file mode 100644
index 0000000..ef0ea45
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package org.apache.deltaspike.security.api.authentication.event;
+
+/**
+ * This event is fired when an already authenticated user attempts to authenticate again
+ */
+public class AlreadyLoggedInEvent
+{
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
new file mode 100644
index 0000000..a80b7ba
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package org.apache.deltaspike.security.api.authentication.event;
+
+/**
+ * This event is raised when user successfully logs in.
+ */
+public class LoggedInEvent
+{
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
new file mode 100644
index 0000000..9bb1e23
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.deltaspike.security.api.authentication.event;
+
+/**
+ * This event is fired when an authentication attempt fails
+ */
+public class LoginFailedEvent
+{
+ private Exception loginException;
+
+ public LoginFailedEvent(Exception loginException)
+ {
+ this.loginException = loginException;
+ }
+
+ public Exception getLoginException()
+ {
+ return loginException;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
new file mode 100644
index 0000000..3a5b745
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package org.apache.deltaspike.security.api.authentication.event;
+
+/**
+ * This event is raised just after authentication
+ */
+public class PostAuthenticateEvent
+{
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
new file mode 100644
index 0000000..2e9e892
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package org.apache.deltaspike.security.api.authentication.event;
+
+import org.apache.deltaspike.security.api.User;
+
+/**
+ * This event is raised just after the user un-authenticates
+ */
+public class PostLoggedOutEvent
+{
+ private User user;
+
+ public PostLoggedOutEvent(User user)
+ {
+ this.user = user;
+ }
+
+ public User getUser()
+ {
+ return user;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
new file mode 100644
index 0000000..441ea34
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+package org.apache.deltaspike.security.api.authentication.event;
+
+/**
+ * This event is raised just before authentication.
+ */
+public class PreAuthenticateEvent
+{
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
new file mode 100644
index 0000000..fa897a3
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package org.apache.deltaspike.security.api.authentication.event;
+
+import org.apache.deltaspike.security.api.User;
+
+/**
+ * This event is raised just before the user un-authenticates
+ */
+public class PreLoggedOutEvent
+{
+ private User user;
+
+ public PreLoggedOutEvent(User user)
+ {
+ this.user = user;
+ }
+
+ public User getUser()
+ {
+ return user;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/AlreadyLoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/AlreadyLoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/AlreadyLoggedInEvent.java
deleted file mode 100644
index 1bebded..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/AlreadyLoggedInEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.deltaspike.security.api.authentication.events;
-
-/**
- * This event is fired when an already authenticated user attempts to authenticate again
- */
-public class AlreadyLoggedInEvent
-{
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoggedInEvent.java
deleted file mode 100644
index 4b6faa2..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoggedInEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.deltaspike.security.api.authentication.events;
-
-/**
- * This event is raised when user successfully logs in.
- */
-public class LoggedInEvent
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoginFailedEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoginFailedEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoginFailedEvent.java
deleted file mode 100644
index 3638ee1..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/LoginFailedEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.deltaspike.security.api.authentication.events;
-
-/**
- * This event is fired when an authentication attempt fails
- */
-public class LoginFailedEvent
-{
- private Exception loginException;
-
- public LoginFailedEvent(Exception loginException)
- {
- this.loginException = loginException;
- }
-
- public Exception getLoginException()
- {
- return loginException;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostAuthenticateEvent.java
deleted file mode 100644
index 7c6f89c..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostAuthenticateEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.deltaspike.security.api.authentication.events;
-
-/**
- * This event is raised just after authentication
- */
-public class PostAuthenticateEvent
-{
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostLoggedOutEvent.java
deleted file mode 100644
index f0db433..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PostLoggedOutEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.security.api.authentication.events;
-
-import org.apache.deltaspike.security.api.User;
-
-/**
- * This event is raised just after the user un-authenticates
- */
-public class PostLoggedOutEvent
-{
- private User user;
-
- public PostLoggedOutEvent(User user)
- {
- this.user = user;
- }
-
- public User getUser()
- {
- return user;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreAuthenticateEvent.java
deleted file mode 100644
index bbb9e18..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreAuthenticateEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.security.api.authentication.events;
-
-/**
- * This event is raised just before authentication.
- */
-public class PreAuthenticateEvent
-{
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreLoggedOutEvent.java
deleted file mode 100644
index 4eaf014..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/events/PreLoggedOutEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.deltaspike.security.api.authentication.events;
-
-import org.apache.deltaspike.security.api.User;
-
-/**
- * This event is raised just before the user un-authenticates
- */
-public class PreLoggedOutEvent
-{
- private User user;
-
- public PreLoggedOutEvent(User user)
- {
- this.user = user;
- }
-
- public User getUser()
- {
- return user;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authentication/DefaultIdentity.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authentication/DefaultIdentity.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authentication/DefaultIdentity.java
index fe364c5..017a9dd 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authentication/DefaultIdentity.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/authentication/DefaultIdentity.java
@@ -23,13 +23,13 @@ import org.apache.deltaspike.security.api.Identity;
import org.apache.deltaspike.security.api.User;
import org.apache.deltaspike.security.api.authentication.AuthenticationException;
import org.apache.deltaspike.security.api.authentication.UnexpectedCredentialException;
-import org.apache.deltaspike.security.api.authentication.events.AlreadyLoggedInEvent;
-import org.apache.deltaspike.security.api.authentication.events.LoggedInEvent;
-import org.apache.deltaspike.security.api.authentication.events.LoginFailedEvent;
-import org.apache.deltaspike.security.api.authentication.events.PostAuthenticateEvent;
-import org.apache.deltaspike.security.api.authentication.events.PostLoggedOutEvent;
-import org.apache.deltaspike.security.api.authentication.events.PreAuthenticateEvent;
-import org.apache.deltaspike.security.api.authentication.events.PreLoggedOutEvent;
+import org.apache.deltaspike.security.api.authentication.event.AlreadyLoggedInEvent;
+import org.apache.deltaspike.security.api.authentication.event.LoggedInEvent;
+import org.apache.deltaspike.security.api.authentication.event.LoginFailedEvent;
+import org.apache.deltaspike.security.api.authentication.event.PostAuthenticateEvent;
+import org.apache.deltaspike.security.api.authentication.event.PostLoggedOutEvent;
+import org.apache.deltaspike.security.api.authentication.event.PreAuthenticateEvent;
+import org.apache.deltaspike.security.api.authentication.event.PreLoggedOutEvent;
import org.apache.deltaspike.security.api.credential.LoginCredential;
import org.apache.deltaspike.security.spi.authentication.Authenticator;
import org.apache.deltaspike.security.spi.authentication.Authenticator.AuthenticationStatus;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/credential/DefaultLoginCredential.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/credential/DefaultLoginCredential.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/credential/DefaultLoginCredential.java
index 78aaedc..5a5e058 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/credential/DefaultLoginCredential.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/credential/DefaultLoginCredential.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.security.impl.credential;
-import org.apache.deltaspike.security.api.authentication.events.LoginFailedEvent;
-import org.apache.deltaspike.security.api.authentication.events.PostAuthenticateEvent;
+import org.apache.deltaspike.security.api.authentication.event.LoginFailedEvent;
+import org.apache.deltaspike.security.api.authentication.event.PostAuthenticateEvent;
import org.apache.deltaspike.security.api.credential.Credential;
import org.apache.deltaspike.security.api.credential.LoginCredential;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e2b7a35d/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/FailedLoginFailedObserver.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/FailedLoginFailedObserver.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/FailedLoginFailedObserver.java
index 8ed2da3..c32f1d6 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/FailedLoginFailedObserver.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/FailedLoginFailedObserver.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.security.impl.authentication;
-import org.apache.deltaspike.security.api.authentication.events.LoginFailedEvent;
+import org.apache.deltaspike.security.api.authentication.event.LoginFailedEvent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.event.Observes;