jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r155801 [1/2] - in incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi: client/ server/
Date Tue, 01 Mar 2005 16:58:16 GMT
Author: jukka
Date: Tue Mar  1 08:58:09 2005
New Revision: 155801

URL: http://svn.apache.org/viewcvs?view=rev&rev=155801
Log:
Cleaned up code by removing too fine-grained exception declarations.
The rationale for this is that internally the JCR-RMI layer only cares about
the RepositoryException/RemoteException difference.

Modified:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerSession.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java Tue Mar  1 08:58:09 2005
@@ -18,18 +18,12 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
 import javax.jcr.Item;
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.ItemVisitor;
 import javax.jcr.Node;
 import javax.jcr.Property;
-import javax.jcr.ReferentialIntegrityException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 
@@ -97,8 +91,7 @@
     }
 
     /** {@inheritDoc} */
-    public Item getAncestor(int level) throws ItemNotFoundException,
-            AccessDeniedException, RepositoryException {
+    public Item getAncestor(int level) throws RepositoryException {
         try {
             return getItem(getSession(), remote.getAncestor(level));
         } catch (RemoteException ex) {
@@ -107,8 +100,7 @@
     }
 
     /** {@inheritDoc} */
-    public Node getParent() throws ItemNotFoundException,
-            AccessDeniedException, RepositoryException {
+    public Node getParent() throws RepositoryException {
         try {
             return getFactory().getNode(getSession(), remote.getParent());
         } catch (RemoteException ex) {
@@ -196,9 +188,7 @@
     }
 
     /** {@inheritDoc} */
-    public void save() throws AccessDeniedException, LockException,
-            ConstraintViolationException, InvalidItemStateException,
-            ReferentialIntegrityException, RepositoryException {
+    public void save() throws RepositoryException {
         try {
             remote.save();
         } catch (RemoteException ex) {
@@ -207,8 +197,7 @@
     }
 
     /** {@inheritDoc} */
-    public void refresh(boolean keepChanges) throws InvalidItemStateException,
-            RepositoryException {
+    public void refresh(boolean keepChanges) throws RepositoryException {
         try {
             remote.refresh(keepChanges);
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java Tue Mar  1 08:58:09 2005
@@ -21,7 +21,6 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteLock;
 
@@ -100,7 +99,7 @@
     }
 
     /** {@inheritDoc} */
-    public void refresh() throws LockException, RepositoryException {
+    public void refresh() throws RepositoryException {
         try {
             remote.refresh();
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java Tue Mar  1 08:58:09 2005
@@ -18,7 +18,6 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.RepositoryException;
 
@@ -47,15 +46,15 @@
      * @param remote remote namespace registry
      * @param factory local adapter factory
      */
-    public ClientNamespaceRegistry(RemoteNamespaceRegistry remote,
-            LocalAdapterFactory factory) {
+    public ClientNamespaceRegistry(
+            RemoteNamespaceRegistry remote, LocalAdapterFactory factory) {
         super(factory);
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
     public void registerNamespace(String prefix, String uri)
-            throws NamespaceException, RepositoryException {
+            throws RepositoryException {
         try {
             remote.registerNamespace(prefix, uri);
         } catch (RemoteException ex) {
@@ -64,8 +63,7 @@
     }
 
     /** {@inheritDoc} */
-    public void unregisterNamespace(String prefix) throws NamespaceException,
-            RepositoryException {
+    public void unregisterNamespace(String prefix) throws RepositoryException {
         try {
             remote.unregisterNamespace(prefix);
         } catch (RemoteException ex) {
@@ -92,8 +90,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getURI(String prefix) throws NamespaceException,
-            RepositoryException {
+    public String getURI(String prefix) throws RepositoryException {
         try {
             return remote.getURI(prefix);
         } catch (RemoteException ex) {
@@ -102,8 +99,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getPrefix(String uri) throws NamespaceException,
-            RepositoryException {
+    public String getPrefix(String uri) throws RepositoryException {
         try {
             return remote.getPrefix(uri);
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java Tue Mar  1 08:58:09 2005
@@ -20,39 +20,26 @@
 import java.rmi.RemoteException;
 import java.util.Calendar;
 
-import javax.jcr.AccessDeniedException;
 import javax.jcr.BinaryValue;
 import javax.jcr.BooleanValue;
 import javax.jcr.DateValue;
 import javax.jcr.DoubleValue;
-import javax.jcr.InvalidItemStateException;
 import javax.jcr.Item;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.ItemVisitor;
 import javax.jcr.LongValue;
-import javax.jcr.MergeException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.ReferenceValue;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.StringValue;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
 import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeDef;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
 import javax.jcr.version.VersionHistory;
 
 import org.apache.jackrabbit.rmi.remote.RemoteLock;
@@ -82,8 +69,8 @@
      * @param remote  remote node
      * @param factory local adapter factory
      */
-    public ClientNode(Session session, RemoteNode remote,
-            LocalAdapterFactory factory) {
+    public ClientNode(
+            Session session, RemoteNode remote, LocalAdapterFactory factory) {
         super(session, remote, factory);
         this.remote = remote;
     }
@@ -109,9 +96,7 @@
     }
 
     /** {@inheritDoc} */
-    public Node addNode(String path) throws ItemExistsException,
-            PathNotFoundException, ConstraintViolationException,
-            RepositoryException {
+    public Node addNode(String path) throws RepositoryException {
         try {
             return getFactory().getNode(getSession(), remote.addNode(path));
         } catch (RemoteException ex) {
@@ -120,9 +105,7 @@
     }
 
     /** {@inheritDoc} */
-    public Node addNode(String path, String type) throws ItemExistsException,
-            PathNotFoundException, NoSuchNodeTypeException,
-            ConstraintViolationException, RepositoryException {
+    public Node addNode(String path, String type) throws RepositoryException {
         try {
             RemoteNode node = remote.addNode(path, type);
             return getFactory().getNode(getSession(), node);
@@ -132,10 +115,7 @@
     }
 
     /** {@inheritDoc} */
-    public void orderBefore(String src, String dst) throws
-            UnsupportedRepositoryOperationException,
-            ConstraintViolationException, ItemNotFoundException,
-            RepositoryException {
+    public void orderBefore(String src, String dst) throws RepositoryException {
         try {
             remote.orderBefore(src, dst);
         } catch (RemoteException ex) {
@@ -145,7 +125,7 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, Value value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         try {
             RemoteProperty property =
                 remote.setProperty(name, new SerialValue(value));
@@ -157,7 +137,7 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, Value[] values)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         try {
             Value[] serials = SerialValue.makeSerialValueArray(values);
             RemoteProperty property = remote.setProperty(name, serials);
@@ -169,7 +149,7 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, String[] strings)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         Value[] values = new Value[strings.length];
         for (int i = 0; i < strings.length; i++) {
             values[i] = new StringValue(strings[i]);
@@ -179,49 +159,48 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, String value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new StringValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, InputStream value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new BinaryValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, boolean value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new BooleanValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, double value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new DoubleValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, long value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new LongValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, Calendar value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new DateValue(value));
     }
 
     /** {@inheritDoc} */
     public Property setProperty(String name, Node value)
-            throws ValueFormatException, RepositoryException {
+            throws RepositoryException {
         return setProperty(name, new ReferenceValue(value));
     }
 
     /** {@inheritDoc} */
-    public Node getNode(String path) throws PathNotFoundException,
-            RepositoryException {
+    public Node getNode(String path) throws RepositoryException {
         try {
             return getFactory().getNode(getSession(), remote.getNode(path));
         } catch (RemoteException ex) {
@@ -248,8 +227,7 @@
     }
 
     /** {@inheritDoc} */
-    public Property getProperty(String path) throws PathNotFoundException,
-            RepositoryException {
+    public Property getProperty(String path) throws RepositoryException {
         try {
             RemoteProperty property = remote.getProperty(path);
             return getFactory().getProperty(getSession(), property);
@@ -268,8 +246,8 @@
     }
 
     /** {@inheritDoc} */
-    public PropertyIterator getProperties(String pattern) throws
-            RepositoryException {
+    public PropertyIterator getProperties(String pattern)
+            throws RepositoryException {
         try {
             RemoteProperty[] properties = remote.getProperties(pattern);
             return getPropertyIterator(getSession(), properties);
@@ -279,8 +257,7 @@
     }
 
     /** {@inheritDoc} */
-    public Item getPrimaryItem() throws ItemNotFoundException,
-            RepositoryException {
+    public Item getPrimaryItem() throws RepositoryException {
         try {
             return getItem(getSession(), remote.getPrimaryItem());
         } catch (RemoteException ex) {
@@ -289,8 +266,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getUUID() throws UnsupportedRepositoryOperationException,
-            RepositoryException {
+    public String getUUID() throws RepositoryException {
         try {
             return remote.getUUID();
         } catch (RemoteException ex) {
@@ -371,8 +347,7 @@
     }
 
     /** {@inheritDoc} */
-    public void addMixin(String name) throws NoSuchNodeTypeException,
-            ConstraintViolationException, RepositoryException {
+    public void addMixin(String name) throws RepositoryException {
         try {
             remote.addMixin(name);
         } catch (RemoteException ex) {
@@ -381,8 +356,7 @@
     }
 
     /** {@inheritDoc} */
-    public void removeMixin(String name) throws NoSuchNodeTypeException,
-            ConstraintViolationException, RepositoryException {
+    public void removeMixin(String name) throws RepositoryException {
         try {
             remote.removeMixin(name);
         } catch (RemoteException ex) {
@@ -409,16 +383,14 @@
     }
 
     /** {@inheritDoc} */
-    public Version checkin() throws VersionException,
-            UnsupportedRepositoryOperationException, RepositoryException {
+    public Version checkin() throws RepositoryException {
         // TODO Auto-generated method stub
         // return null;
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public void checkout() throws UnsupportedRepositoryOperationException,
-            RepositoryException {
+    public void checkout() throws RepositoryException {
         try {
             remote.checkout();
         } catch (RemoteException ex) {
@@ -427,8 +399,7 @@
     }
 
     /** {@inheritDoc} */
-    public void update(String workspace) throws NoSuchWorkspaceException,
-            AccessDeniedException, RepositoryException {
+    public void update(String workspace) throws RepositoryException {
         try {
             remote.update(workspace);
         } catch (RemoteException ex) {
@@ -437,9 +408,8 @@
     }
 
     /** {@inheritDoc} */
-    public void merge(String workspace, boolean bestEffort) throws
-            UnsupportedRepositoryOperationException, NoSuchWorkspaceException,
-            AccessDeniedException, MergeException, RepositoryException {
+    public void merge(String workspace, boolean bestEffort)
+            throws RepositoryException {
         try {
             remote.merge(workspace, bestEffort);
         } catch (RemoteException ex) {
@@ -448,25 +418,20 @@
     }
 
     /** {@inheritDoc} */
-    public void cancelMerge(Version version) throws VersionException,
-            InvalidItemStateException, UnsupportedRepositoryOperationException,
-            RepositoryException {
+    public void cancelMerge(Version version) throws RepositoryException {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public void doneMerge(Version version) throws VersionException,
-            InvalidItemStateException, UnsupportedRepositoryOperationException,
-            RepositoryException {
+    public void doneMerge(Version version) throws RepositoryException {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public String getCorrespondingNodePath(String workspace) throws
-            ItemNotFoundException, NoSuchWorkspaceException,
-            AccessDeniedException, RepositoryException {
+    public String getCorrespondingNodePath(String workspace)
+            throws RepositoryException {
         try {
             return remote.getCorrespondingNodePath(workspace);
         } catch (RemoteException ex) {
@@ -484,10 +449,8 @@
     }
 
     /** {@inheritDoc} */
-    public void restore(String version, boolean removeExisting) throws
-            VersionException, ItemExistsException,
-            UnsupportedRepositoryOperationException, LockException,
-            InvalidItemStateException, RepositoryException {
+    public void restore(String version, boolean removeExisting)
+            throws RepositoryException {
         try {
             remote.restore(version, removeExisting);
         } catch (RemoteException ex) {
@@ -496,29 +459,22 @@
     }
 
     /** {@inheritDoc} */
-    public void restore(Version version, boolean removeExisting) throws
-            VersionException, ItemExistsException,
-            UnsupportedRepositoryOperationException, LockException,
-            RepositoryException {
+    public void restore(Version version, boolean removeExisting)
+            throws RepositoryException {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
     public void restore(Version version, String path, boolean removeExisting)
-            throws PathNotFoundException, ItemExistsException,
-            VersionException, ConstraintViolationException,
-            UnsupportedRepositoryOperationException, LockException,
-            InvalidItemStateException, RepositoryException {
+            throws RepositoryException {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public void restoreByLabel(String label, boolean removeExisting) throws
-            VersionException, ItemExistsException,
-            UnsupportedRepositoryOperationException, LockException,
-            InvalidItemStateException, RepositoryException {
+    public void restoreByLabel(String label, boolean removeExisting)
+            throws RepositoryException {
         try {
             remote.restoreByLabel(label, removeExisting);
         } catch (RemoteException ex) {
@@ -528,8 +484,7 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, String[] strings, int type)
-            throws ValueFormatException, VersionException, LockException,
-            RepositoryException {
+            throws RepositoryException {
         Value[] values = new Value[strings.length];
         for (int i = 0; i < strings.length; i++) {
             values[i] = new StringValue(strings[i]);
@@ -539,8 +494,7 @@
 
     /** {@inheritDoc} */
     public Property setProperty(String name, Value[] values, int type)
-            throws ValueFormatException, VersionException, LockException,
-            RepositoryException {
+            throws RepositoryException {
         try {
             Value[] serials = SerialValue.makeSerialValueArray(values);
             RemoteProperty property = remote.setProperty(name, serials, type);
@@ -551,8 +505,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isCheckedOut() throws
-            UnsupportedRepositoryOperationException, RepositoryException {
+    public boolean isCheckedOut() throws RepositoryException {
         try {
             return remote.isCheckedOut();
         } catch (RemoteException ex) {
@@ -561,16 +514,14 @@
     }
 
     /** {@inheritDoc} */
-    public VersionHistory getVersionHistory()
-            throws UnsupportedRepositoryOperationException, RepositoryException {
+    public VersionHistory getVersionHistory() throws RepositoryException {
         // TODO Auto-generated method stub
         // return null;
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public Version getBaseVersion()
-            throws UnsupportedRepositoryOperationException, RepositoryException {
+    public Version getBaseVersion() throws RepositoryException {
         // TODO Auto-generated method stub
         // return null;
         throw new UnsupportedOperationException();
@@ -578,8 +529,7 @@
 
     /** {@inheritDoc} */
     public Lock lock(boolean isDeep, boolean isSessionScoped)
-            throws UnsupportedRepositoryOperationException, LockException,
-            AccessDeniedException, RepositoryException {
+            throws RepositoryException {
         try {
             RemoteLock lock = remote.lock(isDeep, isSessionScoped);
             return getFactory().getLock(this, lock);
@@ -589,8 +539,7 @@
     }
 
     /** {@inheritDoc} */
-    public Lock getLock() throws UnsupportedRepositoryOperationException,
-            LockException, AccessDeniedException, RepositoryException {
+    public Lock getLock() throws RepositoryException {
         try {
             return getFactory().getLock(this, remote.getLock());
         } catch (RemoteException ex) {
@@ -599,8 +548,7 @@
     }
 
     /** {@inheritDoc} */
-    public void unlock() throws UnsupportedRepositoryOperationException,
-            LockException, AccessDeniedException, RepositoryException {
+    public void unlock() throws RepositoryException {
         try {
             remote.unlock();
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java Tue Mar  1 08:58:09 2005
@@ -19,7 +19,6 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeManager;
@@ -49,15 +48,14 @@
      * @param remote remote node type manager
      * @param factory local adapter factory
      */
-    public ClientNodeTypeManager(RemoteNodeTypeManager remote,
-            LocalAdapterFactory factory) {
+    public ClientNodeTypeManager(
+            RemoteNodeTypeManager remote, LocalAdapterFactory factory) {
         super(factory);
         this.remote = remote;
     }
 
     /** {@inheritDoc} */
-    public NodeType getNodeType(String name) throws NoSuchNodeTypeException,
-            RepositoryException {
+    public NodeType getNodeType(String name) throws RepositoryException {
         try {
             return getFactory().getNodeType(remote.getNodeType(name));
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java Tue Mar  1 08:58:09 2005
@@ -103,15 +103,15 @@
      */
     protected PropertyIterator getPropertyIterator(
             Session session, RemoteProperty[] remotes) {
-        if (remotes == null) {
+        if (remotes != null) {
+            Property[] properties = new Property[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                properties[i] = factory.getProperty(session, remotes[i]);
+            }
+            return new ArrayPropertyIterator(properties);
+        } else {
             return new ArrayPropertyIterator(new Property[0]); // for safety
         }
-
-        Property[] properties = new Property[remotes.length];
-        for (int i = 0; i < remotes.length; i++) {
-            properties[i] = factory.getProperty(session, remotes[i]);
-        }
-        return new ArrayPropertyIterator(properties);
     }
 
     /**
@@ -127,15 +127,15 @@
      */
     protected NodeIterator getNodeIterator(
             Session session, RemoteNode[] remotes) {
-        if (remotes == null) {
+        if (remotes != null) {
+            Node[] nodes = new Node[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                nodes[i] = factory.getNode(session, remotes[i]);
+            }
+            return new ArrayNodeIterator(nodes);
+        } else {
             return new ArrayNodeIterator(new Node[0]); // for safety
         }
-
-        Node[] nodes = new Node[remotes.length];
-        for (int i = 0; i < remotes.length; i++) {
-            nodes[i] = factory.getNode(session, remotes[i]);
-        }
-        return new ArrayNodeIterator(nodes);
     }
 
     /**
@@ -149,15 +149,15 @@
      * @return local node type array
      */
     protected NodeType[] getNodeTypeArray(RemoteNodeType[] remotes) {
-        if (remotes == null) {
+        if (remotes != null) {
+            NodeType[] types = new NodeType[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                types[i] = factory.getNodeType(remotes[i]);
+            }
+            return types;
+        } else {
             return new NodeType[0]; // for safety
         }
-
-        NodeType[] types = new NodeType[remotes.length];
-        for (int i = 0; i < remotes.length; i++) {
-            types[i] = factory.getNodeType(remotes[i]);
-        }
-        return types;
     }
 
     /**
@@ -185,15 +185,15 @@
      * @return local node definition array
      */
     protected NodeDef[] getNodeDefArray(RemoteNodeDef[] remotes) {
-        if (remotes == null) {
+        if (remotes != null) {
+            NodeDef[] defs = new NodeDef[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                defs[i] = factory.getNodeDef(remotes[i]);
+            }
+            return defs;
+        } else {
             return new NodeDef[0]; // for safety
         }
-
-        NodeDef[] defs = new NodeDef[remotes.length];
-        for (int i = 0; i < remotes.length; i++) {
-            defs[i] = factory.getNodeDef(remotes[i]);
-        }
-        return defs;
     }
 
     /**
@@ -207,15 +207,15 @@
      * @return local property definition array
      */
     protected PropertyDef[] getPropertyDefArray(RemotePropertyDef[] remotes) {
-        if (remotes == null) {
+        if (remotes != null) {
+            PropertyDef[] defs = new PropertyDef[remotes.length];
+            for (int i = 0; i < remotes.length; i++) {
+                defs[i] = factory.getPropertyDef(remotes[i]);
+            }
+            return defs;
+        } else {
             return new PropertyDef[0]; // for safety
         }
-
-        PropertyDef[] defs = new PropertyDef[remotes.length];
-        for (int i = 0; i < remotes.length; i++) {
-            defs[i] = factory.getPropertyDef(remotes[i]);
-        }
-        return defs;
     }
 
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java Tue Mar  1 08:58:09 2005
@@ -33,7 +33,6 @@
 import javax.jcr.Session;
 import javax.jcr.StringValue;
 import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
 import javax.jcr.nodetype.PropertyDef;
 
 import org.apache.jackrabbit.rmi.remote.RemoteProperty;
@@ -61,7 +60,8 @@
      * @param remote  remote property
      * @param factory local adapter factory
      */
-    public ClientProperty(Session session, RemoteProperty remote,
+    public ClientProperty(
+            Session session, RemoteProperty remote,
             LocalAdapterFactory factory) {
         super(session, remote, factory);
         this.remote = remote;
@@ -84,8 +84,7 @@
      *
      * {@inheritDoc}
      */
-    public boolean getBoolean() throws ValueFormatException,
-            RepositoryException {
+    public boolean getBoolean() throws RepositoryException {
         return getValue().getBoolean();
     }
 
@@ -95,7 +94,7 @@
      *
      * {@inheritDoc}
      */
-    public Calendar getDate() throws ValueFormatException, RepositoryException {
+    public Calendar getDate() throws RepositoryException {
         return getValue().getDate();
     }
 
@@ -105,7 +104,7 @@
      *
      * {@inheritDoc}
      */
-    public double getDouble() throws ValueFormatException, RepositoryException {
+    public double getDouble() throws RepositoryException {
         return getValue().getDouble();
     }
 
@@ -115,7 +114,7 @@
      *
      * {@inheritDoc}
      */
-    public long getLong() throws ValueFormatException, RepositoryException {
+    public long getLong() throws RepositoryException {
         return getValue().getLong();
     }
 
@@ -125,8 +124,7 @@
      *
      * {@inheritDoc}
      */
-    public InputStream getStream() throws ValueFormatException,
-            RepositoryException {
+    public InputStream getStream() throws RepositoryException {
         return getValue().getStream();
     }
 
@@ -136,12 +134,12 @@
      *
      * {@inheritDoc}
      */
-    public String getString() throws ValueFormatException, RepositoryException {
+    public String getString() throws RepositoryException {
         return getValue().getString();
     }
 
     /** {@inheritDoc} */
-    public Value getValue() throws ValueFormatException, RepositoryException {
+    public Value getValue() throws RepositoryException {
         try {
             return remote.getValue();
         } catch (RemoteException ex) {
@@ -150,7 +148,7 @@
     }
 
     /** {@inheritDoc} */
-    public Value[] getValues() throws ValueFormatException, RepositoryException {
+    public Value[] getValues() throws RepositoryException {
         try {
             return remote.getValues();
         } catch (RemoteException ex) {
@@ -164,8 +162,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(boolean value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(boolean value) throws RepositoryException {
         setValue(new BooleanValue(value));
     }
 
@@ -175,8 +172,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(Calendar value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(Calendar value) throws RepositoryException {
         setValue(new DateValue(value));
     }
 
@@ -186,8 +182,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(double value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(double value) throws RepositoryException {
         setValue(new DoubleValue(value));
     }
 
@@ -197,8 +192,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(InputStream value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(InputStream value) throws RepositoryException {
         setValue(new BinaryValue(value));
     }
 
@@ -208,8 +202,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(long value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(long value) throws RepositoryException {
         setValue(new LongValue(value));
     }
 
@@ -219,8 +212,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(Node value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(Node value) throws RepositoryException {
         setValue(new ReferenceValue(value));
     }
 
@@ -230,8 +222,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(String value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(String value) throws RepositoryException {
         setValue(new StringValue(value));
     }
 
@@ -241,8 +232,7 @@
      *
      * {@inheritDoc}
      */
-    public void setValue(String[] strings) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(String[] strings) throws RepositoryException {
         Value[] values = new Value[strings.length];
         for (int i = 0; i < strings.length; i++) {
             values[i] = new StringValue(strings[i]);
@@ -251,8 +241,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setValue(Value value) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(Value value) throws RepositoryException {
         try {
             remote.setValue(new SerialValue(value));
         } catch (RemoteException ex) {
@@ -261,8 +250,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setValue(Value[] values) throws ValueFormatException,
-            RepositoryException {
+    public void setValue(Value[] values) throws RepositoryException {
         try {
             remote.setValue(SerialValue.makeSerialValueArray(values));
         } catch (RemoteException ex) {
@@ -277,12 +265,12 @@
      *
      * {@inheritDoc}
      */
-    public Node getNode() throws ValueFormatException, RepositoryException {
+    public Node getNode() throws RepositoryException {
         return getSession().getNodeByUUID(getString());
     }
 
     /** {@inheritDoc} */
-    public long getLength() throws ValueFormatException, RepositoryException {
+    public long getLength() throws RepositoryException {
         try {
             return remote.getLength();
         } catch (RemoteException ex) {
@@ -291,7 +279,7 @@
     }
 
     /** {@inheritDoc} */
-    public long[] getLengths() throws ValueFormatException, RepositoryException {
+    public long[] getLengths() throws RepositoryException {
         try {
             return remote.getLengths();
         } catch (RemoteException ex) {
@@ -316,4 +304,5 @@
             throw new RemoteRepositoryException(ex);
         }
     }
+
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java Tue Mar  1 08:58:09 2005
@@ -44,8 +44,8 @@
      * @param remote remote property definition
      * @param factory local adapter factory
      */
-    public ClientPropertyDef(RemotePropertyDef remote,
-            LocalAdapterFactory factory) {
+    public ClientPropertyDef(
+            RemotePropertyDef remote, LocalAdapterFactory factory) {
         super(remote, factory);
         this.remote = remote;
     }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java Tue Mar  1 08:58:09 2005
@@ -18,17 +18,10 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
-import javax.jcr.version.VersionException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteQuery;
 
@@ -92,8 +85,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getPersistentQueryPath()
-            throws ItemNotFoundException, RepositoryException {
+    public String getPersistentQueryPath() throws RepositoryException {
         try {
             return remote.getPersistentQueryPath();
         } catch (RemoteException ex) {
@@ -102,10 +94,7 @@
     }
 
     /** {@inheritDoc} */
-    public void save(String absPath) throws ItemExistsException,
-            PathNotFoundException, VersionException,
-            ConstraintViolationException, LockException,
-            UnsupportedRepositoryOperationException, RepositoryException {
+    public void save(String absPath) throws RepositoryException {
         try {
             remote.save(absPath);
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java Tue Mar  1 08:58:09 2005
@@ -21,7 +21,6 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.query.InvalidQueryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
@@ -52,7 +51,8 @@
      * @param remote remote query manager
      * @param factory adapter factory
      */
-    public ClientQueryManager(Session session, RemoteQueryManager remote,
+    public ClientQueryManager(
+            Session session, RemoteQueryManager remote,
             LocalAdapterFactory factory) {
         super(factory);
         this.session = session;
@@ -61,7 +61,7 @@
 
     /** {@inheritDoc} */
     public Query createQuery(String statement, String language)
-            throws InvalidQueryException, RepositoryException {
+            throws  RepositoryException {
         try {
             RemoteQuery query = remote.createQuery(statement, language);
             return getFactory().getQuery(session, query);
@@ -71,8 +71,7 @@
     }
 
     /** {@inheritDoc} */
-    public Query getQuery(Node node)
-            throws InvalidQueryException, RepositoryException {
+    public Query getQuery(Node node) throws RepositoryException {
         try {
             // TODO fix this remote node dereferencing hack
             RemoteQuery query = remote.getQuery(node.getPath());

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java Tue Mar  1 08:58:09 2005
@@ -57,7 +57,8 @@
      * @param remote remote query result
      * @param factory adapter factory
      */
-    public ClientQueryResult(Session session, RemoteQueryResult remote,
+    public ClientQueryResult(
+            Session session, RemoteQueryResult remote,
             LocalAdapterFactory factory) {
         super(factory);
         this.session = session;
@@ -77,11 +78,15 @@
     public RowIterator getRows() throws RepositoryException {
         try {
             RemoteRow[] remotes =  remote.getRows();
-            Row[] rows = new Row[(remotes != null) ? remotes.length : 0];
-            for (int i = 0; i < rows.length; i++) {
-                rows[i] = getFactory().getRow(remotes[i]);
+            if (remotes != null) {
+                Row[] rows = new Row[remotes.length];
+                for (int i = 0; i < rows.length; i++) {
+                    rows[i] = getFactory().getRow(remotes[i]);
+                }
+                return new ArrayRowIterator(rows);
+            } else {
+                return new ArrayRowIterator(new Row[0]);
             }
-            return new ArrayRowIterator(rows);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -91,11 +96,15 @@
     public NodeIterator getNodes() throws RepositoryException {
         try {
             RemoteNode[] remotes = remote.getNodes();
-            Node[] nodes = new Node[(remotes != null) ? remotes.length : 0];
-            for (int i = 0; i < nodes.length; i++) {
-                nodes[i] = getFactory().getNode(session, remotes[i]);
+            if (remotes != null) {
+                Node[] nodes = new Node[remotes.length];
+                for (int i = 0; i < nodes.length; i++) {
+                    nodes[i] = getFactory().getNode(session, remotes[i]);
+                }
+                return new ArrayNodeIterator(nodes);
+            } else {
+                return new ArrayNodeIterator(new Node[0]);
             }
-            return new ArrayNodeIterator(nodes);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java Tue Mar  1 08:58:09 2005
@@ -19,8 +19,6 @@
 import java.rmi.RemoteException;
 
 import javax.jcr.Credentials;
-import javax.jcr.LoginException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -74,8 +72,7 @@
     }
 
     /** {@inheritDoc} */
-    public Session login() throws LoginException, NoSuchWorkspaceException,
-            RepositoryException {
+    public Session login() throws RepositoryException {
         try {
             RemoteSession session = remote.login();
             return getFactory().getSession(this, session);
@@ -85,8 +82,7 @@
     }
 
     /** {@inheritDoc} */
-    public Session login(String workspace) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException {
+    public Session login(String workspace) throws RepositoryException {
         try {
             RemoteSession session = remote.login(workspace);
             return getFactory().getSession(this, session);
@@ -96,8 +92,7 @@
     }
 
     /** {@inheritDoc} */
-    public Session login(Credentials credentials) throws LoginException,
-            NoSuchWorkspaceException, RepositoryException {
+    public Session login(Credentials credentials) throws RepositoryException {
         try {
             RemoteSession session = remote.login(credentials);
             return getFactory().getSession(this, session);
@@ -107,8 +102,8 @@
     }
 
     /** {@inheritDoc} */
-    public Session login(Credentials credentials, String workspace) throws
-            LoginException, NoSuchWorkspaceException, RepositoryException {
+    public Session login(Credentials credentials, String workspace)
+            throws RepositoryException {
         try {
             RemoteSession session = remote.login(credentials, workspace);
             return getFactory().getSession(this, session);

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java Tue Mar  1 08:58:09 2005
@@ -18,7 +18,6 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.query.Row;
@@ -58,8 +57,7 @@
     }
 
     /** {@inheritDoc} */
-    public Value getValue(String s)
-            throws ItemNotFoundException, RepositoryException {
+    public Value getValue(String s) throws RepositoryException {
         try {
             return remote.getValue(s);
         } catch (RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java Tue Mar  1 08:58:09 2005
@@ -24,23 +24,13 @@
 import java.rmi.RemoteException;
 import java.security.AccessControlException;
 
-import javax.jcr.AccessDeniedException;
 import javax.jcr.Credentials;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.InvalidSerializedDataException;
 import javax.jcr.Item;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.LoginException;
-import javax.jcr.NamespaceException;
 import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Workspace;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -133,8 +123,8 @@
     }
 
     /** {@inheritDoc} */
-    public Session impersonate(Credentials credentials) throws
-            LoginException, RepositoryException {
+    public Session impersonate(Credentials credentials)
+            throws RepositoryException {
         try {
             RemoteSession session = remote.impersonate(credentials);
             return getFactory().getSession(repository, session);
@@ -153,8 +143,7 @@
     }
 
     /** {@inheritDoc} */
-    public Node getNodeByUUID(String uuid) throws ItemNotFoundException,
-            RepositoryException {
+    public Node getNodeByUUID(String uuid) throws RepositoryException {
         try {
             return getFactory().getNode(this, remote.getNodeByUUID(uuid));
         } catch (RemoteException ex) {
@@ -163,8 +152,7 @@
     }
 
     /** {@inheritDoc} */
-    public Item getItem(String path) throws PathNotFoundException,
-            RepositoryException {
+    public Item getItem(String path) throws RepositoryException {
         try {
             return getItem(this, remote.getItem(path));
         } catch (RemoteException ex) {
@@ -182,9 +170,7 @@
     }
 
     /** {@inheritDoc} */
-    public void move(String from, String to) throws ItemExistsException,
-            PathNotFoundException, ConstraintViolationException,
-            RepositoryException {
+    public void move(String from, String to) throws RepositoryException {
         try {
             remote.move(from, to);
         } catch (RemoteException ex) {
@@ -193,9 +179,7 @@
     }
 
     /** {@inheritDoc} */
-    public void save() throws AccessDeniedException, LockException,
-            ConstraintViolationException, InvalidItemStateException,
-            RepositoryException {
+    public void save() throws RepositoryException {
         try {
             remote.save();
         } catch (RemoteException ex) {
@@ -232,10 +216,8 @@
     }
 
     /** {@inheritDoc} */
-    public void importXML(String path, InputStream xml) throws IOException,
-            PathNotFoundException, ItemExistsException,
-            ConstraintViolationException, InvalidSerializedDataException,
-            RepositoryException {
+    public void importXML(String path, InputStream xml)
+            throws IOException, RepositoryException {
         try {
             ByteArrayOutputStream buffer = new ByteArrayOutputStream();
             byte[] bytes = new byte[4096];
@@ -249,14 +231,14 @@
     }
 
     /** {@inheritDoc} */
-    public ContentHandler getImportContentHandler(String path) throws
-            PathNotFoundException, RepositoryException {
+    public ContentHandler getImportContentHandler(String path)
+            throws RepositoryException {
         return new SessionImportContentHandler(this, path);
     }
 
     /** {@inheritDoc} */
-    public void setNamespacePrefix(String prefix, String uri) throws
-            NamespaceException, RepositoryException {
+    public void setNamespacePrefix(String prefix, String uri)
+            throws RepositoryException {
         try {
             remote.setNamespacePrefix(prefix, uri);
         } catch (RemoteException ex) {
@@ -274,8 +256,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getNamespaceURI(String prefix) throws NamespaceException,
-            RepositoryException {
+    public String getNamespaceURI(String prefix) throws RepositoryException {
         try {
             return remote.getNamespaceURI(prefix);
         } catch (RemoteException ex) {
@@ -284,8 +265,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getNamespacePrefix(String uri) throws NamespaceException,
-            RepositoryException {
+    public String getNamespacePrefix(String uri) throws RepositoryException {
         try {
             return remote.getNamespacePrefix(uri);
         } catch (RemoteException ex) {
@@ -338,9 +318,10 @@
      *
      * {@inheritDoc}
      */
-    public void exportSysView(String path, ContentHandler handler,
-            boolean binaryAsLink, boolean noRecurse) throws
-            PathNotFoundException, SAXException, RepositoryException {
+    public void exportSysView(
+            String path, ContentHandler handler,
+            boolean binaryAsLink, boolean noRecurse)
+            throws SAXException, RepositoryException {
         try {
             byte[] xml = remote.exportSysView(path, binaryAsLink, noRecurse);
 
@@ -369,9 +350,10 @@
      *
      * {@inheritDoc}
      */
-    public void exportSysView(String path, OutputStream output,
-            boolean binaryAsLink, boolean noRecurse) throws
-            PathNotFoundException, IOException, RepositoryException {
+    public void exportSysView(
+            String path, OutputStream output,
+            boolean binaryAsLink, boolean noRecurse)
+            throws IOException, RepositoryException {
         try {
             byte[] xml = remote.exportSysView(path, binaryAsLink, noRecurse);
             output.write(xml);
@@ -389,10 +371,10 @@
      *
      * {@inheritDoc}
      */
-    public void exportDocView(String path, ContentHandler handler,
-            boolean binaryAsLink, boolean noRecurse) throws
-            InvalidSerializedDataException, PathNotFoundException,
-            SAXException, RepositoryException {
+    public void exportDocView(
+            String path, ContentHandler handler,
+            boolean binaryAsLink, boolean noRecurse)
+            throws SAXException, RepositoryException {
         try {
             byte[] xml = remote.exportDocView(path, binaryAsLink, noRecurse);
 
@@ -421,10 +403,10 @@
      *
      * {@inheritDoc}
      */
-    public void exportDocView(String path, OutputStream output,
-            boolean binaryAsLink, boolean noRecurse) throws
-            InvalidSerializedDataException, PathNotFoundException,
-            IOException, RepositoryException {
+    public void exportDocView(
+            String path, OutputStream output,
+            boolean binaryAsLink, boolean noRecurse)
+            throws IOException, RepositoryException {
         try {
             byte[] xml = remote.exportDocView(path, binaryAsLink, noRecurse);
             output.write(xml);

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java Tue Mar  1 08:58:09 2005
@@ -21,24 +21,14 @@
 import java.io.InputStream;
 import java.rmi.RemoteException;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.InvalidSerializedDataException;
-import javax.jcr.ItemExistsException;
 import javax.jcr.NamespaceRegistry;
-import javax.jcr.NoSuchWorkspaceException;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Workspace;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.QueryManager;
 import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
 import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
@@ -73,7 +63,8 @@
      * @param remote remote workspace
      * @param factory local adapter factory
      */
-    public ClientWorkspace(Session session, RemoteWorkspace remote,
+    public ClientWorkspace(
+            Session session, RemoteWorkspace remote,
             LocalAdapterFactory factory) {
         super(factory);
         this.session = session;
@@ -99,9 +90,7 @@
     }
 
     /** {@inheritDoc} */
-    public void copy(String from, String to) throws
-            ConstraintViolationException, AccessDeniedException,
-            PathNotFoundException, ItemExistsException, RepositoryException {
+    public void copy(String from, String to) throws RepositoryException {
         try {
             remote.copy(from, to);
         } catch (RemoteException ex) {
@@ -110,10 +99,8 @@
     }
 
     /** {@inheritDoc} */
-    public void copy(String from, String to, String workspace) throws
-            NoSuchWorkspaceException, ConstraintViolationException,
-            AccessDeniedException, PathNotFoundException, ItemExistsException,
-            RepositoryException {
+    public void copy(String from, String to, String workspace)
+            throws RepositoryException {
         try {
             remote.copy(from, to, workspace);
         } catch (RemoteException ex) {
@@ -122,9 +109,7 @@
     }
 
     /** {@inheritDoc} */
-    public void move(String from, String to) throws
-            ConstraintViolationException, AccessDeniedException,
-            PathNotFoundException, ItemExistsException, RepositoryException {
+    public void move(String from, String to) throws RepositoryException {
         try {
             remote.move(from, to);
         } catch (RemoteException ex) {
@@ -164,18 +149,16 @@
 
     /** {@inheritDoc} */
     public ObservationManager getObservationManager()
-            throws UnsupportedRepositoryOperationException, RepositoryException {
+            throws RepositoryException {
         // TODO Auto-generated method stub
         // return null;
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    public void clone(String workspace, String src, String dst,
-            boolean removeExisting) throws NoSuchWorkspaceException,
-            ConstraintViolationException, VersionException,
-            AccessDeniedException, PathNotFoundException, ItemExistsException,
-            LockException, RepositoryException {
+    public void clone(
+            String workspace, String src, String dst, boolean removeExisting)
+            throws RepositoryException {
         try {
             remote.clone(workspace, src, dst, removeExisting);
         } catch (RemoteException ex) {
@@ -193,18 +176,15 @@
     }
 
     /** {@inheritDoc} */
-    public ContentHandler getImportContentHandler(String path,
-            int uuidBehaviour) throws PathNotFoundException,
-            ConstraintViolationException, VersionException, LockException,
-            RepositoryException {
+    public ContentHandler getImportContentHandler(
+            String path, int uuidBehaviour)
+            throws RepositoryException {
         return new WorkspaceImportContentHandler(this, path, uuidBehaviour);
     }
 
     /** {@inheritDoc} */
     public void importXML(String path, InputStream xml, int uuidBehaviour)
-            throws IOException, PathNotFoundException, ItemExistsException,
-            ConstraintViolationException, InvalidSerializedDataException,
-            LockException, RepositoryException {
+            throws IOException, RepositoryException {
         try {
             ByteArrayOutputStream buffer = new ByteArrayOutputStream();
             byte[] bytes = new byte[4096];
@@ -218,10 +198,8 @@
     }
 
     /** {@inheritDoc} */
-    public void restore(Version[] versions, boolean removeExisting) throws
-            ItemExistsException, UnsupportedRepositoryOperationException,
-            VersionException, LockException, InvalidItemStateException,
-            RepositoryException {
+    public void restore(Version[] versions, boolean removeExisting)
+            throws RepositoryException {
         // TODO Auto-generated method stub
     }
 

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java Tue Mar  1 08:58:09 2005
@@ -97,7 +97,8 @@
      * {@inheritDoc}
      */
     public RemoteNamespaceRegistry getRemoteNamespaceRegistry(
-            NamespaceRegistry registry) throws RemoteException {
+            NamespaceRegistry registry)
+            throws RemoteException {
         return new ServerNamespaceRegistry(registry, this);
     }
 
@@ -106,7 +107,8 @@
      * {@inheritDoc}
      */
     public RemoteNodeTypeManager getRemoteNodeTypeManager(
-            NodeTypeManager manager) throws RemoteException {
+            NodeTypeManager manager)
+            throws RemoteException {
         return new ServerNodeTypeManager(manager, this);
     }
 

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java Tue Mar  1 08:58:09 2005
@@ -18,14 +18,8 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
 import javax.jcr.Item;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ReferentialIntegrityException;
 import javax.jcr.RepositoryException;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteNode;
@@ -80,9 +74,7 @@
     }
 
     /** {@inheritDoc} */
-    public void save() throws AccessDeniedException, LockException,
-            ConstraintViolationException, InvalidItemStateException,
-            ReferentialIntegrityException, RepositoryException, RemoteException {
+    public void save() throws RepositoryException, RemoteException {
         try {
             item.save();
         } catch (RepositoryException ex) {
@@ -91,8 +83,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteItem getAncestor(int level) throws ItemNotFoundException,
-            AccessDeniedException, RepositoryException, RemoteException {
+    public RemoteItem getAncestor(int level)
+            throws RepositoryException, RemoteException {
         try {
             return getRemoteItem(item.getAncestor(level));
         } catch (RepositoryException ex) {
@@ -110,8 +102,7 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNode getParent() throws ItemNotFoundException,
-            AccessDeniedException, RepositoryException, RemoteException {
+    public RemoteNode getParent() throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNode(item.getParent());
         } catch (RepositoryException ex) {
@@ -130,8 +121,8 @@
     }
 
     /** {@inheritDoc} */
-    public void refresh(boolean keepChanges) throws InvalidItemStateException,
-            RepositoryException, RemoteException {
+    public void refresh(boolean keepChanges)
+            throws RepositoryException, RemoteException {
         try {
             item.refresh(keepChanges);
         } catch (RepositoryException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java Tue Mar  1 08:58:09 2005
@@ -21,7 +21,6 @@
 
 import javax.jcr.RepositoryException;
 import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteLock;
 
@@ -71,8 +70,7 @@
     }
 
     /** {@inheritDoc} */
-    public void refresh() throws LockException, RepositoryException,
-            RemoteException {
+    public void refresh() throws RepositoryException, RemoteException {
         lock.refresh();
     }
 

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java Tue Mar  1 08:58:09 2005
@@ -18,7 +18,6 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.RepositoryException;
 
@@ -49,15 +48,16 @@
      * @param factory remote adapter factory
      * @throws RemoteException on RMI errors
      */
-    public ServerNamespaceRegistry(NamespaceRegistry registry,
-            RemoteAdapterFactory factory) throws RemoteException {
+    public ServerNamespaceRegistry(
+            NamespaceRegistry registry, RemoteAdapterFactory factory)
+            throws RemoteException {
         super(factory);
         this.registry = registry;
     }
 
     /** {@inheritDoc} */
     public void registerNamespace(String prefix, String uri)
-            throws NamespaceException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             registry.registerNamespace(prefix, uri);
         } catch (RepositoryException ex) {
@@ -66,8 +66,8 @@
     }
 
     /** {@inheritDoc} */
-    public void unregisterNamespace(String prefix) throws NamespaceException,
-            RepositoryException, RemoteException {
+    public void unregisterNamespace(String prefix)
+            throws RepositoryException, RemoteException {
         try {
             registry.unregisterNamespace(prefix);
         } catch (RepositoryException ex) {
@@ -94,8 +94,8 @@
     }
 
     /** {@inheritDoc} */
-    public String getURI(String prefix) throws NamespaceException,
-            RepositoryException, RemoteException {
+    public String getURI(String prefix)
+            throws RepositoryException, RemoteException {
         try {
             return registry.getURI(prefix);
         } catch (RepositoryException ex) {
@@ -104,8 +104,8 @@
     }
 
     /** {@inheritDoc} */
-    public String getPrefix(String uri) throws NamespaceException,
-            RepositoryException, RemoteException {
+    public String getPrefix(String uri)
+            throws RepositoryException, RemoteException {
         try {
             return registry.getPrefix(uri);
         } catch (RepositoryException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java Tue Mar  1 08:58:09 2005
@@ -18,24 +18,11 @@
 
 import java.rmi.RemoteException;
 
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.MergeException;
-import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
 import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
 import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.version.VersionException;
 
 import org.apache.jackrabbit.rmi.remote.RemoteItem;
 import org.apache.jackrabbit.rmi.remote.RemoteLock;
@@ -73,9 +60,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNode addNode(String path) throws ItemExistsException,
-            PathNotFoundException, ConstraintViolationException,
-            RepositoryException, RemoteException {
+    public RemoteNode addNode(String path)
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNode(node.addNode(path));
         } catch (RepositoryException ex) {
@@ -84,10 +70,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNode addNode(String path, String type) throws
-            ItemExistsException, PathNotFoundException,
-            NoSuchNodeTypeException, ConstraintViolationException,
-            RepositoryException, RemoteException {
+    public RemoteNode addNode(String path, String type)
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNode(node.addNode(path, type));
         } catch (RepositoryException ex) {
@@ -96,8 +80,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteProperty getProperty(String path) throws PathNotFoundException,
-            RepositoryException, RemoteException {
+    public RemoteProperty getProperty(String path)
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteProperty(node.getProperty(path));
         } catch (RepositoryException ex) {
@@ -106,8 +90,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteProperty[] getProperties() throws RepositoryException,
-            RemoteException {
+    public RemoteProperty[] getProperties()
+            throws RepositoryException, RemoteException {
         try {
             return getRemotePropertyArray(node.getProperties());
         } catch (RepositoryException ex) {
@@ -116,8 +100,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteItem getPrimaryItem() throws ItemNotFoundException,
-            RepositoryException, RemoteException {
+    public RemoteItem getPrimaryItem()
+            throws RepositoryException, RemoteException {
         try {
             return getRemoteItem(node.getPrimaryItem());
         } catch (RepositoryException ex) {
@@ -136,8 +120,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteProperty[] getReferences() throws RepositoryException,
-            RemoteException {
+    public RemoteProperty[] getReferences()
+            throws RepositoryException, RemoteException {
         try {
             return getRemotePropertyArray(node.getReferences());
         } catch (RepositoryException ex) {
@@ -146,8 +130,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getUUID() throws UnsupportedRepositoryOperationException,
-            RepositoryException, RemoteException {
+    public String getUUID() throws RepositoryException, RemoteException {
         try {
             return node.getUUID();
         } catch (RepositoryException ex) {
@@ -174,8 +157,8 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasProperty(String path) throws RepositoryException,
-            RemoteException {
+    public boolean hasProperty(String path)
+            throws RepositoryException, RemoteException {
         try {
             return node.hasProperty(path);
         } catch (RepositoryException ex) {
@@ -184,8 +167,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNodeType[] getMixinNodeTypes() throws RepositoryException,
-            RemoteException {
+    public RemoteNodeType[] getMixinNodeTypes()
+            throws RepositoryException, RemoteException {
         try {
             return getRemoteNodeTypeArray(node.getMixinNodeTypes());
         } catch (RepositoryException ex) {
@@ -194,8 +177,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNodeType getPrimaryNodeType() throws RepositoryException,
-            RemoteException {
+    public RemoteNodeType getPrimaryNodeType()
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNodeType(node.getPrimaryNodeType());
         } catch (RepositoryException ex) {
@@ -204,8 +187,8 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isNodeType(String type) throws RepositoryException,
-            RemoteException {
+    public boolean isNodeType(String type)
+            throws RepositoryException, RemoteException {
         try {
             return node.isNodeType(type);
         } catch (RepositoryException ex) {
@@ -223,8 +206,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNode[] getNodes(String pattern) throws RepositoryException,
-            RemoteException {
+    public RemoteNode[] getNodes(String pattern)
+            throws RepositoryException, RemoteException {
         try {
             return getRemoteNodeArray(node.getNodes(pattern));
         } catch (RepositoryException ex) {
@@ -233,8 +216,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNode getNode(String path) throws PathNotFoundException,
-            RepositoryException, RemoteException {
+    public RemoteNode getNode(String path)
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNode(node.getNode(path));
         } catch (RepositoryException ex) {
@@ -243,8 +226,8 @@
     }
 
     /** {@inheritDoc} */
-    public boolean hasNode(String path) throws RepositoryException,
-            RemoteException {
+    public boolean hasNode(String path)
+            throws RepositoryException, RemoteException {
         try {
             return node.hasNode(path);
         } catch (RepositoryException ex) {
@@ -254,7 +237,7 @@
 
     /** {@inheritDoc} */
     public RemoteProperty setProperty(String name, Value value)
-            throws ValueFormatException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteProperty(node.setProperty(name, value));
         } catch (RepositoryException ex) {
@@ -263,8 +246,8 @@
     }
 
     /** {@inheritDoc} */
-    public void addMixin(String name) throws NoSuchNodeTypeException,
-            ConstraintViolationException, RepositoryException, RemoteException {
+    public void addMixin(String name)
+            throws RepositoryException, RemoteException {
         try {
             node.addMixin(name);
         } catch (RepositoryException ex) {
@@ -273,8 +256,8 @@
     }
 
     /** {@inheritDoc} */
-    public boolean canAddMixin(String name) throws RepositoryException,
-            RemoteException {
+    public boolean canAddMixin(String name)
+            throws RepositoryException, RemoteException {
         try {
             return node.canAddMixin(name);
         } catch (RepositoryException ex) {
@@ -283,8 +266,8 @@
     }
 
     /** {@inheritDoc} */
-    public void removeMixin(String name) throws NoSuchNodeTypeException,
-            ConstraintViolationException, RepositoryException, RemoteException {
+    public void removeMixin(String name)
+            throws RepositoryException, RemoteException {
         try {
             node.removeMixin(name);
         } catch (RepositoryException ex) {
@@ -294,9 +277,7 @@
 
     /** {@inheritDoc} */
     public void orderBefore(String src, String dst)
-            throws UnsupportedRepositoryOperationException,
-            ConstraintViolationException, ItemNotFoundException,
-            RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             node.orderBefore(src, dst);
         } catch (RepositoryException ex) {
@@ -306,7 +287,7 @@
 
     /** {@inheritDoc} */
     public RemoteProperty setProperty(String name, Value[] values)
-            throws ValueFormatException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             Property property = node.setProperty(name, values);
             return getFactory().getRemoteProperty(property);
@@ -316,8 +297,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteNodeDef getDefinition() throws RepositoryException,
-            RemoteException {
+    public RemoteNodeDef getDefinition()
+            throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteNodeDef(node.getDefinition());
         } catch (RepositoryException ex) {
@@ -326,8 +307,7 @@
     }
 
     /** {@inheritDoc} */
-    public void checkout() throws UnsupportedRepositoryOperationException,
-            RepositoryException, RemoteException {
+    public void checkout() throws RepositoryException, RemoteException {
         try {
             node.checkout();
         } catch (RepositoryException ex) {
@@ -337,8 +317,7 @@
 
     /** {@inheritDoc} */
     public String getCorrespondingNodePath(String workspace)
-            throws ItemNotFoundException, NoSuchWorkspaceException,
-            AccessDeniedException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             return node.getCorrespondingNodePath(workspace);
         } catch (RepositoryException ex) {
@@ -357,9 +336,7 @@
 
     /** {@inheritDoc} */
     public void merge(String workspace, boolean bestEffort)
-            throws UnsupportedRepositoryOperationException,
-            NoSuchWorkspaceException, AccessDeniedException, MergeException,
-            RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             node.merge(workspace, bestEffort);
         } catch (RepositoryException ex) {
@@ -369,9 +346,7 @@
 
     /** {@inheritDoc} */
     public void restore(String version, boolean removeExisting)
-            throws VersionException, ItemExistsException,
-            UnsupportedRepositoryOperationException, LockException,
-            InvalidItemStateException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             node.restore(version, removeExisting);
         } catch (RepositoryException ex) {
@@ -381,9 +356,7 @@
 
     /** {@inheritDoc} */
     public void restoreByLabel(String label, boolean removeExisting)
-            throws VersionException, ItemExistsException,
-            UnsupportedRepositoryOperationException, LockException,
-            InvalidItemStateException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             node.restoreByLabel(label, removeExisting);
         } catch (RepositoryException ex) {
@@ -392,8 +365,8 @@
     }
 
     /** {@inheritDoc} */
-    public void update(String workspace) throws NoSuchWorkspaceException,
-            AccessDeniedException, RepositoryException, RemoteException {
+    public void update(String workspace)
+            throws RepositoryException, RemoteException {
         try {
             node.update(workspace);
         } catch (RepositoryException ex) {
@@ -411,9 +384,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isCheckedOut() throws
-            UnsupportedRepositoryOperationException, RepositoryException,
-            RemoteException {
+    public boolean isCheckedOut() throws RepositoryException, RemoteException {
         try {
             return node.isCheckedOut();
         } catch (RepositoryException ex) {
@@ -432,8 +403,7 @@
 
     /** {@inheritDoc} */
     public RemoteProperty setProperty(String name, Value[] values, int type)
-            throws ValueFormatException, VersionException, LockException,
-            RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             Property property = node.setProperty(name, values, type);
             return getFactory().getRemoteProperty(property);
@@ -443,9 +413,7 @@
     }
 
     /** {@inheritDoc} */
-    public void unlock() throws UnsupportedRepositoryOperationException,
-            LockException, AccessDeniedException, RepositoryException,
-            RemoteException {
+    public void unlock() throws RepositoryException, RemoteException {
         try {
             node.unlock();
         } catch (RepositoryException ex) {
@@ -454,9 +422,7 @@
     }
 
     /** {@inheritDoc} */
-    public RemoteLock getLock() throws UnsupportedRepositoryOperationException,
-            LockException, AccessDeniedException, RepositoryException,
-            RemoteException {
+    public RemoteLock getLock() throws RepositoryException, RemoteException {
         try {
             return getFactory().getRemoteLock(node.getLock());
         } catch (RepositoryException ex) {
@@ -466,8 +432,7 @@
 
     /** {@inheritDoc} */
     public RemoteLock lock(boolean isDeep, boolean isSessionScoped)
-            throws UnsupportedRepositoryOperationException, LockException,
-            AccessDeniedException, RepositoryException, RemoteException {
+            throws RepositoryException, RemoteException {
         try {
             Lock lock = node.lock(isDeep, isSessionScoped);
             return getFactory().getRemoteLock(lock);
@@ -475,4 +440,5 @@
             throw getRepositoryException(ex);
         }
     }
+
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java?view=diff&r1=155800&r2=155801
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java Tue Mar  1 08:58:09 2005
@@ -92,7 +92,8 @@
     }
 
     /** {@inheritDoc} */
-    public RemotePropertyDef[] getDeclaredPropertyDefs() throws RemoteException {
+    public RemotePropertyDef[] getDeclaredPropertyDefs()
+            throws RemoteException {
         PropertyDef[] defs = type.getDeclaredPropertyDefs();
         return getRemotePropertyDefArray(defs);
     }



Mime
View raw message