jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r155776 [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/java/org/apache/jackrabbit/rmi/xml/
Date Tue, 01 Mar 2005 13:37:07 GMT
Author: jukka
Date: Tue Mar  1 05:36:49 2005
New Revision: 155776

URL: http://svn.apache.org/viewcvs?view=rev&rev=155776
Log:
Added checkstyle configuration from main Jackrabbit.
Fixed numerous minor formatting problems identified by checkstyle.

Added:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt
    incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml
Modified:
    incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeTypeIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayPropertyIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayRowIterator.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNamespaceRegistry.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/SerialValue.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItem.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItemDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerProperty.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerPropertyDef.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerRow.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerSession.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/xml/ImportContentHandler.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/xml/SessionImportContentHandler.java
    incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/xml/WorkspaceImportContentHandler.java

Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt?view=auto&rev=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/HEADER.txt Tue Mar  1 05:36:49 2005
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
\ No newline at end of file

Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml?view=auto&rev=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/checkstyle.xml Tue Mar  1 05:36:49 2005
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!--
+   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.
+  -->
+  
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!--
+  Checkstyle checks configured for Maven.
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+    <module name="TreeWalker">
+
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- ************************************************************** -->
+        <!-- Checks that are different from the sun coding conventions ones -->
+        <!-- ************************************************************** -->
+
+        <module name="Header">
+            <property name="headerFile" value="${basedir}/HEADER.txt"/>
+        </module>
+        <!-- <property name="tabWidth" value="4"/> -->
+        <module name="LeftCurly">
+          <property name="option" value="eol"/>
+        </module>
+        <module name="LineLength">
+          <property name="max" value="132"/>
+          <property name="ignorePattern" value="\* \$"/>
+        </module>
+        <module name="MethodLength">
+          <property name="max" value="175"/>
+        </module>
+        <module name="ConstantName">
+          <property name="format" value="log|^[a-zA-Z][a-zA-Z0-9_]*$"/>
+        </module>
+
+        <!-- ************************************************************** -->
+        <!-- Default Sun coding conventions checks                          -->
+        <!-- ************************************************************** -->
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+        <module name="MemberName"/>
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="FileLength"/>
+        <module name="ParameterNumber"/>
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>     
+        <module name="NeedBraces"/>
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="AvoidInlineConditionals"/>
+        <module name="DoubleCheckedLocking"/>
+        <module name="EqualsHashCode"/>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="RedundantThrows">
+            <property name="allowUnchecked" value="true"/>   <!-- DISABLED -->
+            <property name="allowSubclasses" value="true"/>   <!-- DISABLED -->
+        </module>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="DesignForExtension">
+            <property name="severity" value="ignore"/>   <!-- DISABLED -->
+        </module>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier"/>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="FinalParameters">
+            <property name="severity" value="ignore"/>   <!-- DISABLED -->
+        </module>
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/project.properties Tue Mar  1 05:36:49 2005
@@ -1,2 +1,3 @@
 maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api/,http://www.day.com/maven/jsr170/javadocs/jcr-0.16.1-pfd/
-maven.repo.remote = http://www.ibiblio.org/maven/,http://www.day.com/maven/
+maven.repo.remote=http://www.ibiblio.org/maven/,http://www.day.com/maven/
+maven.checkstyle.properties=checkstyle.xml

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -57,55 +57,55 @@
  * package as the default adapter implementations. Subclasses can
  * easily override or extend the default adapters by implementing the
  * corresponding factory methods.
- * 
+ *
  * @author Jukka Zitting
  * @author Philipp Koch
  */
 public class ClientAdapterFactory implements LocalAdapterFactory {
-    
+
     /**
      * Creates and returns a {@link ClientRepository ClientRepository}
      * instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Repository getRepository(RemoteRepository remote) {
         return new ClientRepository(remote, this);
     }
-    
+
     /**
      * Creates and returns a {@link ClientSession ClientSession} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Session getSession(Repository repository, RemoteSession remote) {
         return new ClientSession(repository, remote, this);
     }
-    
+
     /**
      * Creates and returns a {@link ClientWorkspace ClientWorkspace} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Workspace getWorkspace(Session session, RemoteWorkspace remote) {
         return new ClientWorkspace(session, remote, this);
     }
-    
+
     /**
      * Creates and returns a
      * {@link ClientNamespaceRegistry ClientClientNamespaceRegistry} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public NamespaceRegistry getNamespaceRegistry(
             RemoteNamespaceRegistry remote) {
         return new ClientNamespaceRegistry(remote, this);
     }
-    
+
     /**
      * Creates and returns a
      * {@link ClientNodeTypeManager ClienNodeTypeManager} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public NodeTypeManager getNodeTypeManager(RemoteNodeTypeManager remote) {
@@ -114,7 +114,7 @@
 
     /**
      * Creates and returns a {@link ClientItem ClientItem} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Item getItem(Session session, RemoteItem remote) {
@@ -123,25 +123,25 @@
 
     /**
      * Creates and returns a {@link ClientProperty ClientProperty} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Property getProperty(Session session, RemoteProperty remote) {
         return new ClientProperty(session, remote, this);
     }
-    
+
     /**
      * Creates and returns a {@link ClientNode ClientNode} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Node getNode(Session session, RemoteNode remote) {
         return new ClientNode(session, remote, this);
     }
-    
+
     /**
      * Creates and returns a {@link ClientNodeType ClientNodeType} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public NodeType getNodeType(RemoteNodeType remote) {
@@ -150,7 +150,7 @@
 
     /**
      * Creates and returns a {@link ClientNodeDef ClientNodeDef} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public NodeDef getNodeDef(RemoteNodeDef remote) {
@@ -160,7 +160,7 @@
     /**
      * Creates and returns a {@link ClientPropertyDef ClientPropertyDef}
      * instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public PropertyDef getPropertyDef(RemotePropertyDef remote) {
@@ -169,7 +169,7 @@
 
     /**
      * Creates and returns a {@link ClientLock ClientLock} instance.
-     * 
+     *
      * {@inheritDoc}
      */
     public Lock getLock(Node node, RemoteLock remote) {
@@ -204,7 +204,12 @@
             Session session, RemoteQueryResult remote) {
         return new ClientQueryResult(session, remote, this);
     }
-    
+
+    /**
+     * Creates and returns a {@link ClientRow ClientRow} instance.
+     *
+     * {@inheritDoc}
+     */
     public Row getRow(RemoteRow remote) {
         return new ClientRow(remote);
     }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItem.java Tue Mar  1 05:36:49 2005
@@ -42,22 +42,22 @@
  * {@link org.apache.jackrabbit.rmi.client.ClientProperty ClientProperty}
  * and
  * {@link org.apache.jackrabbit.rmi.client.ClientNode ClientNode} adapters.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.Item
  * @see org.apache.jackrabbit.rmi.remote.RemoteItem
  */
 public class ClientItem extends ClientObject implements Item {
-    
+
     /** Current session. */
-    protected Session session;
+    private Session session;
 
     /** The adapted remote item. */
     private RemoteItem remote;
-    
+
     /**
      * Creates a local adapter for the given remote item.
-     * 
+     *
      * @param session current session
      * @param remote  remote item
      * @param factory local adapter factory
@@ -71,7 +71,7 @@
 
     /**
      * Returns the current session without contacting the remote item.
-     * 
+     *
      * {@inheritDoc}
      */
     public Session getSession() {
@@ -100,7 +100,7 @@
     public Item getAncestor(int level) throws ItemNotFoundException,
             AccessDeniedException, RepositoryException {
         try {
-            return getItem(session, remote.getAncestor(level));
+            return getItem(getSession(), remote.getAncestor(level));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -110,7 +110,7 @@
     public Node getParent() throws ItemNotFoundException,
             AccessDeniedException, RepositoryException {
         try {
-            return factory.getNode(session, remote.getParent());
+            return factory.getNode(getSession(), remote.getParent());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -128,8 +128,10 @@
     /**
      * Returns false by default without contacting the remote item.
      * This method should be overridden by {@link Node Node} subclasses.
-     * 
+     *
      * {@inheritDoc}
+     *
+     * @return false
      */
     public boolean isNode() {
         return false;
@@ -159,9 +161,9 @@
      * some generic conditions (null values, instance equality, type equality),
      * after which the <em>item paths</em> are compared to determine sameness.
      * A RuntimeException is thrown if the item paths cannot be retrieved.
-     *  
+     *
      * {@inheritDoc}
-     * 
+     *
      * @see Item#getPath()
      */
     public boolean isSame(Item item) {
@@ -187,12 +189,12 @@
      * {@link Property Property} subclasses should override this method
      * to call the appropriate {@link ItemVisitor ItemVisitor} methods,
      * as the default implementation does nothing.
-     * 
+     *
      * {@inheritDoc}
      */
     public void accept(ItemVisitor visitor) throws RepositoryException {
     }
-    
+
     /** {@inheritDoc} */
     public void save() throws AccessDeniedException, LockException,
             ConstraintViolationException, InvalidItemStateException,

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -32,7 +32,7 @@
  * {@link org.apache.jackrabbit.rmi.client.ClientPropertyDef ClientPropertyDef}
  * and
  * {@link org.apache.jackrabbit.rmi.client.ClientNodeDef ClientNodeDef} adapters.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.nodetype.ItemDef
  * @see org.apache.jackrabbit.rmi.remote.RemoteItemDef
@@ -41,10 +41,10 @@
 
     /** The adapted remote item definition. */
     private RemoteItemDef remote;
-    
+
     /**
      * Creates a local adapter for the given remote item definition.
-     * 
+     *
      * @param remote remote item definition
      * @param factory local adapter factory
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -30,22 +30,22 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteLock RemoteLock}
  * inteface. This class makes a remote lock locally available using
  * the JCR {@link javax.jcr.lock.Lock Lock} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.lock.Lock
  * @see org.apache.jackrabbit.rmi.remote.RemoteLock
  */
 public class ClientLock implements Lock {
-    
+
     /** The current node. */
     private Node node;
-    
+
     /** The adapted remote lock. */
     private RemoteLock remote;
 
     /**
      * Creates a local adapter for the given remote lock.
-     * 
+     *
      * @param node current node
      * @param remote remote lock
      */
@@ -53,10 +53,10 @@
         this.node = node;
         this.remote = remote;
     }
-    
+
     /**
      * Returns the owning node without contacting the remote lock.
-     * 
+     *
      * {@inheritDoc}
      */
     public Node getNode() {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -30,7 +30,7 @@
  * inteface. This class makes a remote namespace registry locally available
  * using the JCR {@link javax.jcr.NamespaceRegistry NamespaceRegistry}
  * interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.NamespaceRegistry
  * @see org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry
@@ -40,10 +40,10 @@
 
     /** The adapted remote namespace registry. */
     private RemoteNamespaceRegistry remote;
-    
+
     /**
      * Creates a local adapter for the given remote namespace registry.
-     * 
+     *
      * @param remote remote namespace registry
      * @param factory local adapter factory
      */
@@ -52,7 +52,7 @@
         super(factory);
         this.remote = remote;
     }
-    
+
     /** {@inheritDoc} */
     public void registerNamespace(String prefix, String uri)
             throws NamespaceException, RepositoryException {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java Tue Mar  1 05:36:49 2005
@@ -64,7 +64,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteNode RemoteNode}
  * inteface. This class makes a remote node locally available using
  * the JCR {@link javax.jcr.Node Node} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.Node
  * @see org.apache.jackrabbit.rmi.remote.RemoteNode
@@ -73,10 +73,10 @@
 
     /** The adapted remote node. */
     private RemoteNode remote;
-    
+
     /**
      * Creates a local adapter for the given remote node.
-     * 
+     *
      * @param session current session
      * @param remote  remote node
      * @param factory local adapter factory
@@ -86,10 +86,10 @@
         super(session, remote, factory);
         this.remote = remote;
     }
-    
+
     /**
      * Returns <code>true</code> without contacting the remote node.
-     *   
+     *
      * {@inheritDoc}
      */
     public boolean isNode() {
@@ -100,19 +100,19 @@
      * Calls the {@link ItemVisitor#visit(Node) ItemVisitor.visit(Node)}
      * method of the given visitor. Does not contact the remote node, but
      * the visitor may invoke other methods that do contact the remote node.
-     * 
+     *
      * {@inheritDoc}
      */
     public void accept(ItemVisitor visitor) throws RepositoryException {
         visitor.visit(this);
     }
-    
+
     /** {@inheritDoc} */
     public Node addNode(String path) throws ItemExistsException,
             PathNotFoundException, ConstraintViolationException,
             RepositoryException {
         try {
-            return factory.getNode(session, remote.addNode(path));
+            return factory.getNode(getSession(), remote.addNode(path));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -123,7 +123,7 @@
             PathNotFoundException, NoSuchNodeTypeException,
             ConstraintViolationException, RepositoryException {
         try {
-            return factory.getNode(session, remote.addNode(path, type));
+            return factory.getNode(getSession(), remote.addNode(path, type));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -145,8 +145,9 @@
     public Property setProperty(String name, Value value)
             throws ValueFormatException, RepositoryException {
         try {
-            return factory.getProperty(
-                    session, remote.setProperty(name, new SerialValue(value)));
+            RemoteProperty property =
+                remote.setProperty(name, new SerialValue(value));
+            return factory.getProperty(getSession(), property);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -158,7 +159,7 @@
         try {
             Value[] serials = SerialValue.makeSerialValueArray(values);
             RemoteProperty property = remote.setProperty(name, serials);
-            return factory.getProperty(session, property);
+            return factory.getProperty(getSession(), property);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -220,7 +221,7 @@
     public Node getNode(String path) throws PathNotFoundException,
             RepositoryException {
         try {
-            return factory.getNode(session, remote.getNode(path));
+            return factory.getNode(getSession(), remote.getNode(path));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -229,7 +230,7 @@
     /** {@inheritDoc} */
     public NodeIterator getNodes() throws RepositoryException {
         try {
-            return getNodeIterator(session, remote.getNodes());
+            return getNodeIterator(getSession(), remote.getNodes());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -238,7 +239,7 @@
     /** {@inheritDoc} */
     public NodeIterator getNodes(String pattern) throws RepositoryException {
         try {
-            return getNodeIterator(session, remote.getNodes(pattern));
+            return getNodeIterator(getSession(), remote.getNodes(pattern));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -248,7 +249,7 @@
     public Property getProperty(String path) throws PathNotFoundException,
             RepositoryException {
         try {
-            return factory.getProperty(session, remote.getProperty(path));
+            return factory.getProperty(getSession(), remote.getProperty(path));
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -257,7 +258,7 @@
     /** {@inheritDoc} */
     public PropertyIterator getProperties() throws RepositoryException {
         try {
-            return getPropertyIterator(session, remote.getProperties());
+            return getPropertyIterator(getSession(), remote.getProperties());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -267,7 +268,8 @@
     public PropertyIterator getProperties(String pattern) throws
             RepositoryException {
         try {
-            return getPropertyIterator(session, remote.getProperties(pattern));
+            RemoteProperty[] properties = remote.getProperties(pattern);
+            return getPropertyIterator(getSession(), properties);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -277,7 +279,7 @@
     public Item getPrimaryItem() throws ItemNotFoundException,
             RepositoryException {
         try {
-            return getItem(session, remote.getPrimaryItem());
+            return getItem(getSession(), remote.getPrimaryItem());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -296,7 +298,7 @@
     /** {@inheritDoc} */
     public PropertyIterator getReferences() throws RepositoryException {
         try {
-            return getPropertyIterator(session, remote.getReferences());
+            return getPropertyIterator(getSession(), remote.getReferences());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
@@ -402,7 +404,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public Version checkin() throws VersionException,
             UnsupportedRepositoryOperationException, RepositoryException {
@@ -449,7 +451,7 @@
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
-    
+
     /** {@inheritDoc} */
     public void doneMerge(Version version) throws VersionException,
             InvalidItemStateException, UnsupportedRepositoryOperationException,
@@ -457,7 +459,7 @@
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
-    
+
     /** {@inheritDoc} */
     public String getCorrespondingNodePath(String workspace) throws
             ItemNotFoundException, NoSuchWorkspaceException,
@@ -539,7 +541,7 @@
         try {
             Value[] serials = SerialValue.makeSerialValueArray(values);
             RemoteProperty property = remote.setProperty(name, serials, type);
-            return factory.getProperty(session, property);
+            return factory.getProperty(getSession(), property);
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -28,7 +28,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeDef RemoteNodeDef}
  * inteface. This class makes a remote node definition locally available using
  * the JCR {@link javax.jcr.nodetype.NodeDef NodeDef} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.nodetype.NodeDef
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeDef
@@ -37,10 +37,10 @@
 
     /** The adapted remote node definition. */
     private RemoteNodeDef remote;
-    
+
     /**
      * Creates a local adapter for the given remote node definition.
-     * 
+     *
      * @param remote remote node definition
      * @param factory local adapter factory
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -32,7 +32,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeType RemoteNodeType}
  * inteface. This class makes a remote node type locally available using
  * the JCR {@link javax.jcr.nodetype.NodeType NodeType} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.nodetype.NodeType
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeType
@@ -41,10 +41,10 @@
 
     /** The adapted remote node type. */
     private RemoteNodeType remote;
-    
+
     /**
      * Creates a local adapter for the given remote node type.
-     * 
+     *
      * @param remote remote node type
      * @param factory local adapter factory
      */
@@ -52,7 +52,7 @@
         super(factory);
         this.remote = remote;
     }
-    
+
     /** {@inheritDoc} */
     public String getName() {
         try {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -32,7 +32,7 @@
  * inteface. This class makes a remote node type manager locally available
  * using the JCR {@link javax.jcr.nodetype.NodeTypeManager NodeTypeManager}
  * interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.nodetype.NodeTypeManager
  * @see org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager
@@ -45,7 +45,7 @@
 
     /**
      * Creates a local adapter for the given remote node type manager.
-     * 
+     *
      * @param remote remote node type manager
      * @param factory local adapter factory
      */
@@ -54,7 +54,7 @@
         super(factory);
         this.remote = remote;
     }
-    
+
     /** {@inheritDoc} */
     public NodeType getNodeType(String name) throws NoSuchNodeTypeException,
             RepositoryException {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -42,31 +42,31 @@
  * this class is to centralize the handling of the
  * local adapter factory used by the client adapters to
  * instantiate new adapters.
- * 
+ *
  * @author Jukka Zitting
  */
 public class ClientObject {
 
     /** Local adapter factory. */
     protected LocalAdapterFactory factory;
-    
+
     /**
      * Creates a basic client adapter that uses the given factory
      * to create new adapters.
-     * 
+     *
      * @param factory local adapter factory
      */
     protected ClientObject(LocalAdapterFactory factory) {
         this.factory = factory;
     }
-    
+
     /**
      * Utility method to create a local adapter for a remote item.
      * This method introspects the remote reference to determine
      * whether to instantiate a {@link Property Property},
      * a {@link Node Node}, or an {@link Item Item} adapter using
      * the local adapter factory.
-     * 
+     *
      * @param session current session
      * @param remote remote item
      * @return local property, node, or item adapter
@@ -87,7 +87,7 @@
      * are created using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     * 
+     *
      * @param session current session
      * @param remotes remote properties
      * @return local property iterator
@@ -97,7 +97,7 @@
         if (remotes == null) {
             return new ArrayPropertyIterator(new Property[0]); // for safety
         }
-        
+
         Property[] properties = new Property[remotes.length];
         for (int i = 0; i < remotes.length; i++) {
             properties[i] = factory.getProperty(session, remotes[i]);
@@ -111,7 +111,7 @@
      * are created using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     * 
+     *
      * @param session current session
      * @param remotes remote nodes
      * @return local node iterator
@@ -121,21 +121,21 @@
         if (remotes == null) {
             return new ArrayNodeIterator(new Node[0]); // for safety
         }
-        
+
         Node[] nodes = new Node[remotes.length];
         for (int i = 0; i < remotes.length; i++) {
             nodes[i] = factory.getNode(session, remotes[i]);
         }
         return new ArrayNodeIterator(nodes);
     }
-    
+
     /**
      * Utility method for creating an array of local node type adapters
      * for an array of remote node types. The node type adapters are created
      * using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     * 
+     *
      * @param remotes remote node types
      * @return local node type array
      */
@@ -143,21 +143,21 @@
         if (remotes == null) {
             return new NodeType[0]; // for safety
         }
-        
+
         NodeType[] types = new NodeType[remotes.length];
         for (int i = 0; i < remotes.length; i++) {
             types[i] = factory.getNodeType(remotes[i]);
         }
         return types;
     }
-    
+
     /**
      * Utility method for creating an iterator of local node type adapters
      * for an array of remote node types. The node type adapters are created
      * using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     * 
+     *
      * @param remotes remote node types
      * @return local node type iterator
      */
@@ -171,7 +171,7 @@
      * definition adapters are created using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     *  
+     *
      * @param remotes remote node definitions
      * @return local node definition array
      */
@@ -193,7 +193,7 @@
      * definition adapters are created using the local adapter factory.
      * <p>
      * A <code>null</code> input is treated as an empty array.
-     * 
+     *
      * @param remotes remote property definitions
      * @return local property definition array
      */

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java Tue Mar  1 05:36:49 2005
@@ -44,19 +44,19 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteProperty RemoteProperty}
  * inteface. This class makes a remote property locally available using
  * the JCR {@link javax.jcr.Property Property} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.Property
  * @see org.apache.jackrabbit.rmi.remote.RemoteProperty
  */
 public class ClientProperty extends ClientItem implements Property {
-    
+
     /** The adapted remote property. */
     private RemoteProperty remote;
-    
+
     /**
      * Creates a local adapter for the given remote property.
-     * 
+     *
      * @param session current session
      * @param remote  remote property
      * @param factory local adapter factory
@@ -71,7 +71,7 @@
      * Calls the {@link ItemVisitor#visit(Property) ItemVisitor.visit(Property}
      * method of the given visitor. Does not contact the remote property, but
      * the visitor may invoke other methods that do contact the remote property.
-     * 
+     *
      * {@inheritDoc}
      */
     public void accept(ItemVisitor visitor) throws RepositoryException {
@@ -81,7 +81,7 @@
     /**
      * Returns the boolean value of this property. Implemented as
      * getValue().getBoolean().
-     * 
+     *
      * {@inheritDoc}
      */
     public boolean getBoolean() throws ValueFormatException,
@@ -92,48 +92,48 @@
     /**
      * Returns the date value of this property. Implemented as
      * getValue().getDate().
-     * 
+     *
      * {@inheritDoc}
      */
     public Calendar getDate() throws ValueFormatException, RepositoryException {
         return getValue().getDate();
     }
-    
+
     /**
      * Returns the double value of this property. Implemented as
      * getValue().getDouble().
-     * 
+     *
      * {@inheritDoc}
      */
     public double getDouble() throws ValueFormatException, RepositoryException {
         return getValue().getDouble();
     }
-    
+
     /**
      * Returns the long value of this property. Implemented as
      * getValue().getLong().
-     * 
+     *
      * {@inheritDoc}
      */
     public long getLong() throws ValueFormatException, RepositoryException {
         return getValue().getLong();
     }
-    
+
     /**
      * Returns the binary value of this property. Implemented as
      * getValue().getStream().
-     * 
+     *
      * {@inheritDoc}
      */
     public InputStream getStream() throws ValueFormatException,
             RepositoryException {
         return getValue().getStream();
     }
-    
+
     /**
      * Returns the string value of this property. Implemented as
      * getValue().getString().
-     * 
+     *
      * {@inheritDoc}
      */
     public String getString() throws ValueFormatException, RepositoryException {
@@ -148,7 +148,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public Value[] getValues() throws ValueFormatException, RepositoryException {
         try {
@@ -157,11 +157,11 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /**
      * Sets the boolean value of this property. Implemented as
      * setValue(new BooleanValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(boolean value) throws ValueFormatException,
@@ -172,18 +172,18 @@
     /**
      * Sets the date value of this property. Implemented as
      * setValue(new DateValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(Calendar value) throws ValueFormatException,
             RepositoryException {
         setValue(new DateValue(value));
     }
-    
+
     /**
      * Sets the double value of this property. Implemented as
      * setValue(new DoubleValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(double value) throws ValueFormatException,
@@ -194,51 +194,51 @@
     /**
      * Sets the binary value of this property. Implemented as
      * setValue(new BinaryValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(InputStream value) throws ValueFormatException,
             RepositoryException {
         setValue(new BinaryValue(value));
     }
-    
+
     /**
      * Sets the long value of this property. Implemented as
      * setValue(new LongValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(long value) throws ValueFormatException,
             RepositoryException {
         setValue(new LongValue(value));
     }
-    
+
     /**
      * Sets the reference value of this property. Implemented as
      * setValue(new ReferenceValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(Node value) throws ValueFormatException,
             RepositoryException {
         setValue(new ReferenceValue(value));
     }
-    
+
     /**
      * Sets the string value of this property. Implemented as
      * setValue(new StringValue(value)).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(String value) throws ValueFormatException,
             RepositoryException {
         setValue(new StringValue(value));
     }
-    
+
     /**
      * Sets the string values of this property. Implemented as
      * setValue(new Value[] { new StringValue(strings[0]), ... }).
-     * 
+     *
      * {@inheritDoc}
      */
     public void setValue(String[] strings) throws ValueFormatException,
@@ -259,7 +259,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public void setValue(Value[] values) throws ValueFormatException,
             RepositoryException {
@@ -269,12 +269,12 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /**
      * Returns the reference value of this property. Implemented by
      * converting the reference value to an UUID string and using the
-     * current session to look up the referenced node. 
-     * 
+     * current session to look up the referenced node.
+     *
      * {@inheritDoc}
      */
     public Node getNode() throws ValueFormatException, RepositoryException {
@@ -302,12 +302,12 @@
     /** {@inheritDoc} */
     public PropertyDef getDefinition() throws RepositoryException {
         try {
-            return factory.getPropertyDef(remote.getDefinition()); 
+            return factory.getPropertyDef(remote.getDefinition());
         } catch (RemoteException ex) {
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public int getType() throws RepositoryException {
         try {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -28,7 +28,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDef RemotePropertyDef}
  * inteface. This class makes a remote property definition locally available
  * using the JCR {@link javax.jcr.nodetype.PropertyDef PropertyDef} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.nodetype.PropertyDef
  * @see org.apache.jackrabbit.rmi.remote.RemotePropertyDef
@@ -37,10 +37,10 @@
 
     /** The adapted remote property. */
     private RemotePropertyDef remote;
-    
+
     /**
      * Creates a local adapter for the given remote property definition.
-     * 
+     *
      * @param remote remote property definition
      * @param factory local adapter factory
      */
@@ -49,7 +49,7 @@
         super(remote, factory);
         this.remote = remote;
     }
-    
+
     /** {@inheritDoc} */
     public int getRequiredType() {
         try {

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=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java Tue Mar  1 05:36:49 2005
@@ -46,7 +46,7 @@
 
     /** The current session */
     private Session session;
-    
+
     /** The adapted remote query manager. */
     private RemoteQuery remote;
 
@@ -100,7 +100,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public void save(String absPath) throws ItemExistsException,
             PathNotFoundException, VersionException,

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=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java Tue Mar  1 05:36:49 2005
@@ -86,7 +86,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public NodeIterator getNodes() throws RepositoryException {
         try {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepository.java Tue Mar  1 05:36:49 2005
@@ -33,7 +33,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteRepository RemoteRepository}
  * inteface. This class makes a remote repository locally available using
  * the JCR {@link javax.jcr.Repository Repository} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.Repository
  * @see org.apache.jackrabbit.rmi.remote.RemoteRepository
@@ -42,10 +42,10 @@
 
     /** The adapted remote repository. */
     private RemoteRepository remote;
-    
+
     /**
      * Creates a client adapter for the given remote repository.
-     * 
+     *
      * @param remote remote repository
      * @param factory local adapter factory
      */
@@ -54,7 +54,7 @@
         super(factory);
         this.remote = remote;
     }
-    
+
     /** {@inheritDoc} */
     public String getDescriptor(String name) {
         try {
@@ -72,7 +72,7 @@
             throw new RemoteRuntimeException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public Session login() throws LoginException, NoSuchWorkspaceException,
             RepositoryException {
@@ -83,7 +83,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public Session login(String workspace) throws LoginException,
             NoSuchWorkspaceException, RepositoryException {
@@ -105,7 +105,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public Session login(Credentials credentials, String workspace) throws
             LoginException, NoSuchWorkspaceException, RepositoryException {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java Tue Mar  1 05:36:49 2005
@@ -37,45 +37,45 @@
 /**
  * Object factory for JCR-RMI clients. This factory can be used either
  * directly or as a JNDI object factory.
- * 
+ *
  * @author Jukka Zitting
  * @see ClientRepository
  */
 public class ClientRepositoryFactory implements ObjectFactory {
-    
+
     /**
      * The JNDI parameter name for configuring the RMI URL of
      * a remote repository.
      */
     public static final String URL_PARAMETER = "url";
-    
+
     /**
      * Cache for repository references.
      */
     private Map repositories;
-    
+
     /**
      * Local adapter factory.
      */
     private LocalAdapterFactory factory;
-    
+
     /**
      * Creates a JCR-RMI client factory with the default adapter factory.
      */
     public ClientRepositoryFactory() {
         this(new ClientAdapterFactory());
     }
-    
+
     /**
      * Creates a JCR-RMI client factory with the given adapter factory.
-     * 
+     *
      * @param factory local adapter factory
      */
     public ClientRepositoryFactory(LocalAdapterFactory factory) {
         this.repositories = new HashMap();
         this.factory = factory;
     }
-    
+
     /**
      * Returns a client wrapper for a remote content repository. The remote
      * repository is looked up from the RMI registry using the given URL and
@@ -83,10 +83,10 @@
      * <p>
      * The repository references are cached so that only one client instance
      * (per factory) exists for each remote repository.
-     * 
+     *
      * @param url the RMI URL of the remote repository
      * @return repository client
-     * @throws ClassCastException    if the URL points to an unknown object 
+     * @throws ClassCastException    if the URL points to an unknown object
      * @throws MalformedURLException if the URL is malformed
      * @throws NotBoundException     if the URL points to nowhere
      * @throws RemoteException       on RMI errors
@@ -100,54 +100,54 @@
             repository = factory.getRepository(remote);
             repositories.put(url, repository);
         }
-    	return repository;
+        return repository;
     }
-    
+
     /**
      * Utility method for looking up the URL within the given RefAddr object.
      * Feeds the content of the RefAddr object to
      * {@link #getRepository(String) getRepository(String)} and wraps all
-     * errors to {@link NamingException NamingExceptions}. 
+     * errors to {@link NamingException NamingExceptions}.
      * <p>
      * Used by {@link #getObjectInstance(Object, Name, Context, Hashtable) getObjectInstance()}.
-     * 
+     *
      * @param url the URL reference
      * @return repository client
      * @throws NamingException on all errors
      */
     private Repository getRepository(RefAddr url) throws NamingException {
-    	try {
-    		return getRepository((String) url.getContent());
+        try {
+            return getRepository((String) url.getContent());
         } catch (Exception ex) {
-        	throw new NamingException(ex.getMessage());
+            throw new NamingException(ex.getMessage());
         }
     }
-    
+
     /**
      * JNDI factory method for creating JCR-RMI clients. Looks up a
      * remote repository using the reference parameter "url" as the RMI URL
      * and returns a client wrapper for the remote repository.
-     * 
-     * @param object      reference parameters       
+     *
+     * @param object      reference parameters
      * @param name        unused
      * @param context     unused
      * @param environment unused
      * @return repository client
      * @throws NamingException on all errors
      */
-	public Object getObjectInstance(
+    public Object getObjectInstance(
             Object object, Name name, Context context, Hashtable environment)
-	        throws NamingException {
+            throws NamingException {
         if (object instanceof Reference) {
             Reference reference = (Reference) object;
             if (Repository.class.getName().equals(reference.getClassName())) {
-            	RefAddr url = reference.get(URL_PARAMETER);
-            	if (url != null) {
+                RefAddr url = reference.get(URL_PARAMETER);
+                if (url != null) {
                     return getRepository(url);
-            	}
+                }
             }
         }
-		return null;
-	}
-    
+        return null;
+    }
+
 }

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=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientRow.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -36,14 +36,13 @@
  */
 public class ClientRow implements Row {
 
-    /** The current row. */
-    protected RemoteRow remote;
+    /** The remote query row. */
+    private RemoteRow remote;
 
     /**
-     * Creates a client adapter for the given remote row.
+     * Creates a client adapter for the given remote query row.
      *
-     * @param remote remote row
-     * @param local adapter factory
+     * @param remote remote query row
      */
     public ClientRow(RemoteRow remote) {
         this.remote = remote;
@@ -59,7 +58,7 @@
     }
 
     /** {@inheritDoc} */
-    public Value getValue(String s) 
+    public Value getValue(String s)
             throws ItemNotFoundException, RepositoryException {
         try {
             return remote.getValue(s);

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java Tue Mar  1 05:36:49 2005
@@ -60,7 +60,7 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteSession RemoteSession}
  * inteface. This class makes a remote session locally available using
  * the JCR {@link javax.jcr.Session Session} interface.
- * 
+ *
  * @author Jukka Zitting
  * @see javax.jcr.Session
  * @see org.apache.jackrabbit.rmi.remote.RemoteSession
@@ -69,13 +69,13 @@
 
     /** The current repository. */
     private Repository repository;
-    
+
     /** The adapted remote session. */
     private RemoteSession remote;
-    
+
     /**
      * Creates a client adapter for the given remote session.
-     * 
+     *
      * @param repository current repository
      * @param remote remote repository
      * @param factory local adapter factory
@@ -86,10 +86,10 @@
         this.repository = repository;
         this.remote = remote;
     }
-    
+
     /**
      * Returns the current repository without contacting the remote session.
-     *  
+     *
      * {@inheritDoc}
      */
     public Repository getRepository() {
@@ -247,7 +247,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public ContentHandler getImportContentHandler(String path) throws
             PathNotFoundException, RepositoryException {
@@ -310,7 +310,7 @@
             throw new RemoteRuntimeException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public String[] getLockTokens() {
         try {
@@ -319,7 +319,7 @@
             throw new RemoteRuntimeException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public void removeLockToken(String name) {
         try {
@@ -328,14 +328,14 @@
             throw new RemoteRuntimeException(ex);
         }
     }
-    
+
     /**
      * Exports the XML system view of the specified repository location
      * to the given XML content handler. This method first requests the
      * raw XML data from the remote session, and then uses an identity
      * transformation to feed the data to the given XML content handler.
-     * Possible IO and transformer exceptions are thrown as SAXExceptions. 
-     * 
+     * Possible IO and transformer exceptions are thrown as SAXExceptions.
+     *
      * {@inheritDoc}
      */
     public void exportSysView(String path, ContentHandler handler,
@@ -366,7 +366,7 @@
      * to the given output stream. This method first requests the
      * raw XML data from the remote session, and then writes the data to
      * the output stream.
-     * 
+     *
      * {@inheritDoc}
      */
     public void exportSysView(String path, OutputStream output,
@@ -385,8 +385,8 @@
      * to the given XML content handler. This method first requests the
      * raw XML data from the remote session, and then uses an identity
      * transformation to feed the data to the given XML content handler.
-     * Possible IO and transformer exceptions are thrown as SAXExceptions. 
-     * 
+     * Possible IO and transformer exceptions are thrown as SAXExceptions.
+     *
      * {@inheritDoc}
      */
     public void exportDocView(String path, ContentHandler handler,
@@ -418,7 +418,7 @@
      * to the given output stream. This method first requests the
      * raw XML data from the remote session, and then writes the data to
      * the output stream.
-     * 
+     *
      * {@inheritDoc}
      */
     public void exportDocView(String path, OutputStream output,

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java Tue Mar  1 05:36:49 2005
@@ -49,23 +49,23 @@
  * {@link org.apache.jackrabbit.rmi.remote.RemoteWorkspace RemoteWorkspace}
  * inteface. This class makes a remote workspace locally available using
  * the JCR {@link javax.jcr.Workspace Workspace} interface.
- * 
+ *
  * @author Jukka Zitting
  * @author Philipp Koch
  * @see javax.jcr.Workspace
  * @see org.apache.jackrabbit.rmi.remote.RemoteWorkspace
  */
 public class ClientWorkspace extends ClientObject implements Workspace {
-    
+
     /** The current session. */
     private Session session;
-    
+
     /** The adapted remote workspace. */
     private RemoteWorkspace remote;
-    
+
     /**
      * Creates a client adapter for the given remote workspace.
-     * 
+     *
      * @param session current session
      * @param remote remote workspace
      * @param factory local adapter factory
@@ -76,10 +76,10 @@
         this.session = session;
         this.remote = remote;
     }
-    
+
     /**
      * Returns the current session without contacting the remote workspace.
-     * 
+     *
      * {@inheritDoc}
      */
     public Session getSession() {
@@ -164,7 +164,6 @@
         throw new UnsupportedOperationException();
     }
 
-    
     /** {@inheritDoc} */
     public void clone(String workspace, String src, String dst,
             boolean removeExisting) throws NoSuchWorkspaceException,
@@ -177,7 +176,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public String[] getAccessibleWorkspaceNames() throws RepositoryException {
         try {
@@ -186,7 +185,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public ContentHandler getImportContentHandler(String path,
             int uuidBehaviour) throws PathNotFoundException,
@@ -194,7 +193,7 @@
             RepositoryException {
         return new WorkspaceImportContentHandler(this, path, uuidBehaviour);
     }
-    
+
     /** {@inheritDoc} */
     public void importXML(String path, InputStream xml, int uuidBehaviour)
             throws IOException, PathNotFoundException, ItemExistsException,
@@ -211,7 +210,7 @@
             throw new RemoteRepositoryException(ex);
         }
     }
-    
+
     /** {@inheritDoc} */
     public void restore(Version[] versions, boolean removeExisting) throws
             ItemExistsException, UnsupportedRepositoryOperationException,
@@ -219,5 +218,5 @@
             RepositoryException {
         // TODO Auto-generated method stub
     }
-    
+
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -62,7 +62,7 @@
  * base class provides a number of utility methods designed to work with
  * a local adapter factory. Adapter implementations may want to inherit
  * that functionality by subclassing from ClientObject.
- * 
+ *
  * @author Jukka Zitting
  * @author Philipp Koch
  * @see org.apache.jackrabbit.rmi.server.RemoteAdapterFactory
@@ -70,15 +70,15 @@
  * @see org.apache.jackrabbit.rmi.client.ClientObject
  */
 public interface LocalAdapterFactory {
-    
+
     /**
      * Factory method for creating a local adapter for a remote repository.
      *
      * @param remote remote repository
      * @return local repository adapter
      */
-    public Repository getRepository(RemoteRepository remote);
-    
+    Repository getRepository(RemoteRepository remote);
+
     /**
      * Factory method for creating a local adapter for a remote session.
      *
@@ -86,7 +86,7 @@
      * @param remote remote session
      * @return local session adapter
      */
-    public Session getSession(Repository repository, RemoteSession remote);
+    Session getSession(Repository repository, RemoteSession remote);
 
     /**
      * Factory method for creating a local adapter for a remote workspace.
@@ -95,7 +95,7 @@
      * @param remote remote workspace
      * @return local workspace adapter
      */
-    public Workspace getWorkspace(Session session, RemoteWorkspace remote);
+    Workspace getWorkspace(Session session, RemoteWorkspace remote);
 
     /**
      * Factory method for creating a local adapter for a remote namespace
@@ -104,8 +104,7 @@
      * @param remote remote namespace registry
      * @return local namespace registry adapter
      */
-    public NamespaceRegistry getNamespaceRegistry(
-            RemoteNamespaceRegistry remote);
+    NamespaceRegistry getNamespaceRegistry(RemoteNamespaceRegistry remote);
 
     /**
      * Factory method for creating a local adapter for a remote node type
@@ -114,7 +113,7 @@
      * @param remote remote node type manager
      * @return local node type manager adapter
      */
-    public NodeTypeManager getNodeTypeManager(RemoteNodeTypeManager remote);
+    NodeTypeManager getNodeTypeManager(RemoteNodeTypeManager remote);
 
     /**
      * Factory method for creating a local adapter for a remote item.
@@ -124,56 +123,56 @@
      * {@link #getProperty(Session, RemoteProperty) getProperty} method
      * instead, as the adapter returned by this method will only cover
      * the basic {@link Item Item} interface.
-     * 
+     *
      * @param session current session
      * @param remote remote item
      * @return local item adapter
      */
-    public Item getItem(Session session, RemoteItem remote);
+    Item getItem(Session session, RemoteItem remote);
 
     /**
      * Factory method for creating a local adapter for a remote property.
-     * 
+     *
      * @param session current session
      * @param remote remote property
      * @return local property adapter
      */
-    public Property getProperty(Session session, RemoteProperty remote);
+    Property getProperty(Session session, RemoteProperty remote);
 
     /**
      * Factory method for creating a local adapter for a remote node.
-     * 
+     *
      * @param session current session
      * @param remote remote node
      * @return local node adapter
      */
-    public Node getNode(Session session, RemoteNode remote);
+    Node getNode(Session session, RemoteNode remote);
 
     /**
      * Factory method for creating a local adapter for a remote node type.
-     * 
+     *
      * @param remote remote node type
      * @return local node type adapter
      */
-    public NodeType getNodeType(RemoteNodeType remote);
-    
+    NodeType getNodeType(RemoteNodeType remote);
+
     /**
      * Factory method for creating a local adapter for a remote node
      * definition.
-     * 
+     *
      * @param remote remote node definition
      * @return local node definition adapter
      */
-    public NodeDef getNodeDef(RemoteNodeDef remote);
+    NodeDef getNodeDef(RemoteNodeDef remote);
 
     /**
      * Factory method for creating a local adapter for a remote property
      * definition.
-     * 
+     *
      * @param remote remote property definition
      * @return local property definition adapter
      */
-    public PropertyDef getPropertyDef(RemotePropertyDef remote);
+    PropertyDef getPropertyDef(RemotePropertyDef remote);
 
     /**
      * Factory method for creating a local adapter for a remote lock.
@@ -182,7 +181,7 @@
      * @param remote remote lock
      * @return local lock adapter
      */
-    public Lock getLock(Node node, RemoteLock remote);
+    Lock getLock(Node node, RemoteLock remote);
 
     /**
      * Factory method for creating a local adapter for a remote query manager.
@@ -191,8 +190,7 @@
      * @param remote remote query manager
      * @return local query manager adapter
      */
-    public QueryManager getQueryManager(
-            Session session, RemoteQueryManager remote);
+    QueryManager getQueryManager(Session session, RemoteQueryManager remote);
 
     /**
      * Factory method for creating a local adapter for a remote query.
@@ -201,7 +199,7 @@
      * @param remote remote query
      * @return local query adapter
      */
-    public Query getQuery(Session session, RemoteQuery remote);
+    Query getQuery(Session session, RemoteQuery remote);
 
     /**
      * Factory method for creating a local adapter for a remote query result.
@@ -210,15 +208,14 @@
      * @param remote remote query result
      * @return local query result adapter
      */
-    public QueryResult getQueryResult(
-            Session session, RemoteQueryResult remote);
+    QueryResult getQueryResult(Session session, RemoteQueryResult remote);
 
     /**
      * Factory method for creating a local adapter for a remote query row.
-     * 
+     *
      * @param remote remote query row
      * @return local query row adapter
      */
-    public Row getRow(RemoteRow remote);
+    Row getRow(RemoteRow remote);
 
 }

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java Tue Mar  1 05:36:49 2005
@@ -27,14 +27,14 @@
  * Note that if a RemoteException is received by call with no declared
  * exceptions, then the RemoteException is wrapped into a
  * RemoteRuntimeException.
- * 
+ *
  * @author Jukka Zitting
  */
 public class RemoteRepositoryException extends RepositoryException {
-    
+
     /**
      * Creates a RemoteRepositoryException based on the given RemoteException.
-     * 
+     *
      * @param ex the remote exception
      */
     public RemoteRepositoryException(RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java Tue Mar  1 05:36:49 2005
@@ -6,7 +6,7 @@
  * 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
+ *      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,
@@ -22,17 +22,17 @@
  * JCR-RMI remote runtime exception. Used by the JCR-RMI client to wrap
  * RMI errors into RuntimeExceptions to avoid breaking the JCR interfaces.
  * <p>
- * Note that if a RemoteException is received by call that declares to 
+ * Note that if a RemoteException is received by call that declares to
  * throw RepositoryExceptions, then the RemoteException is wrapped into
  * a RemoteRepositoryException.
- * 
+ *
  * @author Jukka Zitting
  */
 public class RemoteRuntimeException extends RuntimeException {
 
     /**
      * Creates a RemoteRuntimeException based on the given RemoteException.
-     * 
+     *
      * @param ex the remote exception
      */
     public RemoteRuntimeException(RemoteException ex) {

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java Tue Mar  1 05:36:49 2005
@@ -24,27 +24,27 @@
  * implements the RangeIterator functionality for an underlying array
  * of objects. Used as the base class for the type-specific iterator
  * classes defined in this package.
- * 
+ *
  * @author Jukka Zitting
  */
 public class ArrayIterator implements RangeIterator {
 
     /** The current iterator position. */
     private int position;
-    
+
     /** The underlying array of objects. */
     private Object[] array;
-    
+
     /**
      * Creates an iterator for the given array of objects.
-     * 
+     *
      * @param array the objects to iterate
      */
     public ArrayIterator(Object[] array) {
         this.position = 0;
         this.array = array;
     }
-    
+
     /** {@inheritDoc} */
     public boolean hasNext() {
         return (position < array.length);

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeIterator.java?view=diff&r1=155775&r2=155776
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeIterator.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayNodeIterator.java Tue Mar  1 05:36:49 2005
@@ -24,20 +24,20 @@
  * {@link javax.jcr.NodeIterator NodeIterator} interface.
  * This class is used by the JCR-RMI client adapters to convert
  * node arrays to iterators.
- * 
+ *
  * @author Jukka Zitting
  */
 public class ArrayNodeIterator extends ArrayIterator implements NodeIterator {
-    
+
     /**
      * Creates an iterator for the given array of nodes.
-     * 
+     *
      * @param nodes the nodes to iterate
      */
     public ArrayNodeIterator(Node[] nodes) {
         super(nodes);
     }
-    
+
     /** {@inheritDoc} */
     public Node nextNode() {
         return (Node) next();



Mime
View raw message