svn commit: r790551 - /lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java

Author: andreas
Date: Thu Jul  2 11:20:53 2009
New Revision: 790551

URL: http://svn.apache.org/viewvc?rev=790551&view=rev
Log:
Minor change: make log message more verbose.

Modified:
    lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java

Modified: lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java?rev=790551&r1=790550&r2=790551&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java Thu Jul  2 11:20:53 2009
@@ -40,13 +40,14 @@
 import org.apache.lenya.cms.publication.URLInformation;
 
 /**
- * Resolves the access controller according to the <code>access-control.xml</code> file of a publication.
+ * Resolves the access controller according to the <code>access-control.xml</code> file of a
+ * publication.
  */
 public class PublicationAccessControllerResolver extends AbstractAccessControllerResolver implements
         Initializable {
 
-    protected static final String AC_CONFIGURATION_FILE
-        = "config/access-control/access-control.xml".replace('/', File.separatorChar);
+    protected static final String AC_CONFIGURATION_FILE = "config/access-control/access-control.xml"
+            .replace('/', File.separatorChar);
     protected static final String TYPE_ATTRIBUTE = "type";
 
     /**
@@ -62,8 +63,9 @@
 
         String publicationId = info.getPublicationId();
         if (getLogger().isDebugEnabled()) {
-            getLogger().debug("Using first URL step (might be publication ID) as cache key: ["
-                    + publicationId + "]");
+            getLogger().debug(
+                    "Using first URL step (might be publication ID) as cache key: ["
+                            + publicationId + "]");
         }
 
         return super.generateCacheKey(publicationId, resolver);
@@ -146,7 +148,8 @@
 
         if (configurationFile.isFile()) {
             try {
-                Configuration configuration = new DefaultConfigurationBuilder().buildFromFile(configurationFile);
+                Configuration configuration = new DefaultConfigurationBuilder()
+                        .buildFromFile(configurationFile);
                 return configuration;
             } catch (Exception e) {
                 throw new AccessControlException(e);
@@ -176,8 +179,8 @@
             Configuration configuration = getConfiguration(publication);
             String type = configuration.getAttribute(TYPE_ATTRIBUTE);
 
-            accessController = (AccessController) getManager().lookup(AccessController.ROLE + "/"
-                    + type);
+            accessController = (AccessController) getManager().lookup(
+                    AccessController.ROLE + "/" + type);
 
             if (accessController instanceof Configurable) {
                 ((Configurable) accessController).configure(configuration);
@@ -203,7 +206,8 @@
             contextDir = SourceUtil.getFile(contextSource);
 
             if (contextDir == null || !contextDir.isDirectory()) {
-                throw new AccessControlException("The servlet context is not a directory!");
+                throw new AccessControlException("The servlet context ["
+                        + contextDir.getAbsolutePath() + "] is not a directory!");
             }
 
         } finally {