Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.cluster;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>ClusterException</code> signals an error within a cluster operation.
  */
-public class ClusterException extends BaseException {
+public class ClusterException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/FileSystemException.java	(working copy)
@@ -16,14 +16,12 @@
  */
 package org.apache.jackrabbit.core.fs;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>FileSystemException</code> signals an error within a file system
  * operation. FileSystemExceptions are thrown by {@link FileSystem}
  * implementations.
  */
-public class FileSystemException extends BaseException {
+public class FileSystemException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.state;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>ItemStateException</code> ...
  */
-public class ItemStateException extends BaseException {
+public class ItemStateException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionException.java	(working copy)
@@ -16,13 +16,11 @@
  */
 package org.apache.jackrabbit.core;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * TransactionException is thrown when some operation inside the transaction
  * fails.
  */
-public class TransactionException extends BaseException {
+public class TransactionException extends Exception {
 
     /**
      * Creates an instance of this class. Takes a detail message as parameter.
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>InvalidConstraintException</code> ...
  */
-public class InvalidConstraintException extends BaseException {
+public class InvalidConstraintException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>NodeTypeConflictException</code> ...
  */
-public class InvalidNodeTypeDefException extends BaseException {
+public class InvalidNodeTypeDefException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>NodeTypeConflictException</code> ...
  */
-public class NodeTypeConflictException extends BaseException {
+public class NodeTypeConflictException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalException.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalException.java	(revision 603580)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JournalException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.core.journal;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>JournalException</code> signals an error within a journal operation.
  */
-public class JournalException extends BaseException {
+public class JournalException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidConstraintException.java
===================================================================
--- jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidConstraintException.java	(revision 603580)
+++ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidConstraintException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.jcr2spi.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>InvalidConstraintException</code> ...
  */
-public class InvalidConstraintException extends BaseException {
+public class InvalidConstraintException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeConflictException.java
===================================================================
--- jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeConflictException.java	(revision 603580)
+++ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeConflictException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.jcr2spi.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>NodeTypeConflictException</code> ...
  */
-public class NodeTypeConflictException extends BaseException {
+public class NodeTypeConflictException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail
Index: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidNodeTypeDefException.java
===================================================================
--- jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidNodeTypeDefException.java	(revision 603580)
+++ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/InvalidNodeTypeDefException.java	(working copy)
@@ -16,12 +16,10 @@
  */
 package org.apache.jackrabbit.jcr2spi.nodetype;
 
-import org.apache.jackrabbit.BaseException;
-
 /**
  * The <code>NodeTypeConflictException</code> ...
  */
-public class InvalidNodeTypeDefException extends BaseException {
+public class InvalidNodeTypeDefException extends Exception {
 
     /**
      * Constructs a new instance of this class with the specified detail