You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by sb...@apache.org on 2012/03/07 00:17:10 UTC
git commit: DELTASPIKE-76 Slight refactor,
removed unnecessary methods from Authenticator
Updated Branches:
refs/heads/master 962383e24 -> 15917f717
DELTASPIKE-76 Slight refactor, removed unnecessary methods from Authenticator
Submitted on behalf of a third party: Red Hat, Inc. under the terms of the ALv2
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/15917f71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/15917f71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/15917f71
Branch: refs/heads/master
Commit: 15917f7177a57851ba82c4fab15993a20964c0a6
Parents: 962383e
Author: Shane Bryzak <sb...@gmail.com>
Authored: Wed Mar 7 09:16:06 2012 +1000
Committer: Shane Bryzak <sb...@gmail.com>
Committed: Wed Mar 7 09:16:06 2012 +1000
----------------------------------------------------------------------
.../java/org/apache/deltaspike/security/Group.java | 25 ---------------
.../org/apache/deltaspike/security/api/Group.java | 25 +++++++++++++++
.../apache/deltaspike/security/api/Identity.java | 1 -
.../deltaspike/security/spi/Authenticator.java | 11 ------
.../deltaspike/security/impl/IdentityImpl.java | 2 +-
.../security/impl/jaas/JaasAuthenticator.java | 2 +-
.../security/impl/management/IdmAuthenticator.java | 2 +-
7 files changed, 28 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/Group.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/Group.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/Group.java
deleted file mode 100644
index 5f4c3ee..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/Group.java
+++ /dev/null
@@ -1,25 +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;
-
-public interface Group
-{
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Group.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Group.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Group.java
new file mode 100644
index 0000000..baed430
--- /dev/null
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Group.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface Group
+{
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/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 95b22c2..71f1d6b 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
@@ -20,7 +20,6 @@ package org.apache.deltaspike.security.api;
import java.util.Set;
-import org.apache.deltaspike.security.Group;
import org.apache.deltaspike.security.api.annotation.LoggedIn;
import org.apache.deltaspike.security.api.annotation.Secures;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/Authenticator.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/Authenticator.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/Authenticator.java
index f682f6f..a7c5364 100644
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/Authenticator.java
+++ b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/spi/Authenticator.java
@@ -19,11 +19,6 @@
package org.apache.deltaspike.security.spi;
-import java.util.Set;
-
-import javax.management.relation.Role;
-
-import org.apache.deltaspike.security.Group;
import org.apache.deltaspike.security.api.User;
/**
@@ -45,10 +40,4 @@ public interface Authenticator
AuthenticationStatus getStatus();
User getUser();
-
- // TODO we'll likely remove the following two methods - still under discussion
-
- Set<Role> getRoleMemberships();
-
- Set<Group> getGroupMemberships();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/IdentityImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/IdentityImpl.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/IdentityImpl.java
index 7fcddbf..c55cb06 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/IdentityImpl.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/IdentityImpl.java
@@ -26,10 +26,10 @@ import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
-import org.apache.deltaspike.security.Group;
import org.apache.deltaspike.security.api.AuthenticationException;
import org.apache.deltaspike.security.api.AuthenticatorSelector;
import org.apache.deltaspike.security.api.Credentials;
+import org.apache.deltaspike.security.api.Group;
import org.apache.deltaspike.security.api.Identity;
import org.apache.deltaspike.security.api.Role;
import org.apache.deltaspike.security.api.User;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/jaas/JaasAuthenticator.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/jaas/JaasAuthenticator.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/jaas/JaasAuthenticator.java
index 98d9f4b..2cf42b3 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/jaas/JaasAuthenticator.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/jaas/JaasAuthenticator.java
@@ -35,9 +35,9 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import org.apache.deltaspike.security.Group;
import org.apache.deltaspike.security.api.BaseAuthenticator;
import org.apache.deltaspike.security.api.Credentials;
+import org.apache.deltaspike.security.api.Group;
import org.apache.deltaspike.security.api.Identity;
import org.apache.deltaspike.security.impl.PasswordCredential;
import org.apache.deltaspike.security.spi.Authenticator;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/15917f71/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/management/IdmAuthenticator.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/management/IdmAuthenticator.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/management/IdmAuthenticator.java
index 667c7dc..90ebf5b 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/management/IdmAuthenticator.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/management/IdmAuthenticator.java
@@ -22,7 +22,7 @@ import java.util.Set;
import javax.management.relation.Role;
-import org.apache.deltaspike.security.Group;
+import org.apache.deltaspike.security.api.Group;
import org.apache.deltaspike.security.api.User;
import org.apache.deltaspike.security.spi.Authenticator;