jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r161938 [2/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
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java Tue Apr 19 11:01:43 2005
@@ -1,100 +1,100 @@
-/*
- * 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.RemoteException;
-import java.util.Calendar;
-
-import javax.jcr.RepositoryException;
-
-
-/**
- * Remote version of the JCR {@link javax.jcr.version.Version Version} interface.
- * Used by the {@link org.apache.jackrabbit.rmi.server.ServerVersion ServerVersion}
- * and {@link org.apache.jackrabbit.rmi.client.ClientVersion ClientVersion}
- * adapters to provide transparent RMI access to remote versions.
- * <p>
- * The methods in this interface are documented only with a reference
- * to a corresponding Version method. The remote object will simply forward
- * the method call to the underlying Version instance. Argument and return
- * values, as well as possible exceptions, are copied over the network.
- * Complex return values (like Versions) are returned as remote
- * references to the corresponding remote interfaces. Iterator values
- * are transmitted as object arrays. RMI errors are signalled with
- * RemoteExceptions.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.Version
- * @see org.apache.jackrabbit.rmi.client.ClientVersion
- * @see org.apache.jackrabbit.rmi.server.ServerVersion
- */
-public interface RemoteVersion extends RemoteNode {
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.Version#getContainingHistory() Version.getContainingHistory()} method.
-     *
-     * @return a <code>RemoteVersionHistory</code> object.
-     *
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-//     RemoteVersionHistory getContainingHistory() throws RepositoryException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.Version#getCreated() Version.getCreated()} method.
-     *
-     * @return a <code>Calendar</code> object.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    Calendar getCreated() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.Version#getSuccessors() Version.getSuccessors()} method.
-     *
-     * @return a <code>RemoteVersion</code> array.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.Version#getPredecessors() Version.getPredecessors()} method.
-     *
-     * @return a <code>RemoteVersion</code> array.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.Version#getContainingHistory()} Version.getContainingHistory()} method.
-     *
-     * @return a <code>RemoteVersionHistory</code>.
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersionHistory getContainingHistory() 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.RemoteException;
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Remote version of the JCR {@link javax.jcr.version.Version Version} interface.
+ * Used by the {@link org.apache.jackrabbit.rmi.server.ServerVersion ServerVersion}
+ * and {@link org.apache.jackrabbit.rmi.client.ClientVersion ClientVersion}
+ * adapters to provide transparent RMI access to remote versions.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding Version method. The remote object will simply forward
+ * the method call to the underlying Version instance. Argument and return
+ * values, as well as possible exceptions, are copied over the network.
+ * Complex return values (like Versions) are returned as remote
+ * references to the corresponding remote interfaces. Iterator values
+ * are transmitted as object arrays. RMI errors are signalled with
+ * RemoteExceptions.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.Version
+ * @see org.apache.jackrabbit.rmi.client.ClientVersion
+ * @see org.apache.jackrabbit.rmi.server.ServerVersion
+ */
+public interface RemoteVersion extends RemoteNode {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.Version#getContainingHistory() Version.getContainingHistory()} method.
+     *
+     * @return a <code>RemoteVersionHistory</code> object.
+     *
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+//     RemoteVersionHistory getContainingHistory() throws RepositoryException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.Version#getCreated() Version.getCreated()} method.
+     *
+     * @return a <code>Calendar</code> object.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    Calendar getCreated() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.Version#getSuccessors() Version.getSuccessors()} method.
+     *
+     * @return a <code>RemoteVersion</code> array.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.Version#getPredecessors() Version.getPredecessors()} method.
+     *
+     * @return a <code>RemoteVersion</code> array.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.Version#getContainingHistory()} Version.getContainingHistory()} method.
+     *
+     * @return a <code>RemoteVersionHistory</code>.
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersionHistory getContainingHistory() throws RepositoryException, RemoteException;
+
+
+
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java Tue Apr 19 11:01:43 2005
@@ -1,212 +1,212 @@
-/*
- * 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.RemoteException;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Remote version of the JC
- * {@link javax.jcr.version.VersionHistory VersionHistory} interface. Used by
- * the
- * {@link org.apache.jackrabbit.rmi.server.ServerVersionHistory ServerVersionHistory}
- * and
- * {@link org.apache.jackrabbit.rmi.client.ClientVersionHistory ClientVersionHistory}
- * adapters to provide transparent RMI access to remote version histories.
- * <p>
- * The methods in this interface are documented only with a reference
- * to a corresponding VersionHistory method. The remote object will simply
- * forward the method call to the underlying VersionHistory instance. Argument
- * and return values, as well as possible exceptions, are copied over the
- * network. Complex return values (like Versions) are returned as remote
- * references to the corresponding remote interfaces. Iterator values
- * are transmitted as object arrays. RMI errors are signalled with
- * RemoteExceptions.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.Version
- * @see org.apache.jackrabbit.rmi.client.ClientVersionHistory
- * @see org.apache.jackrabbit.rmi.server.ServerVersionHistory
- */
-public interface RemoteVersionHistory extends RemoteNode {
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersionableUUID() VersionHistory.getVersionableUUID()}
-     * method.
-     *
-     * @return the UUID of the versionable node for which this is the version history.
-     * @throws RepositoryException if an error occurs.
-     * @throws RemoteException on RMI errors
-     */
-//    String getVersionableUUID() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getRootVersion() VersionHistory.getRootVersion()}
-     * method.
-     *
-     * @return a <code>Version</code> object.
-     * @throws RepositoryException if an error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion getRootVersion() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getAllVersions() VersionHistory.getAllVersions()}
-     * method.
-     *
-     * @return a <code>VersionIterator</code> object.
-     * @throws RepositoryException if an error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion[] getAllVersions()
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersion(String) VersionHistory.getVersion(String)}
-     * method.
-     *
-     * @param versionName a version name
-     * @return a <code>Version</code> object.
-     * @throws RepositoryException if an error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion getVersion(String versionName)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersionByLabel(String) VersionHistory.getVersionByLabel(String)}
-     * method.
-     *
-     * @param label a version label
-     * @return a <code>Version</code> object.
-     * @throws RepositoryException if an error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    RemoteVersion getVersionByLabel(String label)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#addVersionLabel(String, String, boolean)
-     * VersionHistory.addVersionLabel(String, String, boolean)}
-     * method.
-     *
-     * @param versionName the name of the version to which the label is to be added.
-     * @param label the label to be added.
-     * @param moveLabel if <code>true</code>, then if <code>label</code> is already assigned to a version in
-     * this version history, it is moved to the new version specified; if <code>false</code>, then attempting
-     * to assign an already used label will throw a <code>VersionException</code>.
-     *
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    void addVersionLabel(String versionName, String label, boolean moveLabel)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#removeVersionLabel(String) VersionHistory.removeVersionLabel(String)}
-     * method.
-     *
-     * @param label a version label
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    void removeVersionLabel(String label)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#hasVersionLabel(String) VersionHistory.hasVersionLabel(String)}
-     * method.
-     *
-     * @param label a version label
-     * @return a <code>boolean</code>
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    boolean hasVersionLabel(String label) throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#hasVersionLabel(javax.jcr.version.Version, String) hasVersionLabel(Version, String)}
-     * method.
-     *
-     * @param versionUUID The UUID of the version whose labels are to be returned.
-     * @param label a version label
-     * @return a <code>boolean</code>.
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    boolean hasVersionLabel(String versionUUID, String label)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersionLabels() VersionHistory.getVersionLabels()}
-     * method.
-     *
-     * @return a <code>String</code> array containing all the labels of the version history
-     * @throws RepositoryException on repository errors
-     * @throws RemoteException on RMI errors
-     */
-    String[] getVersionLabels() throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersionLabels(javax.jcr.version.Version) VersionHistory.getVersionLabels(Version)}
-     * method.
-     *
-     * @param versionUUID The UUID of the version whose labels are to be returned.
-     * @return a <code>String</code> array containing all the labels of the given version
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    String[] getVersionLabels(String versionUUID)
-            throws RepositoryException, RemoteException;
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#removeVersion(String) VersionHistory.removeVersion(String)}
-     * method.
-     *
-     * @param versionName the name of a version in this version history.
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    void removeVersion(String versionName)
-            throws RepositoryException, RemoteException;
-
-
-    /**
-     * Remote version of the
-     * {@link javax.jcr.version.VersionHistory#getVersionableUUID()}  VersionHistory.getVersionableUUID()}
-     * method.
-     *
-     * @return the uuid of the versionable node
-     * @throws RepositoryException if another error occurs.
-     * @throws RemoteException on RMI errors
-     */
-    String getVersionableUUID() 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.RemoteException;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Remote version of the JC
+ * {@link javax.jcr.version.VersionHistory VersionHistory} interface. Used by
+ * the
+ * {@link org.apache.jackrabbit.rmi.server.ServerVersionHistory ServerVersionHistory}
+ * and
+ * {@link org.apache.jackrabbit.rmi.client.ClientVersionHistory ClientVersionHistory}
+ * adapters to provide transparent RMI access to remote version histories.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding VersionHistory method. The remote object will simply
+ * forward the method call to the underlying VersionHistory instance. Argument
+ * and return values, as well as possible exceptions, are copied over the
+ * network. Complex return values (like Versions) are returned as remote
+ * references to the corresponding remote interfaces. Iterator values
+ * are transmitted as object arrays. RMI errors are signalled with
+ * RemoteExceptions.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.Version
+ * @see org.apache.jackrabbit.rmi.client.ClientVersionHistory
+ * @see org.apache.jackrabbit.rmi.server.ServerVersionHistory
+ */
+public interface RemoteVersionHistory extends RemoteNode {
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersionableUUID() VersionHistory.getVersionableUUID()}
+     * method.
+     *
+     * @return the UUID of the versionable node for which this is the version history.
+     * @throws RepositoryException if an error occurs.
+     * @throws RemoteException on RMI errors
+     */
+//    String getVersionableUUID() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getRootVersion() VersionHistory.getRootVersion()}
+     * method.
+     *
+     * @return a <code>Version</code> object.
+     * @throws RepositoryException if an error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion getRootVersion() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getAllVersions() VersionHistory.getAllVersions()}
+     * method.
+     *
+     * @return a <code>VersionIterator</code> object.
+     * @throws RepositoryException if an error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion[] getAllVersions()
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersion(String) VersionHistory.getVersion(String)}
+     * method.
+     *
+     * @param versionName a version name
+     * @return a <code>Version</code> object.
+     * @throws RepositoryException if an error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion getVersion(String versionName)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersionByLabel(String) VersionHistory.getVersionByLabel(String)}
+     * method.
+     *
+     * @param label a version label
+     * @return a <code>Version</code> object.
+     * @throws RepositoryException if an error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    RemoteVersion getVersionByLabel(String label)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#addVersionLabel(String, String, boolean)
+     * VersionHistory.addVersionLabel(String, String, boolean)}
+     * method.
+     *
+     * @param versionName the name of the version to which the label is to be added.
+     * @param label the label to be added.
+     * @param moveLabel if <code>true</code>, then if <code>label</code> is already assigned to a version in
+     * this version history, it is moved to the new version specified; if <code>false</code>, then attempting
+     * to assign an already used label will throw a <code>VersionException</code>.
+     *
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    void addVersionLabel(String versionName, String label, boolean moveLabel)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#removeVersionLabel(String) VersionHistory.removeVersionLabel(String)}
+     * method.
+     *
+     * @param label a version label
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    void removeVersionLabel(String label)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#hasVersionLabel(String) VersionHistory.hasVersionLabel(String)}
+     * method.
+     *
+     * @param label a version label
+     * @return a <code>boolean</code>
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    boolean hasVersionLabel(String label) throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#hasVersionLabel(javax.jcr.version.Version, String) hasVersionLabel(Version, String)}
+     * method.
+     *
+     * @param versionUUID The UUID of the version whose labels are to be returned.
+     * @param label a version label
+     * @return a <code>boolean</code>.
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    boolean hasVersionLabel(String versionUUID, String label)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersionLabels() VersionHistory.getVersionLabels()}
+     * method.
+     *
+     * @return a <code>String</code> array containing all the labels of the version history
+     * @throws RepositoryException on repository errors
+     * @throws RemoteException on RMI errors
+     */
+    String[] getVersionLabels() throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersionLabels(javax.jcr.version.Version) VersionHistory.getVersionLabels(Version)}
+     * method.
+     *
+     * @param versionUUID The UUID of the version whose labels are to be returned.
+     * @return a <code>String</code> array containing all the labels of the given version
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    String[] getVersionLabels(String versionUUID)
+            throws RepositoryException, RemoteException;
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#removeVersion(String) VersionHistory.removeVersion(String)}
+     * method.
+     *
+     * @param versionName the name of a version in this version history.
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    void removeVersion(String versionName)
+            throws RepositoryException, RemoteException;
+
+
+    /**
+     * Remote version of the
+     * {@link javax.jcr.version.VersionHistory#getVersionableUUID()}  VersionHistory.getVersionableUUID()}
+     * method.
+     *
+     * @return the uuid of the versionable node
+     * @throws RepositoryException if another error occurs.
+     * @throws RemoteException on RMI errors
+     */
+    String getVersionableUUID() throws RepositoryException, RemoteException;
+
+}

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

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

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

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java Tue Apr 19 11:01:43 2005
@@ -1,84 +1,84 @@
-/*
- * 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.server;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.query.Query;
-
-import org.apache.jackrabbit.rmi.remote.RemoteQuery;
-import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
-import org.apache.jackrabbit.rmi.remote.RemoteNode;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.query.Query Query} interface.
- * This class makes a local session available as an RMI service using the
- * {@link org.apache.jackrabbit.rmi.remote.RemoteQuery RemoteQuery}
- * interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Query
- * @see org.apache.jackrabbit.rmi.remote.RemoteQuery
- */
-public class ServerQuery extends ServerObject implements RemoteQuery {
-
-    /** The adapted local query manager. */
-    private Query query;
-
-    /**
-     * Creates a remote adapter for the given local <code>Query</code>.
-     *
-     * @param query local <code>Query</code>
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerQuery(Query query, RemoteAdapterFactory factory)
-            throws RemoteException {
-        super(factory);
-        this.query = query;
-    }
-
-    /** {@inheritDoc} */
-    public RemoteQueryResult execute()
-            throws RepositoryException, RemoteException {
-        return new ServerQueryResult(query.execute(), getFactory());
-    }
-
-    /** {@inheritDoc} */
-    public String getStatement() throws RemoteException {
-        return query.getStatement();
-    }
-
-    /** {@inheritDoc} */
-    public String getLanguage() throws RemoteException {
-        return query.getLanguage();
-    }
-
-    /** {@inheritDoc} */
-    public String getStoredQueryPath()
-            throws RepositoryException, RemoteException {
-        return query.getStoredQueryPath();
-    }
-
-    /** {@inheritDoc} */
-    public RemoteNode storeAsNode(String absPath)
-            throws RepositoryException, RemoteException {
-        return getRemoteNode(query.storeAsNode(absPath));
-    }
-
-}
+/*
+ * 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.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+
+import org.apache.jackrabbit.rmi.remote.RemoteQuery;
+import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.query.Query Query} interface.
+ * This class makes a local session available as an RMI service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteQuery RemoteQuery}
+ * interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Query
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQuery
+ */
+public class ServerQuery extends ServerObject implements RemoteQuery {
+
+    /** The adapted local query manager. */
+    private Query query;
+
+    /**
+     * Creates a remote adapter for the given local <code>Query</code>.
+     *
+     * @param query local <code>Query</code>
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerQuery(Query query, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.query = query;
+    }
+
+    /** {@inheritDoc} */
+    public RemoteQueryResult execute()
+            throws RepositoryException, RemoteException {
+        return new ServerQueryResult(query.execute(), getFactory());
+    }
+
+    /** {@inheritDoc} */
+    public String getStatement() throws RemoteException {
+        return query.getStatement();
+    }
+
+    /** {@inheritDoc} */
+    public String getLanguage() throws RemoteException {
+        return query.getLanguage();
+    }
+
+    /** {@inheritDoc} */
+    public String getStoredQueryPath()
+            throws RepositoryException, RemoteException {
+        return query.getStoredQueryPath();
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNode storeAsNode(String absPath)
+            throws RepositoryException, RemoteException {
+        return getRemoteNode(query.storeAsNode(absPath));
+    }
+
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java Tue Apr 19 11:01:43 2005
@@ -1,87 +1,87 @@
-/*
- * 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.server;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
-
-import org.apache.jackrabbit.rmi.remote.RemoteQuery;
-import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.query.QueryManager QueryManager}
- * interface. This class makes a local query manager available as an RMI
- * service using the
- * {@link org.apache.jackrabbit.rmi.remote.RemoteQueryManager RemoteQueryManager}
- * interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryManager
- * @see org.apache.jackrabbit.rmi.remote.RemoteQueryManager
- */
-public class ServerQueryManager extends ServerObject
-        implements RemoteQueryManager {
-
-    /** The adapted local query manager. */
-    private QueryManager manager;
-
-    /**
-     * Creates a remote adapter for the given local query manager.
-     *
-     * @param manager local query manager
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerQueryManager(
-            QueryManager manager, ServerAdapterFactory factory)
-            throws RemoteException {
-        super(factory);
-        this.manager = manager;
-    }
-
-    /** {@inheritDoc} */
-    public RemoteQuery createQuery(String statement, String language)
-            throws RepositoryException, RemoteException {
-        try {
-            Query query = manager.createQuery(statement, language);
-            return getFactory().getRemoteQuery(query);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteQuery getQuery(String absPath)
-            throws RepositoryException, RemoteException {
-        try {
-            Node node = null; // TODO
-            return getFactory().getRemoteQuery(manager.getQuery(node));
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String[] getSupportedQueryLanguages() throws RemoteException {
-        return manager.getSupportedQueryLanguages();
-    }
-
-}
+/*
+ * 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.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+
+import org.apache.jackrabbit.rmi.remote.RemoteQuery;
+import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.query.QueryManager QueryManager}
+ * interface. This class makes a local query manager available as an RMI
+ * service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteQueryManager RemoteQueryManager}
+ * interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryManager
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQueryManager
+ */
+public class ServerQueryManager extends ServerObject
+        implements RemoteQueryManager {
+
+    /** The adapted local query manager. */
+    private QueryManager manager;
+
+    /**
+     * Creates a remote adapter for the given local query manager.
+     *
+     * @param manager local query manager
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerQueryManager(
+            QueryManager manager, ServerAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.manager = manager;
+    }
+
+    /** {@inheritDoc} */
+    public RemoteQuery createQuery(String statement, String language)
+            throws RepositoryException, RemoteException {
+        try {
+            Query query = manager.createQuery(statement, language);
+            return getFactory().getRemoteQuery(query);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteQuery getQuery(String absPath)
+            throws RepositoryException, RemoteException {
+        try {
+            Node node = null; // TODO
+            return getFactory().getRemoteQuery(manager.getQuery(node));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String[] getSupportedQueryLanguages() throws RemoteException {
+        return manager.getSupportedQueryLanguages();
+    }
+
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.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.server;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-import javax.jcr.query.QueryResult;
-import javax.jcr.query.RowIterator;
-
-import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
-import org.apache.jackrabbit.rmi.remote.RemoteRow;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.query.QueryResult QueryResult} interface.
- * This class makes a local session available as an RMI service using the
- * {@link org.apache.jackrabbit.rmi.remote.RemoteQueryResult RemoteQueryResult}
- * interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.QueryResult
- * @see org.apache.jackrabbit.rmi.remote.RemoteQueryResult
- */
-public class ServerQueryResult extends ServerObject
-        implements RemoteQueryResult {
-
-    /** The adapted local query result. */
-    private QueryResult result;
-
-    /**
-     * Creates a remote adapter for the given local <code>QueryResult</code>.
-     *
-     * @param result local <code>QueryResult</code>
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerQueryResult(QueryResult result, RemoteAdapterFactory factory)
-            throws RemoteException {
-        super(factory);
-        this.result = result;
-    }
-
-    /** {@inheritDoc} */
-    public String[] getColumnNames()
-            throws RepositoryException, RemoteException {
-        return result.getColumnNames();
-    }
-
-    /** {@inheritDoc} */
-    public RemoteRow[] getRows() throws RepositoryException, RemoteException {
-        RowIterator iterator = result.getRows();
-        if (iterator != null) {
-            RemoteRow[] remotes = new RemoteRow[(int) iterator.getSize()];
-            for (int i = 0; iterator.hasNext(); i++) {
-                remotes[i] = getFactory().getRemoteRow(iterator.nextRow());
-            }
-            return remotes;
-        } else {
-            return new RemoteRow[0]; // for safety
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteNode[] getNodes() throws RepositoryException, RemoteException {
-        NodeIterator iterator = result.getNodes();
-        if (iterator != null) {
-            RemoteNode[] remotes = new RemoteNode[(int) iterator.getSize()];
-            for (int i = 0; iterator.hasNext(); i++) {
-                remotes[i] = getRemoteNode(iterator.nextNode());
-            }
-            return remotes;
-        } else {
-            return new RemoteNode[0]; // for safety
-        }
-    }
-
-}
+/*
+ * 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.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.RowIterator;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNode;
+import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
+import org.apache.jackrabbit.rmi.remote.RemoteRow;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.query.QueryResult QueryResult} interface.
+ * This class makes a local session available as an RMI service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteQueryResult RemoteQueryResult}
+ * interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.QueryResult
+ * @see org.apache.jackrabbit.rmi.remote.RemoteQueryResult
+ */
+public class ServerQueryResult extends ServerObject
+        implements RemoteQueryResult {
+
+    /** The adapted local query result. */
+    private QueryResult result;
+
+    /**
+     * Creates a remote adapter for the given local <code>QueryResult</code>.
+     *
+     * @param result local <code>QueryResult</code>
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerQueryResult(QueryResult result, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.result = result;
+    }
+
+    /** {@inheritDoc} */
+    public String[] getColumnNames()
+            throws RepositoryException, RemoteException {
+        return result.getColumnNames();
+    }
+
+    /** {@inheritDoc} */
+    public RemoteRow[] getRows() throws RepositoryException, RemoteException {
+        RowIterator iterator = result.getRows();
+        if (iterator != null) {
+            RemoteRow[] remotes = new RemoteRow[(int) iterator.getSize()];
+            for (int i = 0; iterator.hasNext(); i++) {
+                remotes[i] = getFactory().getRemoteRow(iterator.nextRow());
+            }
+            return remotes;
+        } else {
+            return new RemoteRow[0]; // for safety
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteNode[] getNodes() throws RepositoryException, RemoteException {
+        NodeIterator iterator = result.getNodes();
+        if (iterator != null) {
+            RemoteNode[] remotes = new RemoteNode[(int) iterator.getSize()];
+            for (int i = 0; iterator.hasNext(); i++) {
+                remotes[i] = getRemoteNode(iterator.nextNode());
+            }
+            return remotes;
+        } else {
+            return new RemoteNode[0]; // for safety
+        }
+    }
+
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java Tue Apr 19 11:01:43 2005
@@ -1,66 +1,66 @@
-/*
- * 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.server;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.query.Row;
-
-import org.apache.jackrabbit.rmi.remote.RemoteRow;
-import org.apache.jackrabbit.rmi.remote.SerialValue;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.query.Row Row} interface.
- * This class makes a local session available as an RMI service using the
- * {@link org.apache.jackrabbit.rmi.remote.RemoteRow RemoteRow}
- * interface.
- *
- * @author Philipp Koch
- * @see javax.jcr.query.Row
- * @see org.apache.jackrabbit.rmi.remote.RemoteRow
- */
-public class ServerRow extends ServerObject implements RemoteRow {
-
-    /** The adapted local row. */
-    private Row row;
-
-    /**
-     * Creates a remote adapter for the given local query row.
-     *
-     * @param row local query row
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerRow(Row row, RemoteAdapterFactory factory)
-            throws RemoteException {
-        super(factory);
-        this.row = row;
-    }
-
-    /** {@inheritDoc} */
-    public Value[] getValues() throws RepositoryException, RemoteException {
-        return row.getValues();
-    }
-
-    /** {@inheritDoc} */
-    public Value getValue(String propertyName)
-            throws RepositoryException, RemoteException {
-        return new SerialValue(row.getValue(propertyName));
-    }
-}
+/*
+ * 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.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.query.Row;
+
+import org.apache.jackrabbit.rmi.remote.RemoteRow;
+import org.apache.jackrabbit.rmi.remote.SerialValue;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.query.Row Row} interface.
+ * This class makes a local session available as an RMI service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteRow RemoteRow}
+ * interface.
+ *
+ * @author Philipp Koch
+ * @see javax.jcr.query.Row
+ * @see org.apache.jackrabbit.rmi.remote.RemoteRow
+ */
+public class ServerRow extends ServerObject implements RemoteRow {
+
+    /** The adapted local row. */
+    private Row row;
+
+    /**
+     * Creates a remote adapter for the given local query row.
+     *
+     * @param row local query row
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerRow(Row row, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(factory);
+        this.row = row;
+    }
+
+    /** {@inheritDoc} */
+    public Value[] getValues() throws RepositoryException, RemoteException {
+        return row.getValues();
+    }
+
+    /** {@inheritDoc} */
+    public Value getValue(String propertyName)
+            throws RepositoryException, RemoteException {
+        return new SerialValue(row.getValue(propertyName));
+    }
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java Tue Apr 19 11:01:43 2005
@@ -1,101 +1,101 @@
-/*
- * 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.server;
-
-import java.rmi.RemoteException;
-import java.util.Calendar;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.version.Version;
-
-import org.apache.jackrabbit.rmi.remote.RemoteVersion;
-import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.version.Version Version} interface.
- * This class makes a local version available as an RMI service using
- * the {@link org.apache.jackrabbit.rmi.remote.RemoteVersion RemoteVersion}
- * interface.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.Version
- * @see org.apache.jackrabbit.rmi.remote.RemoteVersion
- */
-public class ServerVersion extends ServerNode implements RemoteVersion {
-
-    /** The adapted local version. */
-    private Version version;
-
-    /**
-     * Creates a remote adapter for the given local version.
-     *
-     * @param version local version
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerVersion(Version version, RemoteAdapterFactory factory)
-            throws RemoteException {
-        super(version, factory);
-        this.version = version;
-    }
-
-//  This is only available after 0.16.2
-//    /** {@inheritDoc} */
-//    public RemoteVersionHistory getContainingHistory() throws RepositoryException {
-//        try {
-//            return getFactory().getRemoteVersionHistory(version.getContainingHistory());
-//        } catch (RepositoryException ex) {
-//            throw getRepositoryException(ex);
-//        }
-//    }
-
-    /** {@inheritDoc} */
-    public Calendar getCreated() throws RepositoryException {
-        try {
-            return version.getCreated();
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException {
-        try {
-            return getRemoteVersionArray(version.getSuccessors());
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException {
-        try {
-            return getRemoteVersionArray(version.getPredecessors());
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersionHistory getContainingHistory() throws RepositoryException, RemoteException {
-        try {
-            return getFactory().getRemoteVersionHistory(version.getContainingHistory());
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(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.server;
+
+import java.rmi.RemoteException;
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.version.Version;
+
+import org.apache.jackrabbit.rmi.remote.RemoteVersion;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.version.Version Version} interface.
+ * This class makes a local version available as an RMI service using
+ * the {@link org.apache.jackrabbit.rmi.remote.RemoteVersion RemoteVersion}
+ * interface.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.Version
+ * @see org.apache.jackrabbit.rmi.remote.RemoteVersion
+ */
+public class ServerVersion extends ServerNode implements RemoteVersion {
+
+    /** The adapted local version. */
+    private Version version;
+
+    /**
+     * Creates a remote adapter for the given local version.
+     *
+     * @param version local version
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerVersion(Version version, RemoteAdapterFactory factory)
+            throws RemoteException {
+        super(version, factory);
+        this.version = version;
+    }
+
+//  This is only available after 0.16.2
+//    /** {@inheritDoc} */
+//    public RemoteVersionHistory getContainingHistory() throws RepositoryException {
+//        try {
+//            return getFactory().getRemoteVersionHistory(version.getContainingHistory());
+//        } catch (RepositoryException ex) {
+//            throw getRepositoryException(ex);
+//        }
+//    }
+
+    /** {@inheritDoc} */
+    public Calendar getCreated() throws RepositoryException {
+        try {
+            return version.getCreated();
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion[] getSuccessors() throws RepositoryException, RemoteException {
+        try {
+            return getRemoteVersionArray(version.getSuccessors());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException {
+        try {
+            return getRemoteVersionArray(version.getPredecessors());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersionHistory getContainingHistory() throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersionHistory(version.getContainingHistory());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+}

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

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java?view=diff&r1=161937&r2=161938
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java Tue Apr 19 11:01:43 2005
@@ -1,179 +1,179 @@
-/*
- * 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.server;
-
-import java.rmi.RemoteException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionHistory;
-
-import org.apache.jackrabbit.rmi.remote.RemoteVersion;
-import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
-
-/**
- * Remote adapter for the JCR {@link javax.jcr.version.VersionHistory VersionHistory}
- * interface. This class makes a local version history available as an RMI
- * service using the
- * {@link org.apache.jackrabbit.rmi.remote.RemoteVersionHistory RemoteVersionHistory}
- * interface.
- *
- * @author Felix Meschberger
- * @see javax.jcr.version.VersionHistory
- * @see org.apache.jackrabbit.rmi.remote.RemoteVersionHistory
- */
-public class ServerVersionHistory extends ServerNode
-        implements RemoteVersionHistory {
-
-    /** The adapted local version history. */
-    private VersionHistory versionHistory;
-
-    /**
-     * Creates a remote adapter for the given local version history.
-     *
-     * @param versionHistory local version history
-     * @param factory remote adapter factory
-     * @throws RemoteException on RMI errors
-     */
-    public ServerVersionHistory(VersionHistory versionHistory,
-            RemoteAdapterFactory factory) throws RemoteException {
-        super(versionHistory, factory);
-        this.versionHistory = versionHistory;
-    }
-
-    /** {@inheritDoc} */
-//    public String getVersionableUUID()
-//            throws RepositoryException, RemoteException {
-//        try {
-//            return versionHistory.getVersionableUUID();
-//        } catch (RepositoryException ex) {
-//            throw getRepositoryException(ex);
-//        }
-//    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion getRootVersion()
-            throws RepositoryException, RemoteException {
-        try {
-            return getFactory().getRemoteVersion(versionHistory.getRootVersion());
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion[] getAllVersions()
-            throws RepositoryException, RemoteException {
-        try {
-            return getRemoteVersionArray(versionHistory.getAllVersions());
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion getVersion(String versionName)
-        throws RepositoryException, RemoteException {
-        try {
-            Version version = versionHistory.getVersion(versionName);
-            return getFactory().getRemoteVersion(version);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RemoteVersion getVersionByLabel(String label)
-            throws RepositoryException, RemoteException {
-        try {
-            Version version = versionHistory.getVersionByLabel(label);
-            return getFactory().getRemoteVersion(version);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void addVersionLabel(String versionName, String label,
-            boolean moveLabel) throws RepositoryException, RemoteException {
-        try {
-            versionHistory.addVersionLabel(versionName, label, moveLabel);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void removeVersionLabel(String label) throws RepositoryException,
-        RemoteException {
-        try {
-            versionHistory.removeVersionLabel(label);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean hasVersionLabel(String label) throws RepositoryException, RemoteException {
-        return versionHistory.hasVersionLabel(label);
-    }
-
-    /** {@inheritDoc} */
-    public boolean hasVersionLabel(String versionUUID, String label)
-        throws RepositoryException, RemoteException {
-        try {
-            Version version = getVersionByUUID(versionUUID);
-            return versionHistory.hasVersionLabel(version, label);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String[] getVersionLabels() throws RepositoryException, RemoteException {
-        return versionHistory.getVersionLabels();
-    }
-
-    /** {@inheritDoc} */
-    public String[] getVersionLabels(String versionUUID)
-            throws RepositoryException, RemoteException {
-        try {
-            Version version = getVersionByUUID(versionUUID);
-            return versionHistory.getVersionLabels(version);
-        } catch (ClassCastException cce) {
-            // we do not expect this here as nodes should be returned correctly
-            throw getRepositoryException(new RepositoryException(cce));
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void removeVersion(String versionName)
-            throws RepositoryException, RemoteException {
-        try {
-            versionHistory.removeVersion(versionName);
-        } catch (RepositoryException ex) {
-            throw getRepositoryException(ex);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getVersionableUUID() throws RepositoryException, RemoteException {
-        return versionHistory.getVersionableUUID();
-    }
-}
+/*
+ * 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.server;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionHistory;
+
+import org.apache.jackrabbit.rmi.remote.RemoteVersion;
+import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
+
+/**
+ * Remote adapter for the JCR {@link javax.jcr.version.VersionHistory VersionHistory}
+ * interface. This class makes a local version history available as an RMI
+ * service using the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteVersionHistory RemoteVersionHistory}
+ * interface.
+ *
+ * @author Felix Meschberger
+ * @see javax.jcr.version.VersionHistory
+ * @see org.apache.jackrabbit.rmi.remote.RemoteVersionHistory
+ */
+public class ServerVersionHistory extends ServerNode
+        implements RemoteVersionHistory {
+
+    /** The adapted local version history. */
+    private VersionHistory versionHistory;
+
+    /**
+     * Creates a remote adapter for the given local version history.
+     *
+     * @param versionHistory local version history
+     * @param factory remote adapter factory
+     * @throws RemoteException on RMI errors
+     */
+    public ServerVersionHistory(VersionHistory versionHistory,
+            RemoteAdapterFactory factory) throws RemoteException {
+        super(versionHistory, factory);
+        this.versionHistory = versionHistory;
+    }
+
+    /** {@inheritDoc} */
+//    public String getVersionableUUID()
+//            throws RepositoryException, RemoteException {
+//        try {
+//            return versionHistory.getVersionableUUID();
+//        } catch (RepositoryException ex) {
+//            throw getRepositoryException(ex);
+//        }
+//    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion getRootVersion()
+            throws RepositoryException, RemoteException {
+        try {
+            return getFactory().getRemoteVersion(versionHistory.getRootVersion());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion[] getAllVersions()
+            throws RepositoryException, RemoteException {
+        try {
+            return getRemoteVersionArray(versionHistory.getAllVersions());
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion getVersion(String versionName)
+        throws RepositoryException, RemoteException {
+        try {
+            Version version = versionHistory.getVersion(versionName);
+            return getFactory().getRemoteVersion(version);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public RemoteVersion getVersionByLabel(String label)
+            throws RepositoryException, RemoteException {
+        try {
+            Version version = versionHistory.getVersionByLabel(label);
+            return getFactory().getRemoteVersion(version);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void addVersionLabel(String versionName, String label,
+            boolean moveLabel) throws RepositoryException, RemoteException {
+        try {
+            versionHistory.addVersionLabel(versionName, label, moveLabel);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void removeVersionLabel(String label) throws RepositoryException,
+        RemoteException {
+        try {
+            versionHistory.removeVersionLabel(label);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public boolean hasVersionLabel(String label) throws RepositoryException, RemoteException {
+        return versionHistory.hasVersionLabel(label);
+    }
+
+    /** {@inheritDoc} */
+    public boolean hasVersionLabel(String versionUUID, String label)
+        throws RepositoryException, RemoteException {
+        try {
+            Version version = getVersionByUUID(versionUUID);
+            return versionHistory.hasVersionLabel(version, label);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String[] getVersionLabels() throws RepositoryException, RemoteException {
+        return versionHistory.getVersionLabels();
+    }
+
+    /** {@inheritDoc} */
+    public String[] getVersionLabels(String versionUUID)
+            throws RepositoryException, RemoteException {
+        try {
+            Version version = getVersionByUUID(versionUUID);
+            return versionHistory.getVersionLabels(version);
+        } catch (ClassCastException cce) {
+            // we do not expect this here as nodes should be returned correctly
+            throw getRepositoryException(new RepositoryException(cce));
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public void removeVersion(String versionName)
+            throws RepositoryException, RemoteException {
+        try {
+            versionHistory.removeVersion(versionName);
+        } catch (RepositoryException ex) {
+            throw getRepositoryException(ex);
+        }
+    }
+
+    /** {@inheritDoc} */
+    public String getVersionableUUID() throws RepositoryException, RemoteException {
+        return versionHistory.getVersionableUUID();
+    }
+}

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

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



Mime
View raw message