X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fusermgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FUrlAuthorizationRule.java;h=a9a941a398017457b551c7df1b57b719193d6769;hb=3e8de23e00da80d5506c750a28e7d25f261eda92;hp=c68457559a42892ca2e3aa8739ee34ea88e41b73;hpb=9449ea0f360f6e9c14057db57f3ee0bfba947ab4;p=utils diff --git a/security/usermgt/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java b/security/usermgt/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java index c6845755..a9a941a3 100644 --- a/security/usermgt/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java +++ b/security/usermgt/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java @@ -12,11 +12,14 @@ * 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.wamblee.security.authorization; import static org.wamblee.security.authorization.AuthorizationResult.*; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.persistence.Access; import javax.persistence.AccessType; import javax.persistence.CascadeType; @@ -26,7 +29,6 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Transient; -import org.apache.log4j.Logger; import org.wamblee.security.authentication.UserAdministration; /** @@ -40,8 +42,8 @@ import org.wamblee.security.authentication.UserAdministration; * appropriate is determined by a * {@link org.wamblee.security.authorization.AbstractUserCondition}. *
  • The operation that is requested. Whether the operation is appropriate is - * determined by a {@link org.wamblee.security.authorization.AbstractOperationCondition} - * .
  • + * determined by a + * {@link org.wamblee.security.authorization.AbstractOperationCondition} . * * In case all three conditions match, the condition returns the configured * result passed at construction (GRANTED or DENIED). If the resource is not of @@ -52,7 +54,7 @@ import org.wamblee.security.authentication.UserAdministration; @Access(AccessType.PROPERTY) public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule { private static final Logger LOGGER = Logger - .getLogger(UrlAuthorizationRule.class); + .getLogger(UrlAuthorizationRule.class.getName()); /** * Result that the rule will return in case there is a match. @@ -77,7 +79,7 @@ public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule { /** * Operation that this rule is for. */ - + private OperationCondition operationCondition; /** @@ -175,8 +177,8 @@ public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule { * * @return Authorization result, */ - protected AuthorizationResult isAllowedWithPath(String aPath, Operation aOperation, - String aUser) { + protected AuthorizationResult isAllowedWithPath(String aPath, + Operation aOperation, String aUser) { if (!pathCondition.matches(aPath)) { return UNDECIDED; } @@ -252,8 +254,8 @@ public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule { try { resourceClass = Class.forName(aResourceClass); } catch (ClassNotFoundException e) { - LOGGER.error("Cannot find resource class '" + aResourceClass + "'", - e); + LOGGER.log(Level.SEVERE, "Cannot find resource class '" + + aResourceClass + "'", e); throw new IllegalArgumentException(e.getMessage(), e); } } @@ -314,10 +316,10 @@ public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule { protected void setUserCondition(UserCondition aUserCondition) { userCondition = aUserCondition; } - + @Override public void setUserAdministration(UserAdministration aAdmin) { - userCondition.setUserAdmin(aAdmin); + userCondition.setUserAdmin(aAdmin); } }