[jboss-svn-commits] JBL Code SVN: r28236 - 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-07-20 04:45:29 -0400 (Mon, 20 Jul 2009)
New Revision: 28236

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:
roll back jackrabbit version to 1.4.5 due to https://issues.apache.org/jira/browse/JCR-1977. We will come back to the latest jackrabbit 1.x version again when the fix for JCR-1977 is available

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-07-20 08:12:11 UTC (rev 28235)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java	2009-07-20 08:45:29 UTC (rev 28236)
@@ -74,11 +74,7 @@
         }
         else {
             Item rhs = (Item)obj;
-            try {
-				return this.node.isSame(rhs.getNode());
-			} catch (RepositoryException e) {
-			}
-			return false;
+            return this.node.equals(rhs.getNode());
         }
     }
 

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-07-20 08:12:11 UTC (rev 28235)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/MyAccessManager.java	2009-07-20 08:45:29 UTC (rev 28236)
@@ -10,10 +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;
+//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
@@ -68,7 +68,7 @@
         //System.out.println("is granted: " + arg0);
         return true;
     }
-
+/*
 	public boolean canRead(Path arg0) throws RepositoryException {
 		// TODO Auto-generated method stub
 		return false;
@@ -91,5 +91,6 @@
 		// 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-07-20 08:12:11 UTC (rev 28235)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/security/DroolsRepositoryAccessManager.java	2009-07-20 08:45:29 UTC (rev 28236)
@@ -11,10 +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.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;
@@ -142,7 +142,7 @@
     public void setDefaultpermission(final String defaultpermission) {
         this.defaultpermission = defaultpermission;
     }
-
+/*
 	public boolean canRead(Path arg0) throws RepositoryException {
 		// TODO Auto-generated method stub
 		return true;
@@ -165,4 +165,5 @@
 		// TODO Auto-generated method stub
 		return true;
 	}
+*/
 }