[jboss-svn-commits] JBL Code SVN: r26961 - in labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository: security and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2009-06-14 22:39:38 -0400 (Sun, 14 Jun 2009)
New Revision: 26961

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/MyAccessManager.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/DroolsRepositoryAccessManager.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-366: Upgrade JackRabbit version from 1.4.5 to 1.5.6

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java	2009-06-12 17:21:09 UTC (rev 26960)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java	2009-06-15 02:39:38 UTC (rev 26961)
@@ -1,6 +1,7 @@
 package org.drools.repository;
 
 import javax.jcr.Node;
+import javax.jcr.RepositoryException;
 
 import org.apache.log4j.Logger;
 
@@ -73,7 +74,11 @@
         }
         else {
             Item rhs = (Item)obj;
-            return this.node.equals(rhs.getNode());
+            try {
+				return this.node.isSame(rhs.getNode());
+			} catch (RepositoryException e) {
+			}
+			return false;
         }
     }
 

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/MyAccessManager.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/MyAccessManager.java	2009-06-12 17:21:09 UTC (rev 26960)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/MyAccessManager.java	2009-06-15 02:39:38 UTC (rev 26961)
@@ -10,6 +10,10 @@
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.security.AMContext;
 import org.apache.jackrabbit.core.security.AccessManager;
+import org.apache.jackrabbit.core.security.authorization.AccessControlProvider;
+import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
 
 /**
  * This is just an experimental access manager for proof of concept. Don't
@@ -65,4 +69,27 @@
         return true;
     }
 
+	public boolean canRead(Path arg0) throws RepositoryException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void init(AMContext arg0, AccessControlProvider arg1,
+			WorkspaceAccessManager arg2) throws AccessDeniedException,
+			Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public boolean isGranted(Path arg0, int arg1) throws RepositoryException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isGranted(Path arg0, Name arg1, int arg2)
+			throws RepositoryException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/DroolsRepositoryAccessManager.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/DroolsRepositoryAccessManager.java	2009-06-12 17:21:09 UTC (rev 26960)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/DroolsRepositoryAccessManager.java	2009-06-15 02:39:38 UTC (rev 26961)
@@ -11,6 +11,10 @@
 import org.apache.jackrabbit.core.ItemId;
 import org.apache.jackrabbit.core.security.AMContext;
 import org.apache.jackrabbit.core.security.AccessManager;
+import org.apache.jackrabbit.core.security.authorization.AccessControlProvider;
+import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
 import org.apache.log4j.Logger;
 import org.jboss.security.authorization.AuthorizationException;
 import org.jboss.security.identity.Identity;
@@ -138,4 +142,27 @@
     public void setDefaultpermission(final String defaultpermission) {
         this.defaultpermission = defaultpermission;
     }
+
+	public boolean canRead(Path arg0) throws RepositoryException {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	public void init(AMContext arg0, AccessControlProvider arg1,
+			WorkspaceAccessManager arg2) throws AccessDeniedException,
+			Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public boolean isGranted(Path arg0, int arg1) throws RepositoryException {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	public boolean isGranted(Path arg0, Name arg1, int arg2)
+			throws RepositoryException {
+		// TODO Auto-generated method stub
+		return true;
+	}
 }