You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/05/28 19:11:04 UTC
svn commit: rev 20546 - in incubator/directory/rms/trunk/spi: . src/java/org/apache/rms/spi
Author: akarasulu
Date: Fri May 28 10:11:03 2004
New Revision: 20546
Modified:
incubator/directory/rms/trunk/spi/project.xml
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitor.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitorAdapter.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAO.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitor.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitorAdapter.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionDAOMonitor.java
incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionIndexDAOMonitor.java
Log:
had to fix a few problems with perm dao the move to spi
Modified: incubator/directory/rms/trunk/spi/project.xml
==============================================================================
--- incubator/directory/rms/trunk/spi/project.xml (original)
+++ incubator/directory/rms/trunk/spi/project.xml Fri May 28 10:11:03 2004
@@ -30,6 +30,13 @@
</dependency>
<dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/primitives</url>
+ </dependency>
+
+ <dependency>
<groupId>incubator-directory</groupId>
<artifactId>rms-api</artifactId>
<version>SNAPSHOT</version>
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitor.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitor.java Fri May 28 10:11:03 2004
@@ -20,8 +20,6 @@
import java.util.Iterator ;
import org.apache.rms.BitPermission ;
-import org.apache.rms.je.permission.JeBitPermissionDAO;
-import org.apache.rms.spi.BitPermissionDAO;
/**
@@ -109,7 +107,7 @@
* @param appName the name of the application
* @param index the bit index of the permission
*/
- void permissionDoesNotExist( JeBitPermissionDAO dao, String op,
+ void permissionDoesNotExist( BitPermissionDAO dao, String op,
String appName, int index ) ;
/**
@@ -121,7 +119,7 @@
* @param newName the new name for the permission
* @param fault the fault that caused the failure
*/
- void failedOnRename( JeBitPermissionDAO dao, String appName, String name,
+ void failedOnRename( BitPermissionDAO dao, String appName, String name,
String newName, Throwable fault ) ;
/**
@@ -132,7 +130,7 @@
* @param name the name of the permission
* @param newName the new name for the permission
*/
- void permissionRenamed( JeBitPermissionDAO dao, String appName,
+ void permissionRenamed( BitPermissionDAO dao, String appName,
String name, String newName ) ;
/**
@@ -143,7 +141,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- void indexLookedUp( JeBitPermissionDAO dao, String appName, String name,
+ void indexLookedUp( BitPermissionDAO dao, String appName, String name,
int index ) ;
/**
@@ -154,7 +152,7 @@
* @param name the name of the permission
* @param fault the fault that caused the failure
*/
- void failedPermissionLookup( JeBitPermissionDAO dao, String appName,
+ void failedPermissionLookup( BitPermissionDAO dao, String appName,
String name, Throwable fault ) ;
/**
@@ -163,7 +161,7 @@
* @param dao the data access object that failed
* @param perm the permission object looked up
*/
- void permissionLookedUp( JeBitPermissionDAO dao, BitPermission perm ) ;
+ void permissionLookedUp( BitPermissionDAO dao, BitPermission perm ) ;
/**
* Monitors events where the lookup of a permission name by index fails.
@@ -173,7 +171,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- void failedNameLookup( JeBitPermissionDAO dao, String appName,
+ void failedNameLookup( BitPermissionDAO dao, String appName,
int index, Throwable fault ) ;
/**
@@ -185,7 +183,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- void nameLookedUP( JeBitPermissionDAO dao, String appName,
+ void nameLookedUP( BitPermissionDAO dao, String appName,
String name, int index ) ;
/**
@@ -196,7 +194,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- void failedPermissionLookup( JeBitPermissionDAO dao, String appName,
+ void failedPermissionLookup( BitPermissionDAO dao, String appName,
int index, Throwable fault ) ;
/**
@@ -207,7 +205,7 @@
* @param resource the resource being cleanup
* @param fault the fault that caused the failure
*/
- void failedOnCleanupOperation( JeBitPermissionDAO dao, String op,
+ void failedOnCleanupOperation( BitPermissionDAO dao, String op,
Object resource, Throwable fault ) ;
/**
@@ -217,7 +215,7 @@
* @param op the cleanup operation that failed
* @param resource the resource being cleanup
*/
- void cleanedUp( JeBitPermissionDAO dao, String op, Object resource ) ;
+ void cleanedUp( BitPermissionDAO dao, String op, Object resource ) ;
/**
* Monitors events where an empty list is returned on a permission [name]
@@ -229,7 +227,7 @@
* @param onlyNames true if the Iterator was to return names false if
* the Iterator perms
*/
- void listingEmpty( JeBitPermissionDAO dao, Iterator listing,
+ void listingEmpty( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames ) ;
/**
@@ -240,7 +238,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- void listingNamesOnly( JeBitPermissionDAO dao, Iterator listing,
+ void listingNamesOnly( BitPermissionDAO dao, Iterator listing,
String appName ) ;
/**
@@ -251,7 +249,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- void listingPermissions( JeBitPermissionDAO dao, Iterator listing,
+ void listingPermissions( BitPermissionDAO dao, Iterator listing,
String appName ) ;
/**
@@ -263,7 +261,7 @@
* the Iterator perms
* @param fault the fault that caused the failure
*/
- void failedListing( JeBitPermissionDAO dao, Iterator listing,
+ void failedListing( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames, Throwable fault ) ;
/**
@@ -276,7 +274,7 @@
* @param prefetched the prefetched value if this Iterator prefetches the
* next value
*/
- void successOnNextName( JeBitPermissionDAO dao, Iterator listing,
+ void successOnNextName( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched ) ;
@@ -291,7 +289,7 @@
* @param prefetched the prefetched value if this Iterator prefetches the
* next value
*/
- void successOnNextPerm( JeBitPermissionDAO dao, Iterator listing,
+ void successOnNextPerm( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched ) ;
@@ -307,7 +305,7 @@
* @param retVal the next value to be returned
* @param fault the fault that caused the failure
*/
- void iteratorFailure( JeBitPermissionDAO dao, Iterator listing,
+ void iteratorFailure( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames, Object retVal,
Throwable fault ) ;
@@ -322,7 +320,7 @@
* @param lastVal the last value to be returned on the subsequent (final)
* next() call
*/
- void iteratorExhausted( JeBitPermissionDAO dao, Iterator listing,
+ void iteratorExhausted( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Object lastVal ) ;
}
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitorAdapter.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitorAdapter.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionDAOMonitorAdapter.java Fri May 28 10:11:03 2004
@@ -19,9 +19,6 @@
import java.util.Iterator ;
import org.apache.rms.BitPermission ;
-import org.apache.rms.je.permission.JeBitPermissionDAO;
-import org.apache.rms.spi.BitPermissionDAO;
-import org.apache.rms.spi.BitPermissionDAOMonitor;
/**
@@ -135,7 +132,7 @@
* @param appName the name of the application
* @param index the bit index of the permission
*/
- public void permissionDoesNotExist( JeBitPermissionDAO dao, String op,
+ public void permissionDoesNotExist( BitPermissionDAO dao, String op,
String appName, int index )
{
}
@@ -150,7 +147,7 @@
* @param newName the new name for the permission
* @param fault the fault that caused the failure
*/
- public void failedOnRename( JeBitPermissionDAO dao, String appName,
+ public void failedOnRename( BitPermissionDAO dao, String appName,
String name, String newName, Throwable fault )
{
if ( fault != null )
@@ -168,7 +165,7 @@
* @param name the name of the permission
* @param newName the new name for the permission
*/
- public void permissionRenamed( JeBitPermissionDAO dao, String appName,
+ public void permissionRenamed( BitPermissionDAO dao, String appName,
String name, String newName )
{
}
@@ -182,7 +179,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- public void indexLookedUp( JeBitPermissionDAO dao, String appName,
+ public void indexLookedUp( BitPermissionDAO dao, String appName,
String name, int index )
{
}
@@ -196,7 +193,7 @@
* @param name the name of the permission
* @param fault the fault that caused the failure
*/
- public void failedPermissionLookup( JeBitPermissionDAO dao, String appName,
+ public void failedPermissionLookup( BitPermissionDAO dao, String appName,
String name, Throwable fault )
{
if ( fault != null )
@@ -212,7 +209,7 @@
* @param dao the data access object that failed
* @param perm the permission object looked up
*/
- public void permissionLookedUp( JeBitPermissionDAO dao,
+ public void permissionLookedUp( BitPermissionDAO dao,
BitPermission perm )
{
}
@@ -226,7 +223,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- public void failedNameLookup( JeBitPermissionDAO dao, String appName,
+ public void failedNameLookup( BitPermissionDAO dao, String appName,
int index, Throwable fault )
{
if ( fault != null )
@@ -245,7 +242,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- public void nameLookedUP( JeBitPermissionDAO dao, String appName,
+ public void nameLookedUP( BitPermissionDAO dao, String appName,
String name, int index )
{
}
@@ -259,7 +256,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- public void failedPermissionLookup( JeBitPermissionDAO dao,
+ public void failedPermissionLookup( BitPermissionDAO dao,
String appName, int index,
Throwable fault )
{
@@ -278,7 +275,7 @@
* @param resource the resource being cleanup
* @param fault the fault that caused the failure
*/
- public void failedOnCleanupOperation( JeBitPermissionDAO dao, String op,
+ public void failedOnCleanupOperation( BitPermissionDAO dao, String op,
Object resource, Throwable fault )
{
if ( fault != null )
@@ -295,7 +292,7 @@
* @param op the cleanup operation that failed
* @param resource the resource being cleanup
*/
- public void cleanedUp( JeBitPermissionDAO dao, String op, Object resource )
+ public void cleanedUp( BitPermissionDAO dao, String op, Object resource )
{
}
@@ -310,7 +307,7 @@
* @param onlyNames true if the Iterator was to return names false if the
* Iterator perms
*/
- public void listingEmpty( JeBitPermissionDAO dao, Iterator listing,
+ public void listingEmpty( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames )
{
}
@@ -324,7 +321,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- public void listingNamesOnly( JeBitPermissionDAO dao, Iterator listing,
+ public void listingNamesOnly( BitPermissionDAO dao, Iterator listing,
String appName )
{
}
@@ -338,7 +335,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- public void listingPermissions( JeBitPermissionDAO dao, Iterator listing,
+ public void listingPermissions( BitPermissionDAO dao, Iterator listing,
String appName )
{
}
@@ -352,7 +349,7 @@
* the Iterator perms
* @param fault the fault that caused the failure
*/
- public void failedListing( JeBitPermissionDAO dao, Iterator listing,
+ public void failedListing( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Throwable fault )
{
@@ -373,7 +370,7 @@
* @param prefetched the prefetched value if this Iterator prefetches
* the next value
*/
- public void successOnNextName( JeBitPermissionDAO dao, Iterator listing,
+ public void successOnNextName( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched )
{
@@ -390,7 +387,7 @@
* @param prefetched the prefetched value if this Iterator prefetches
* the next value
*/
- public void successOnNextPerm( JeBitPermissionDAO dao, Iterator listing,
+ public void successOnNextPerm( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched )
{
@@ -410,7 +407,7 @@
* @param retVal the next value to be returned
* @param fault the fault that caused the failure
*/
- public void iteratorFailure( JeBitPermissionDAO dao, Iterator listing,
+ public void iteratorFailure( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Object retVal, Throwable fault )
{
@@ -432,7 +429,7 @@
* @param lastVal the last value to be returned on the subsequent
* (final) next() call
*/
- public void iteratorExhausted( JeBitPermissionDAO dao, Iterator listing,
+ public void iteratorExhausted( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Object lastVal )
{
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAO.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAO.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAO.java Fri May 28 10:11:03 2004
@@ -18,7 +18,7 @@
import org.apache.rms.RmsException ;
-import org.apache.commons.collections.primitives.IntIterator;
+import org.apache.commons.collections.primitives.IntIterator ;
/**
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitor.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitor.java Fri May 28 10:11:03 2004
@@ -18,8 +18,6 @@
import org.apache.commons.collections.primitives.IntIterator ;
-import org.apache.rms.spi.BitPermissionIndexDAO;
-import org.apache.rms.je.permission.JeBitPermissionIndexDAO;
/**
@@ -84,7 +82,7 @@
* @param appName the name of the application associated with the index
* @param index the bit permission index that failed deletion
*/
- void nothingToDelete( JeBitPermissionIndexDAO dao, String appName,
+ void nothingToDelete( BitPermissionIndexDAO dao, String appName,
int index ) ;
/**
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitorAdapter.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitorAdapter.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/BitPermissionIndexDAOMonitorAdapter.java Fri May 28 10:11:03 2004
@@ -18,9 +18,6 @@
import org.apache.commons.collections.primitives.IntIterator ;
-import org.apache.rms.spi.BitPermissionIndexDAO;
-import org.apache.rms.spi.BitPermissionIndexDAOMonitor;
-import org.apache.rms.je.permission.JeBitPermissionIndexDAO;
/**
@@ -107,7 +104,7 @@
* @param appName the name of the application associated with the index
* @param index the bit permission index that failed deletion
*/
- public void nothingToDelete( JeBitPermissionIndexDAO dao, String appName,
+ public void nothingToDelete( BitPermissionIndexDAO dao, String appName,
int index )
{
}
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionDAOMonitor.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionDAOMonitor.java Fri May 28 10:11:03 2004
@@ -18,19 +18,12 @@
import java.util.Iterator ;
-import java.io.IOException ;
import org.apache.rms.BitPermission ;
-import org.apache.rms.je.permission.JeBitPermissionTupleBinding;
-import org.apache.rms.je.permission.JeBitPermissionDAO;
-import org.apache.rms.spi.BitPermissionDAO;
-import org.apache.rms.spi.BitPermissionDAOMonitor;
+
import org.apache.commons.logging.Log ;
import org.apache.commons.logging.LogFactory ;
-import com.sleepycat.je.DatabaseEntry ;
-import com.sleepycat.bind.EntryBinding ;
-
/**
* A logging monitor for BitPermission data access objects.
@@ -40,8 +33,6 @@
*/
public class LoggingBitPermissionDAOMonitor implements BitPermissionDAOMonitor
{
- /** the entry <-> object binding used for prefetched entry transformation */
- private EntryBinding BINDING = new JeBitPermissionTupleBinding() ;
/** the log used by this logging monitor */
private Log log = LogFactory.getLog( BitPermissionDAO.class ) ;
@@ -217,7 +208,7 @@
* @param appName the name of the application
* @param index the bit index of the permission
*/
- public void permissionDoesNotExist( JeBitPermissionDAO dao, String op,
+ public void permissionDoesNotExist( BitPermissionDAO dao, String op,
String appName, int index )
{
try
@@ -245,7 +236,7 @@
* @param newName the new name for the permission
* @param fault the fault that caused the failure
*/
- public void failedOnRename( JeBitPermissionDAO dao, String appName,
+ public void failedOnRename( BitPermissionDAO dao, String appName,
String name, String newName, Throwable fault )
{
try
@@ -272,7 +263,7 @@
* @param name the name of the permission
* @param newName the new name for the permission
*/
- public void permissionRenamed( JeBitPermissionDAO dao, String appName,
+ public void permissionRenamed( BitPermissionDAO dao, String appName,
String name, String newName )
{
try
@@ -299,7 +290,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- public void indexLookedUp( JeBitPermissionDAO dao, String appName,
+ public void indexLookedUp( BitPermissionDAO dao, String appName,
String name, int index )
{
try
@@ -326,7 +317,7 @@
* @param name the name of the permission
* @param fault the fault that caused the failure
*/
- public void failedPermissionLookup( JeBitPermissionDAO dao, String appName,
+ public void failedPermissionLookup( BitPermissionDAO dao, String appName,
String name, Throwable fault )
{
try
@@ -353,7 +344,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- public void failedPermissionLookup( JeBitPermissionDAO dao,
+ public void failedPermissionLookup( BitPermissionDAO dao,
String appName, int index,
Throwable fault )
{
@@ -379,7 +370,7 @@
* @param dao the data access object that failed
* @param perm the permission object looked up
*/
- public void permissionLookedUp( JeBitPermissionDAO dao,
+ public void permissionLookedUp( BitPermissionDAO dao,
BitPermission perm )
{
try
@@ -406,7 +397,7 @@
* @param index the bit index of the permission
* @param fault the fault that caused the failure
*/
- public void failedNameLookup( JeBitPermissionDAO dao, String appName,
+ public void failedNameLookup( BitPermissionDAO dao, String appName,
int index, Throwable fault )
{
try
@@ -434,7 +425,7 @@
* @param name the name of the permission
* @param index the bit index of the permission
*/
- public void nameLookedUP( JeBitPermissionDAO dao, String appName,
+ public void nameLookedUP( BitPermissionDAO dao, String appName,
String name, int index )
{
try
@@ -461,7 +452,7 @@
* @param resource the resource being cleanup
* @param fault the fault that caused the failure
*/
- public void failedOnCleanupOperation( JeBitPermissionDAO dao, String op,
+ public void failedOnCleanupOperation( BitPermissionDAO dao, String op,
Object resource, Throwable fault )
{
try
@@ -486,7 +477,7 @@
* @param op the cleanup operation that failed
* @param resource the resource being cleanup
*/
- public void cleanedUp( JeBitPermissionDAO dao, String op, Object resource )
+ public void cleanedUp( BitPermissionDAO dao, String op, Object resource )
{
try
{
@@ -513,7 +504,7 @@
* @param onlyNames true if the Iterator was to return names false if the
* Iterator perms
*/
- public void listingEmpty( JeBitPermissionDAO dao, Iterator listing,
+ public void listingEmpty( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames )
{
try
@@ -551,7 +542,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- public void listingNamesOnly( JeBitPermissionDAO dao, Iterator listing,
+ public void listingNamesOnly( BitPermissionDAO dao, Iterator listing,
String appName )
{
try
@@ -578,7 +569,7 @@
* @param listing the Iterator created
* @param appName the name of the application
*/
- public void listingPermissions( JeBitPermissionDAO dao, Iterator listing,
+ public void listingPermissions( BitPermissionDAO dao, Iterator listing,
String appName )
{
try
@@ -605,7 +596,7 @@
* the Iterator perms
* @param fault the fault that caused the failure
*/
- public void failedListing( JeBitPermissionDAO dao, Iterator listing,
+ public void failedListing( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Throwable fault )
{
@@ -647,7 +638,7 @@
* @param prefetched the prefetched value if this Iterator prefetches
* the next value
*/
- public void successOnNextName( JeBitPermissionDAO dao, Iterator listing,
+ public void successOnNextName( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched )
{
@@ -657,19 +648,13 @@
if ( log.isDebugEnabled() )
{
- if ( prefetched instanceof DatabaseEntry )
+ if ( prefetched == null )
{
- DatabaseEntry entry = ( DatabaseEntry ) prefetched ;
- name = new String( entry.getData() ) ;
- }
- else if ( prefetched instanceof String )
- {
- name = ( String ) prefetched ;
+ name = "null" ;
}
else
{
- throw new IllegalArgumentException( "unknow type "
- + prefetched.getClass() ) ;
+ name = prefetched.toString() ;
}
log.debug( "Iterator " + listing + " created by " + dao
@@ -695,35 +680,16 @@
* @param prefetched the prefetched value if this Iterator prefetches
* the next value
*/
- public void successOnNextPerm( JeBitPermissionDAO dao, Iterator listing,
+ public void successOnNextPerm( BitPermissionDAO dao, Iterator listing,
String appName, Object retVal,
Object prefetched )
{
- BitPermission perm = null ;
-
try
{
if ( log.isDebugEnabled() )
{
- if ( prefetched instanceof BitPermission )
- {
- perm = ( BitPermission ) prefetched ;
- }
- else if ( prefetched instanceof DatabaseEntry )
- {
- try
- {
- perm = ( BitPermission )
- BINDING.entryToObject( ( DatabaseEntry ) prefetched ) ;
- }
- catch ( IOException e )
- {
- log.error( "Failed to bind database entry to BitPermission" ) ;
- }
- }
-
log.debug( "Iterator " + listing + " created by " + dao
- + " successfully prefetch a BitPermission of " + perm
+ + " successfully prefetch a BitPermission of " + prefetched
+ " for application " + appName
+ " after retrieving the value " + retVal ) ;
}
@@ -748,7 +714,7 @@
* @param retVal the next value to be returned
* @param fault the fault that caused the failure
*/
- public void iteratorFailure( JeBitPermissionDAO dao, Iterator listing,
+ public void iteratorFailure( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Object retVal, Throwable fault )
{
@@ -791,7 +757,7 @@
* @param lastVal the last value to be returned on the subsequent
* (final) next() call
*/
- public void iteratorExhausted( JeBitPermissionDAO dao, Iterator listing,
+ public void iteratorExhausted( BitPermissionDAO dao, Iterator listing,
String appName, boolean onlyNames,
Object lastVal )
{
Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionIndexDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionIndexDAOMonitor.java (original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingBitPermissionIndexDAOMonitor.java Fri May 28 10:11:03 2004
@@ -21,7 +21,6 @@
import org.apache.commons.logging.Log ;
import org.apache.commons.logging.LogFactory ;
-import org.apache.rms.je.permission.JeBitPermissionIndexDAO;
/**
@@ -153,7 +152,7 @@
* @param appName the name of the application associated with the index
* @param index the bit permission index that failed deletion
*/
- public void nothingToDelete( JeBitPermissionIndexDAO dao, String appName,
+ public void nothingToDelete( BitPermissionIndexDAO dao, String appName,
int index )
{
try