[portal-commits] JBoss Portal SVN: r8137 - in branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms: impl/interceptors and 1 other directories.
Author: thomas.heute(a)jboss.com
Date: 2007-09-04 03:42:10 -0400 (Tue, 04 Sep 2007)
New Revision: 8137
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
Log:
- JBPORTAL-1598: Properly support JBoss Cache 1.3.x when running on JBAS 4.2
- Better logging when access is denied on a resource
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java 2007-09-03
11:14:41 UTC (rev 8136)
+++
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java 2007-09-04
07:42:10 UTC (rev 8137)
@@ -233,7 +233,7 @@
*/
public Map get(Fqn fqn) throws Exception
{
- Map map = null;
+ Map map = new HashMap();
//node calculation
String node = fqn.toString();
@@ -278,12 +278,10 @@
Object nodeValue = this.loadNode(query, id);
if (nodeValue != null)
{
- map = new HashMap();
map.put(id, nodeValue);
}
}
}
-
return map;
}
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java 2007-09-03
11:14:41 UTC (rev 8136)
+++
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java 2007-09-04
07:42:10 UTC (rev 8137)
@@ -79,35 +79,22 @@
*/
private String defaultPolicy = null;
- /**
- *
- */
+ /** . */
private RoleModule roleModule = null;
- /**
- *
- */
+ /** . */
private String jndiName = null;
- /**
- *
- */
+ /** . */
private JNDI.Binding jndiBinding = null;
- /**
- *
- */
+ /** . */
private AuthorizationManager authorizationManager = null;
- /**
- *
- */
+ /** . */
private String cmsSessionFactory = null;
-
- /**
- *
- */
+ /** . */
private String identitySessionFactory = null;
@@ -254,7 +241,18 @@
}
else
{
- throw new CMSException("Access to this resource is denied");
+ String username = null;
+ if (user == null)
+ {
+ username = "Anonymous";
+ }
+ else
+ {
+ username = user.getUserName();
+ }
+ log.debug("Unauthorized command (" + invocation + ") for user:
" + username);
+// throw new CMSException("Access to this resource is denied");
+ return null;
}
}
else
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 2007-09-03
11:14:41 UTC (rev 8136)
+++
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 2007-09-04
07:42:10 UTC (rev 8137)
@@ -126,4 +126,9 @@
}
return null;
}
+
+ public String toString()
+ {
+ return "FileGetCommand[path=" + path + ", versionNumber=" +
versionNumber + ", locale=" + locale + "]";
+ }
}