Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java	(working copy)
@@ -408,10 +408,9 @@
      * in which case the itemId present with the specified <code>data</code> is used.
      * @return true if the item with the given <code>data</code> can be read;
      * <code>false</code> otherwise.
-     * @throws AccessDeniedException
      * @throws RepositoryException
      */
-    private boolean canRead(ItemData data, Path path) throws AccessDeniedException, RepositoryException {
+    private boolean canRead(ItemData data, Path path) throws RepositoryException {
         // JCR-1601: cached item may just have been invalidated
         ItemState state = data.getState();
         if (state == null) {
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java	(working copy)
@@ -644,11 +644,10 @@
      *
      * @param definition the definition
      * @return a <code>NodeTypeDef</code>
-     * @throws InvalidNodeTypeDefinitionException if the definition is invalid
      * @throws RepositoryException if a repository error occurs
      */
     private QNodeTypeDefinition toNodeTypeDef(NodeTypeDefinition definition)
-            throws InvalidNodeTypeDefinitionException, RepositoryException {
+            throws RepositoryException {
         return new QNodeTypeDefinitionImpl(definition, context, QValueFactoryImpl.getInstance());
     }
 
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java	(working copy)
@@ -155,8 +155,7 @@
                     NamePathResolver resolver,
                     ValueFactory valueFactory,
                     ExcerptProvider exProvider,
-                    SpellSuggestion spellSuggestion)
-            throws NamespaceException {
+                    SpellSuggestion spellSuggestion) {
         this.scoreNodes = scoreNodes;
         this.columns = columns;
         this.selectorNames.addAll(Arrays.asList(selectorNames));
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java	(working copy)
@@ -282,10 +282,9 @@
      *
      * @param path the path
      * @return the node
-     * @throws PathNotFoundException if not found
      * @throws RepositoryException if an error occurs
      */
-    private NodeImpl getNode(String path) throws PathNotFoundException, RepositoryException {
+    private NodeImpl getNode(String path) throws RepositoryException {
         return (NodeImpl) session.getNode(path);
     }
 
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java	(working copy)
@@ -988,8 +988,7 @@
             }
         }
 
-        private void addReferences(PropertyState property) throws NoSuchItemStateException,
-                ItemStateException {
+        private void addReferences(PropertyState property) throws ItemStateException {
             if (property.getType() == PropertyType.REFERENCE) {
                 InternalValue[] values = property.getValues();
                 for (int i = 0; values != null && i < values.length; i++) {
@@ -1019,7 +1018,7 @@
         }
 
         private void removeReferences(ItemState state)
-                throws NoSuchItemStateException, ItemStateException {
+                throws ItemStateException {
             if (!state.isNode()) {
                 PropertyState property = (PropertyState) state;
                 if (property.getType() == PropertyType.REFERENCE) {
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java	(revision 1819267)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java	(working copy)
@@ -440,10 +440,8 @@
      * Returns a set of nodeid from the jcr:mergeFailed property of the given state
      * @param state the state
      * @return set of node ids
-     * @throws RepositoryException if an error occurs
      */
-    private Set<NodeId> getMergeFailed(NodeStateEx state)
-            throws RepositoryException {
+    private Set<NodeId> getMergeFailed(NodeStateEx state) {
         Set<NodeId> set = new HashSet<NodeId>();
         if (state.hasProperty(NameConstants.JCR_MERGEFAILED)) {
             InternalValue[] vals = state.getPropertyValues(NameConstants.JCR_MERGEFAILED);
Index: jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
===================================================================
--- jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java	(revision 1819267)
+++ jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java	(working copy)
@@ -271,10 +271,8 @@
          *
          * @param remoteEvent The {@link RemoteEventCollection.RemoteEvent} instance
          *      providing the data for this event.
-         *
-         * @throws RemoteException if an RMI error occurrs.
          */
-        private JCREvent(RemoteEventCollection.RemoteEvent remoteEvent) throws RemoteException {
+        private JCREvent(RemoteEventCollection.RemoteEvent remoteEvent) {
             remote = remoteEvent;
         }
 
Index: jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
===================================================================
--- jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java	(revision 1819267)
+++ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java	(working copy)
@@ -557,10 +557,9 @@
      * @param nodeElem The node to check.
      * @param noRecurse Boolean if child nodes should be exported at all.
      * @throws RepositoryException
-     * @throws SAXException
      */
     private void checkChildren(NodeElemData nodeElem, boolean noRecurse)
-            throws RepositoryException, SAXException {
+            throws RepositoryException {
 
         Hashtable<String, ChildNodeElem> childElemsFound = nodeElem.childNodeElemNames;
         boolean totalSumOk = false;
Index: jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
===================================================================
--- jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java	(revision 1819267)
+++ jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java	(working copy)
@@ -770,12 +770,11 @@
      * @param req the request
      * @param resp the response
      * @param loc the location for the redirect
-     * @throws ServletException if an servlet error occurs.
      * @throws IOException if an I/O error occurs.
      */
     private void redirect(HttpServletRequest req,
                           HttpServletResponse resp, String loc)
-            throws ServletException, IOException {
+            throws IOException {
         String cp = req.getContextPath();
         if (cp == null || cp.equals("/")) {
             cp = "";