jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r161938 [1/2] - in incubator/jackrabbit/trunk/contrib/jcr-rmi: ./ src/java/org/apache/jackrabbit/rmi/client/ src/java/org/apache/jackrabbit/rmi/iterator/ src/java/org/apache/jackrabbit/rmi/remote/ src/java/org/apache/jackrabbit/rmi/server/ src/test/org/apache/jackrabbit/test/rmi/
Date Tue, 19 Apr 2005 18:01:47 GMT
Author: jukka
Date: Tue Apr 19 11:01:43 2005
New Revision: 161938

URL: http://svn.apache.org/viewcvs?view=rev&rev=161938
Log:
JCR-RMI: Added svn:eol-style properties.

Modified:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItemDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java   (props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java   (contents, props changed)
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/test/org/apache/jackrabbit/test/rmi/RemoteAdapterTest.java   (props changed)

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
            ('svn' removed)

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
            ('svn' removed)

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
            ('svn' removed)

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=161937&r2=161938
==============================================================================
--- 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 Apr 19 11:01:43 2005
@@ -1,106 +1,106 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.Node;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryResult;
-
-import org.apache.jackrabbit.rmi.remote.RemoteQuery;
-
-/**
- * Local adapter for the JCR-RMI
- * {@link RemoteQuery RemoteQuery}
- * inteface. This class makes a remote query locally available using
- * the JCR {@link Query Query} interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Query Query
- * @see org.apache.jackrabbit.rmi.remote.RemoteQuery
- */
-public class ClientQuery extends ClientObject implements Query {
-
-    /** The current session */
-    private Session session;
-
-    /** The adapted remote query manager. */
-    private RemoteQuery remote;
-
-    /**
-     * Creates a client adapter for the given query.
-     *
-     * @param session current session
-     * @param remote remote query
-     * @param factory adapter factory
-     */
-    public ClientQuery(
-            Session session, RemoteQuery remote, LocalAdapterFactory factory) {
-        super(factory);
-        this.session = session;
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public QueryResult execute() throws RepositoryException {
-        try {
-            return getFactory().getQueryResult(session, remote.execute());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getStatement() {
-        try {
-            return remote.getStatement();
-        } catch (RemoteException ex) {
-            throw new RemoteRuntimeException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getLanguage() {
-        try {
-            return remote.getLanguage();
-        } catch (RemoteException ex) {
-            throw new RemoteRuntimeException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getStoredQueryPath() throws RepositoryException {
-        try {
-            return remote.getStoredQueryPath();
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Node storeAsNode(String absPath) throws RepositoryException {
-        try {
-            return getNode(session, remote.storeAsNode(absPath));
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Node;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
+
+import org.apache.jackrabbit.rmi.remote.RemoteQuery;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link RemoteQuery RemoteQuery}
+ * inteface. This class makes a remote query locally available using
+ * the JCR {@link Query Query} interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Query Query
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQuery
+ */
+public class ClientQuery extends ClientObject implements Query {
+
+    /** The current session */
+    private Session session;
+
+    /** The adapted remote query manager. */
+    private RemoteQuery remote;
+
+    /**
+     * Creates a client adapter for the given query.
+     *
+     * @param session current session
+     * @param remote remote query
+     * @param factory adapter factory
+     */
+    public ClientQuery(
+            Session session, RemoteQuery remote, LocalAdapterFactory factory) {
+        super(factory);
+        this.session = session;
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public QueryResult execute() throws RepositoryException {
+        try {
+            return getFactory().getQueryResult(session, remote.execute());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String getStatement() {
+        try {
+            return remote.getStatement();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String getLanguage() {
+        try {
+            return remote.getLanguage();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String getStoredQueryPath() throws RepositoryException {
+        try {
+            return remote.getStoredQueryPath();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Node storeAsNode(String absPath) throws RepositoryException {
+        try {
+            return getNode(session, remote.storeAsNode(absPath));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=161937&r2=161938
==============================================================================
--- 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 Apr 19 11:01:43 2005
@@ -1,93 +1,93 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
-
-import org.apache.jackrabbit.rmi.remote.RemoteQuery;
-import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
-
-/**
- * Local adapter for the JCR-RMI {@link RemoteQueryManager RemoteQueryManager}
- * inteface. This class makes a remote query manager locally available using
- * the JCR {@link QueryManager QueryManager} interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryManager QueryManager
- * @see org.apache.jackrabbit.rmi.remote.RemoteQueryManager
- */
-public class ClientQueryManager extends ClientObject implements QueryManager {
-
-    /** The current session */
-    private Session session;
-
-    /** The adapted remote query manager. */
-    private RemoteQueryManager remote;
-
-    /**
-     * Creates a client adapter for the given remote query manager.
-     *
-     * @param session current session
-     * @param remote remote query manager
-     * @param factory adapter factory
-     */
-    public ClientQueryManager(
-            Session session, RemoteQueryManager remote,
-            LocalAdapterFactory factory) {
-        super(factory);
-        this.session = session;
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public Query createQuery(String statement, String language)
-            throws  RepositoryException {
-        try {
-            RemoteQuery query = remote.createQuery(statement, language);
-            return getFactory().getQuery(session, query);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Query getQuery(Node node) throws RepositoryException {
-        try {
-            // TODO fix this remote node dereferencing hack
-            RemoteQuery query = remote.getQuery(node.getPath());
-            return getFactory().getQuery(session, query);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String[] getSupportedQueryLanguages() {
-        try {
-            return remote.getSupportedQueryLanguages();
-        } catch (RemoteException ex) {
-            throw new RemoteRuntimeException(ex);
-        }
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+
+import org.apache.jackrabbit.rmi.remote.RemoteQuery;
+import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
+
+/**
+ * Local adapter for the JCR-RMI {@link RemoteQueryManager RemoteQueryManager}
+ * inteface. This class makes a remote query manager locally available using
+ * the JCR {@link QueryManager QueryManager} interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryManager QueryManager
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQueryManager
+ */
+public class ClientQueryManager extends ClientObject implements QueryManager {
+
+    /** The current session */
+    private Session session;
+
+    /** The adapted remote query manager. */
+    private RemoteQueryManager remote;
+
+    /**
+     * Creates a client adapter for the given remote query manager.
+     *
+     * @param session current session
+     * @param remote remote query manager
+     * @param factory adapter factory
+     */
+    public ClientQueryManager(
+            Session session, RemoteQueryManager remote,
+            LocalAdapterFactory factory) {
+        super(factory);
+        this.session = session;
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public Query createQuery(String statement, String language)
+            throws  RepositoryException {
+        try {
+            RemoteQuery query = remote.createQuery(statement, language);
+            return getFactory().getQuery(session, query);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Query getQuery(Node node) throws RepositoryException {
+        try {
+            // TODO fix this remote node dereferencing hack
+            RemoteQuery query = remote.getQuery(node.getPath());
+            return getFactory().getQuery(session, query);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String[] getSupportedQueryLanguages() {
+        try {
+            return remote.getSupportedQueryLanguages();
+        } catch (RemoteException ex) {
+            throw new RemoteRuntimeException(ex);
+        }
+    }
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=161937&r2=161938
==============================================================================
--- 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 Apr 19 11:01:43 2005
@@ -1,113 +1,113 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.query.QueryResult;
-import javax.jcr.query.Row;
-import javax.jcr.query.RowIterator;
-
-import org.apache.jackrabbit.rmi.iterator.ArrayNodeIterator;
-import org.apache.jackrabbit.rmi.iterator.ArrayRowIterator;
-import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
-import org.apache.jackrabbit.rmi.remote.RemoteRow;
-
-/**
- * Local adapter for the JCR-RMI
- * {@link RemoteQueryResult RemoteQueryResult}
- * inteface. This class makes a remote query result locally available using
- * the JCR {@link QueryResult QueryResult} interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryResult QueryResult
- * @see org.apache.jackrabbit.rmi.remote.RemoteQueryResult
- */
-public class ClientQueryResult extends ClientObject implements QueryResult {
-
-    /** The current session */
-    private Session session;
-
-    /** The adapted remote query result. */
-    private RemoteQueryResult remote;
-
-    /**
-     * Creates a client adapter for the given remote query result.
-     *
-     * @param session current session
-     * @param remote remote query result
-     * @param factory adapter factory
-     */
-    public ClientQueryResult(
-            Session session, RemoteQueryResult remote,
-            LocalAdapterFactory factory) {
-        super(factory);
-        this.session = session;
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public String[] getColumnNames() throws RepositoryException {
-        try {
-            return remote.getColumnNames();
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RowIterator getRows() throws RepositoryException {
-        try {
-            RemoteRow[] remotes =  remote.getRows();
-            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]);
-            }
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public NodeIterator getNodes() throws RepositoryException {
-        try {
-            RemoteNode[] remotes = remote.getNodes();
-            if (remotes != null) {
-                Node[] nodes = new Node[remotes.length];
-                for (int i = 0; i < nodes.length; i++) {
-                    nodes[i] = getNode(session, remotes[i]);
-                }
-                return new ArrayNodeIterator(nodes);
-            } else {
-                return new ArrayNodeIterator(new Node[0]);
-            }
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.Row;
+import javax.jcr.query.RowIterator;
+
+import org.apache.jackrabbit.rmi.iterator.ArrayNodeIterator;
+import org.apache.jackrabbit.rmi.iterator.ArrayRowIterator;
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
+import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
+import org.apache.jackrabbit.rmi.remote.RemoteRow;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link RemoteQueryResult RemoteQueryResult}
+ * inteface. This class makes a remote query result locally available using
+ * the JCR {@link QueryResult QueryResult} interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryResult QueryResult
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQueryResult
+ */
+public class ClientQueryResult extends ClientObject implements QueryResult {
+
+    /** The current session */
+    private Session session;
+
+    /** The adapted remote query result. */
+    private RemoteQueryResult remote;
+
+    /**
+     * Creates a client adapter for the given remote query result.
+     *
+     * @param session current session
+     * @param remote remote query result
+     * @param factory adapter factory
+     */
+    public ClientQueryResult(
+            Session session, RemoteQueryResult remote,
+            LocalAdapterFactory factory) {
+        super(factory);
+        this.session = session;
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public String[] getColumnNames() throws RepositoryException {
+        try {
+            return remote.getColumnNames();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RowIterator getRows() throws RepositoryException {
+        try {
+            RemoteRow[] remotes =  remote.getRows();
+            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]);
+            }
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public NodeIterator getNodes() throws RepositoryException {
+        try {
+            RemoteNode[] remotes = remote.getNodes();
+            if (remotes != null) {
+                Node[] nodes = new Node[remotes.length];
+                for (int i = 0; i < nodes.length; i++) {
+                    nodes[i] = getNode(session, remotes[i]);
+                }
+                return new ArrayNodeIterator(nodes);
+            } else {
+                return new ArrayNodeIterator(new Node[0]);
+            }
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=161937&r2=161938
==============================================================================
--- 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 Apr 19 11:01:43 2005
@@ -1,67 +1,67 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.query.Row;
-
-import org.apache.jackrabbit.rmi.remote.RemoteRow;
-
-/**
- * Local adapter for the JCR-RMI {@link RemoteRow RemoteRow}
- * inteface. This class makes a remote query row locally available using
- * the JCR {@link Row Row} interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Row Row
- * @see org.apache.jackrabbit.rmi.remote.RemoteRow
- */
-public class ClientRow implements Row {
-
-    /** The remote query row. */
-    private RemoteRow remote;
-
-    /**
-     * Creates a client adapter for the given remote query row.
-     *
-     * @param remote remote query row
-     */
-    public ClientRow(RemoteRow remote) {
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public Value[] getValues() throws RepositoryException {
-        try {
-            return remote.getValues();
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Value getValue(String s) throws RepositoryException {
-        try {
-            return remote.getValue(s);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.query.Row;
+
+import org.apache.jackrabbit.rmi.remote.RemoteRow;
+
+/**
+ * Local adapter for the JCR-RMI {@link RemoteRow RemoteRow}
+ * inteface. This class makes a remote query row locally available using
+ * the JCR {@link Row Row} interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Row Row
+ * @see org.apache.jackrabbit.rmi.remote.RemoteRow
+ */
+public class ClientRow implements Row {
+
+    /** The remote query row. */
+    private RemoteRow remote;
+
+    /**
+     * Creates a client adapter for the given remote query row.
+     *
+     * @param remote remote query row
+     */
+    public ClientRow(RemoteRow remote) {
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public Value[] getValues() throws RepositoryException {
+        try {
+            return remote.getValues();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Value getValue(String s) throws RepositoryException {
+        try {
+            return remote.getValue(s);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java Tue Apr 19 11:01:43 2005
@@ -1,92 +1,92 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-import java.util.Calendar;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionHistory;
-
-import org.apache.jackrabbit.rmi.remote.RemoteVersion;
-
-/**
- * Local adapter for the JCR-RMI
- * {@link org.apache.jackrabbit.rmi.remote.RemoteVersion RemoteVersion}
- * interface. This class makes a remote version locally available using
- * the JCR {@link javax.jcr.version.Version Version} interface.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.Version
- * @see org.apache.jackrabbit.rmi.remote.RemoteVersion
- */
-public class ClientVersion extends ClientNode implements Version {
-
-    /** The adapted remote version. */
-    private RemoteVersion remote;
-
-    /**
-     * Creates a local adapter for the given remote version.
-     *
-     * @param session current session
-     * @param remote  remote version
-     * @param factory local adapter factory
-     */
-    public ClientVersion(Session session, RemoteVersion remote,
-        LocalAdapterFactory factory) {
-        super(session, remote, factory);
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public Calendar getCreated() throws RepositoryException {
-        try {
-            return remote.getCreated();
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Version[] getSuccessors() throws RepositoryException {
-        try {
-            return getVersionArray(getSession(), remote.getSuccessors());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Version[] getPredecessors() throws RepositoryException {
-        try {
-            return getVersionArray(getSession(), remote.getPredecessors());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public VersionHistory getContainingHistory() throws RepositoryException {
-        try {
-            return getFactory().getVersionHistory(getSession(), remote.getContainingHistory());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-   }
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionHistory;
+
+import org.apache.jackrabbit.rmi.remote.RemoteVersion;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteVersion RemoteVersion}
+ * interface. This class makes a remote version locally available using
+ * the JCR {@link javax.jcr.version.Version Version} interface.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.Version
+ * @see org.apache.jackrabbit.rmi.remote.RemoteVersion
+ */
+public class ClientVersion extends ClientNode implements Version {
+
+    /** The adapted remote version. */
+    private RemoteVersion remote;
+
+    /**
+     * Creates a local adapter for the given remote version.
+     *
+     * @param session current session
+     * @param remote  remote version
+     * @param factory local adapter factory
+     */
+    public ClientVersion(Session session, RemoteVersion remote,
+        LocalAdapterFactory factory) {
+        super(session, remote, factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public Calendar getCreated() throws RepositoryException {
+        try {
+            return remote.getCreated();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Version[] getSuccessors() throws RepositoryException {
+        try {
+            return getVersionArray(getSession(), remote.getSuccessors());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Version[] getPredecessors() throws RepositoryException {
+        try {
+            return getVersionArray(getSession(), remote.getPredecessors());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public VersionHistory getContainingHistory() throws RepositoryException {
+        try {
+            return getFactory().getVersionHistory(getSession(), remote.getContainingHistory());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+   }
 }

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java Tue Apr 19 11:01:43 2005
@@ -1,177 +1,177 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.client;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
-import javax.jcr.version.VersionHistory;
-import javax.jcr.version.VersionIterator;
-
-import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
-
-/**
- * Local adapter for the JCR-RMI
- * {@link org.apache.jackrabbit.rmi.remote.RemoteVersionHistory RemoteVersionHistory}
- * interface. This class makes a remote version history locally available using
- * the JCR {@link javax.jcr.version.VersionHistory VersionHistory} interface.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.VersionHistory
- * @see org.apache.jackrabbit.rmi.remote.RemoteVersionHistory
- */
-public class ClientVersionHistory extends ClientNode implements VersionHistory {
-
-    /** The adapted remote version history. */
-    private RemoteVersionHistory remote;
-
-    /**
-     * Creates a local adapter for the given remote version history.
-     *
-     * @param session current session
-     * @param remote  remote version history
-     * @param factory local adapter factory
-     */
-    public ClientVersionHistory(Session session, RemoteVersionHistory remote,
-        LocalAdapterFactory factory) {
-        super(session, remote, factory);
-        this.remote = remote;
-    }
-
-    /** {@inheritDoc} */
-    public Version getRootVersion() throws RepositoryException {
-        try {
-            return getFactory().getVersion(getSession(), remote.getRootVersion());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public VersionIterator getAllVersions() throws RepositoryException {
-        try {
-            return getVersionIterator(getSession(), remote.getAllVersions());
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Version getVersion(String versionName) throws VersionException,
-        RepositoryException {
-        try {
-            return getFactory().getVersion(getSession(), remote.getVersion(versionName));
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Version getVersionByLabel(String label) throws RepositoryException {
-        try {
-            return getFactory().getVersion(getSession(), remote.getVersionByLabel(label));
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void addVersionLabel(String versionName, String label,
-            boolean moveLabel) throws VersionException, RepositoryException {
-        try {
-            remote.addVersionLabel(versionName, label, moveLabel);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void removeVersionLabel(String label)
-            throws VersionException, RepositoryException {
-        try {
-            remote.removeVersionLabel(label);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean hasVersionLabel(String label) throws RepositoryException {
-        try {
-            return remote.hasVersionLabel(label);
-        } catch (RemoteException ex) {
-            // grok the exception and assume label is missing
-            return false;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean hasVersionLabel(Version version, String label)
-            throws VersionException, RepositoryException {
-        try {
-            String versionUUID = version.getUUID();
-            return remote.hasVersionLabel(versionUUID, label);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String[] getVersionLabels() throws RepositoryException {
-        try {
-            return remote.getVersionLabels();
-        } catch (RemoteException ex) {
-            // grok the exception and return an empty array
-            return new String[0];
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String[] getVersionLabels(Version version)
-            throws VersionException, RepositoryException {
-        try {
-            String versionUUID = version.getUUID();
-            return remote.getVersionLabels(versionUUID);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void removeVersion(String versionName)
-            throws UnsupportedRepositoryOperationException, VersionException,
-            RepositoryException {
-        try {
-            remote.removeVersion(versionName);
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getVersionableUUID() throws RepositoryException {
-        try {
-            return remote.getVersionableUUID();
-        } catch (RemoteException ex) {
-            throw new RemoteRepositoryException(ex);
-        }
-    }
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionException;
+import javax.jcr.version.VersionHistory;
+import javax.jcr.version.VersionIterator;
+
+import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteVersionHistory RemoteVersionHistory}
+ * interface. This class makes a remote version history locally available using
+ * the JCR {@link javax.jcr.version.VersionHistory VersionHistory} interface.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.VersionHistory
+ * @see org.apache.jackrabbit.rmi.remote.RemoteVersionHistory
+ */
+public class ClientVersionHistory extends ClientNode implements VersionHistory {
+
+    /** The adapted remote version history. */
+    private RemoteVersionHistory remote;
+
+    /**
+     * Creates a local adapter for the given remote version history.
+     *
+     * @param session current session
+     * @param remote  remote version history
+     * @param factory local adapter factory
+     */
+    public ClientVersionHistory(Session session, RemoteVersionHistory remote,
+        LocalAdapterFactory factory) {
+        super(session, remote, factory);
+        this.remote = remote;
+    }
+
+    /** {@inheritDoc} */
+    public Version getRootVersion() throws RepositoryException {
+        try {
+            return getFactory().getVersion(getSession(), remote.getRootVersion());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public VersionIterator getAllVersions() throws RepositoryException {
+        try {
+            return getVersionIterator(getSession(), remote.getAllVersions());
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Version getVersion(String versionName) throws VersionException,
+        RepositoryException {
+        try {
+            return getFactory().getVersion(getSession(), remote.getVersion(versionName));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public Version getVersionByLabel(String label) throws RepositoryException {
+        try {
+            return getFactory().getVersion(getSession(), remote.getVersionByLabel(label));
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void addVersionLabel(String versionName, String label,
+            boolean moveLabel) throws VersionException, RepositoryException {
+        try {
+            remote.addVersionLabel(versionName, label, moveLabel);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void removeVersionLabel(String label)
+            throws VersionException, RepositoryException {
+        try {
+            remote.removeVersionLabel(label);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public boolean hasVersionLabel(String label) throws RepositoryException {
+        try {
+            return remote.hasVersionLabel(label);
+        } catch (RemoteException ex) {
+            // grok the exception and assume label is missing
+            return false;
+        }
+    }
+
+    /** {@inheritDoc} */
+    public boolean hasVersionLabel(Version version, String label)
+            throws VersionException, RepositoryException {
+        try {
+            String versionUUID = version.getUUID();
+            return remote.hasVersionLabel(versionUUID, label);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String[] getVersionLabels() throws RepositoryException {
+        try {
+            return remote.getVersionLabels();
+        } catch (RemoteException ex) {
+            // grok the exception and return an empty array
+            return new String[0];
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String[] getVersionLabels(Version version)
+            throws VersionException, RepositoryException {
+        try {
+            String versionUUID = version.getUUID();
+            return remote.getVersionLabels(versionUUID);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void removeVersion(String versionName)
+            throws UnsupportedRepositoryOperationException, VersionException,
+            RepositoryException {
+        try {
+            remote.removeVersion(versionName);
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String getVersionableUUID() throws RepositoryException {
+        try {
+            return remote.getVersionableUUID();
+        } catch (RemoteException ex) {
+            throw new RemoteRepositoryException(ex);
+        }
+    }
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java Tue Apr 19 11:01:43 2005
@@ -1,46 +1,46 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.iterator;
-
-import javax.jcr.query.Row;
-import javax.jcr.query.RowIterator;
-
-/**
- * Array implementation of the JCR
- * {@link javax.jcr.query.RowIterator RowIterator} interface.
- * This class is used by the JCR-RMI client adapters to convert
- * node arrays to iterators.
- *
- * @author Philipp Koch
- */
-public class ArrayRowIterator extends ArrayIterator implements RowIterator {
-
-    /**
-     * Creates an iterator for the given array of rows.
-     *
-     * @param rows the rows to iterate
-     */
-    public ArrayRowIterator(Row[] rows) {
-        super(rows);
-    }
-
-    /** {@inheritDoc} */
-    public Row nextRow() {
-        return (Row) next();
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.iterator;
+
+import javax.jcr.query.Row;
+import javax.jcr.query.RowIterator;
+
+/**
+ * Array implementation of the JCR
+ * {@link javax.jcr.query.RowIterator RowIterator} interface.
+ * This class is used by the JCR-RMI client adapters to convert
+ * node arrays to iterators.
+ *
+ * @author Philipp Koch
+ */
+public class ArrayRowIterator extends ArrayIterator implements RowIterator {
+
+    /**
+     * Creates an iterator for the given array of rows.
+     *
+     * @param rows the rows to iterate
+     */
+    public ArrayRowIterator(Row[] rows) {
+        super(rows);
+    }
+
+    /** {@inheritDoc} */
+    public Row nextRow() {
+        return (Row) next();
+    }
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java Tue Apr 19 11:01:43 2005
@@ -1,46 +1,46 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.iterator;
-
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionIterator;
-
-/**
- * Array implementation of the JCR
- * {@link javax.jcr.version.VersionIterator VersionIterator} interface.
- * This class is used by the JCR-RMI client adapters to convert
- * version arrays to iterators.
- *
- * @author Felix Meschberger
- */
-public class ArrayVersionIterator extends ArrayIterator implements VersionIterator {
-
-    /**
-     * Creates an iterator for the given array of nodes.
-     *
-     * @param versions the versions to iterate
-     */
-    public ArrayVersionIterator(Version[] versions) {
-        super(versions);
-    }
-
-    /** {@inheritDoc} */
-    public Version nextVersion() {
-        return (Version) next();
-    }
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.iterator;
+
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionIterator;
+
+/**
+ * Array implementation of the JCR
+ * {@link javax.jcr.version.VersionIterator VersionIterator} interface.
+ * This class is used by the JCR-RMI client adapters to convert
+ * version arrays to iterators.
+ *
+ * @author Felix Meschberger
+ */
+public class ArrayVersionIterator extends ArrayIterator implements VersionIterator {
+
+    /**
+     * Creates an iterator for the given array of nodes.
+     *
+     * @param versions the versions to iterate
+     */
+    public ArrayVersionIterator(Version[] versions) {
+        super(versions);
+    }
+
+    /** {@inheritDoc} */
+    public Version nextVersion() {
+        return (Version) next();
+    }
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayVersionIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
            ('svn' removed)

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
            ('svn' removed)

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
            ('svn' removed)

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java Tue Apr 19 11:01:43 2005
@@ -1,83 +1,83 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.remote;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Remote version of the JCR {@link javax.jcr.query.Query Query} interface.
- * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQuery ServerQuery}
- * and {@link org.apache.jackrabbit.rmi.client.ClientQuery ClientQuery}
- * adapter base classes to provide transparent RMI access to remote items.
- * <p>
- * RMI errors are signalled with RemoteExceptions.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Query
- * @see org.apache.jackrabbit.rmi.client.ClientQuery
- * @see org.apache.jackrabbit.rmi.server.ServerQuery
- */
-public interface RemoteQuery extends Remote {
-
-    /**
-     * @see javax.jcr.query.Query#execute()
-     *
-     * @return a <code>QueryResult</code>
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteQueryResult execute() throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.Query#getStatement()
-     *
-     * @return the query statement.
-     * @throws RemoteException on RMI errors
-     */
-    String getStatement() throws RemoteException;
-
-    /**
-     * @see javax.jcr.query.Query#getLanguage()
-     *
-     * @return the query language.
-     * @throws RemoteException on RMI errors
-     */
-    String getLanguage() throws RemoteException;
-
-    /**
-     * @see javax.jcr.query.Query#getStoredQueryPath()
-     *
-     * @return path of the node representing this query.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    String getStoredQueryPath() throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.Query#storeAsNode(String)
-     *
-     * @param absPath path at which to persist this query.
-     * @return stored node
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteNode storeAsNode(String absPath) throws RepositoryException, RemoteException;
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.query.Query Query} interface.
+ * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQuery ServerQuery}
+ * and {@link org.apache.jackrabbit.rmi.client.ClientQuery ClientQuery}
+ * adapter base classes to provide transparent RMI access to remote items.
+ * <p>
+ * RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Query
+ * @see org.apache.jackrabbit.rmi.client.ClientQuery
+ * @see org.apache.jackrabbit.rmi.server.ServerQuery
+ */
+public interface RemoteQuery extends Remote {
+
+    /**
+     * @see javax.jcr.query.Query#execute()
+     *
+     * @return a <code>QueryResult</code>
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteQueryResult execute() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Query#getStatement()
+     *
+     * @return the query statement.
+     * @throws RemoteException on RMI errors
+     */
+    String getStatement() throws RemoteException;
+
+    /**
+     * @see javax.jcr.query.Query#getLanguage()
+     *
+     * @return the query language.
+     * @throws RemoteException on RMI errors
+     */
+    String getLanguage() throws RemoteException;
+
+    /**
+     * @see javax.jcr.query.Query#getStoredQueryPath()
+     *
+     * @return path of the node representing this query.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    String getStoredQueryPath() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Query#storeAsNode(String)
+     *
+     * @param absPath path at which to persist this query.
+     * @return stored node
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNode storeAsNode(String absPath) throws RepositoryException, RemoteException;
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java Tue Apr 19 11:01:43 2005
@@ -1,71 +1,71 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.remote;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Remote version of the JCR {@link javax.jcr.query.QueryManager QueryManager} interface.
- * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQueryManager ServerQueryManager}
- * and {@link org.apache.jackrabbit.rmi.client.ClientQueryManager ClientQueryManager}
- * adapter base classes to provide transparent RMI access to remote items.
- * <p>
- * RMI errors are signalled with RemoteExceptions.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryManager
- * @see org.apache.jackrabbit.rmi.client.ClientQueryManager
- * @see org.apache.jackrabbit.rmi.server.ServerQueryManager
- */
-public interface RemoteQueryManager extends Remote {
-
-    /**
-     * @see javax.jcr.query.QueryManager#createQuery
-     *
-     * @param statement query statement
-     * @param language query language
-     * @return query
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteQuery createQuery(String statement, String language)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.QueryManager#getQuery
-     *
-     * @param absPath node path of a persisted query (that is, a node of type <code>nt:query</code>).
-     * @return a <code>Query</code> object.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteQuery getQuery(String absPath)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.QueryManager#getSupportedQueryLanguages
-     *
-     * See {@link Query}.
-     * @return An string array.
-     * @throws RemoteException on RMI errors
-     */
-    String[] getSupportedQueryLanguages() throws RemoteException;
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.query.QueryManager QueryManager} interface.
+ * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQueryManager ServerQueryManager}
+ * and {@link org.apache.jackrabbit.rmi.client.ClientQueryManager ClientQueryManager}
+ * adapter base classes to provide transparent RMI access to remote items.
+ * <p>
+ * RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryManager
+ * @see org.apache.jackrabbit.rmi.client.ClientQueryManager
+ * @see org.apache.jackrabbit.rmi.server.ServerQueryManager
+ */
+public interface RemoteQueryManager extends Remote {
+
+    /**
+     * @see javax.jcr.query.QueryManager#createQuery
+     *
+     * @param statement query statement
+     * @param language query language
+     * @return query
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteQuery createQuery(String statement, String language)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.QueryManager#getQuery
+     *
+     * @param absPath node path of a persisted query (that is, a node of type <code>nt:query</code>).
+     * @return a <code>Query</code> object.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteQuery getQuery(String absPath)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.QueryManager#getSupportedQueryLanguages
+     *
+     * See {@link Query}.
+     * @return An string array.
+     * @throws RemoteException on RMI errors
+     */
+    String[] getSupportedQueryLanguages() throws RemoteException;
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java Tue Apr 19 11:01:43 2005
@@ -1,65 +1,65 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.remote;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Remote version of the JCR {@link javax.jcr.query.QueryResult QueryResult} interface.
- * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQueryResult ServerQueryResult}
- * and {@link org.apache.jackrabbit.rmi.client.ClientQueryResult ClientQueryResult}
- * adapter base classes to provide transparent RMI access to remote items.
- * <p>
- * RMI errors are signalled with RemoteExceptions.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryResult
- * @see org.apache.jackrabbit.rmi.client.ClientQueryResult
- * @see org.apache.jackrabbit.rmi.server.ServerQueryResult
- */
-public interface RemoteQueryResult extends Remote {
-    /**
-     * @see javax.jcr.query.QueryResult#getColumnNames()
-     *
-     * @return a <code>PropertyIterator</code>
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    String[] getColumnNames() throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.QueryResult#getRows()
-     *
-     * @return a <code>RowIterator</code>
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteRow[] getRows() throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.QueryResult#getNodes()
-     *
-     * @return a <code>NodeIterator</code>
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteNode[] getNodes() throws RepositoryException, RemoteException;
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.query.QueryResult QueryResult} interface.
+ * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerQueryResult ServerQueryResult}
+ * and {@link org.apache.jackrabbit.rmi.client.ClientQueryResult ClientQueryResult}
+ * adapter base classes to provide transparent RMI access to remote items.
+ * <p>
+ * RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryResult
+ * @see org.apache.jackrabbit.rmi.client.ClientQueryResult
+ * @see org.apache.jackrabbit.rmi.server.ServerQueryResult
+ */
+public interface RemoteQueryResult extends Remote {
+    /**
+     * @see javax.jcr.query.QueryResult#getColumnNames()
+     *
+     * @return a <code>PropertyIterator</code>
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    String[] getColumnNames() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.QueryResult#getRows()
+     *
+     * @return a <code>RowIterator</code>
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteRow[] getRows() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.QueryResult#getNodes()
+     *
+     * @return a <code>NodeIterator</code>
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteNode[] getNodes() throws RepositoryException, RemoteException;
+
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java Tue Apr 19 11:01:43 2005
@@ -1,59 +1,59 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.rmi.remote;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-/**
- * Remote version of the JCR {@link javax.jcr.query.Row Row} interface.
- * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerRow ServerRow}
- * and {@link org.apache.jackrabbit.rmi.client.ClientRow ClientRow}
- * adapter base classes to provide transparent RMI access to remote items.
- * <p>
- * RMI errors are signalled with RemoteExceptions.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Row
- * @see org.apache.jackrabbit.rmi.client.ClientRow
- * @see org.apache.jackrabbit.rmi.server.ServerRow
- */
-public interface RemoteRow extends Remote {
-
-    /**
-     * @see javax.jcr.query.Row#getValues()
-     *
-     * @return row values
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    Value[] getValues() throws RepositoryException, RemoteException;
-
-    /**
-     * @see javax.jcr.query.Row#getValue(String)
-     *
-     * @param propertyName property name
-     * @return identified value
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    Value getValue(String propertyName)
-            throws RepositoryException, RemoteException;
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.query.Row Row} interface.
+ * Used by the  {@link org.apache.jackrabbit.rmi.server.ServerRow ServerRow}
+ * and {@link org.apache.jackrabbit.rmi.client.ClientRow ClientRow}
+ * adapter base classes to provide transparent RMI access to remote items.
+ * <p>
+ * RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Row
+ * @see org.apache.jackrabbit.rmi.client.ClientRow
+ * @see org.apache.jackrabbit.rmi.server.ServerRow
+ */
+public interface RemoteRow extends Remote {
+
+    /**
+     * @see javax.jcr.query.Row#getValues()
+     *
+     * @return row values
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    Value[] getValues() throws RepositoryException, RemoteException;
+
+    /**
+     * @see javax.jcr.query.Row#getValue(String)
+     *
+     * @param propertyName property name
+     * @return identified value
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    Value getValue(String propertyName)
+            throws RepositoryException, RemoteException;
+}

Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message