jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r901184 - in /jackrabbit/branches/2.0: ./ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ jackrabbit-jcr-rmi/ jackrabbit-jcr-rmi/src/ jackrabbit-jcr-rmi/src/main/ jackrabbit-jcr-rmi/src/main/java/ jackrabbit-j...
Date Wed, 20 Jan 2010 13:22:19 GMT
Author: jukka
Date: Wed Jan 20 13:22:14 2010
New Revision: 901184

URL: http://svn.apache.org/viewvc?rev=901184&view=rev
Log:
2.0: Merged revisions 901139, 901170 and 901176 (JCR-2470)

Added:
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/   (props changed)
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/HEADER.txt
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/HEADER.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/README.txt
      - copied, changed from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/checkstyle.xml
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/checkstyle.xml
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml   (contents, props changed)
      - copied, changed from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/   (props changed)
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/BrokenRemoteRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItem.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientLock.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNamespaceRegistry.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNode.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientNodeTypeManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObject.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientObservationManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQueryManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRow.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientRow.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientSession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientSession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientWorkspace.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientXASession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/ClientXASession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/DefaultContentHandler.java   (props changed)
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/DefaultContentHandler.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/RemoteRepositoryException.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/RemoteRuntimeException.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SafeClientRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java   (props changed)
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientNodeIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientNodeIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientNodeTypeIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientNodeTypeIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientPropertyIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientPropertyIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientRowIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientRowIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientVersionIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/iterator/ClientVersionIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayEventListenerIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/JackrabbitClientAdapterFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/jackrabbit/JackrabbitClientAdapterFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/Queue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/Queue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/ArrayIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/ArrayIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/BufferIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/BufferIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteEventCollection.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteItem.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteItem.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNamespaceRegistry.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNamespaceRegistry.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteNodeTypeManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteObservationManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteObservationManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteRow.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteWorkspace.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteXASession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/RemoteXASession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/SerializableXid.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/remote/SerializableXid.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/AbstractRemoteRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/AbstractRemoteRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/JNDIRemoteRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/ProxyRepository.java   (props changed)
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/ProxyRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RMIRemoteRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RepositoryFactory.java   (props changed)
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepositoryFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/URLRemoteRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerEventCollection.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerEventCollection.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerItem.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerItem.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerItemDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerItemDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerLock.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNamespaceRegistry.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNode.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerNodeTypeManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObject.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObservationManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerObservationManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerProperty.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerProperty.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryManager.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerRow.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerSession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerSession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerWorkspace.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerXASession.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerXASession.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerNodeIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerNodeIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerNodeTypeIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerNodeTypeIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerPropertyIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerPropertyIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerRowIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerRowIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerVersionIterator.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/iterator/ServerVersionIterator.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/JCRServer.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/JCRServer.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/JCRServerMBean.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/jmx/JCRServerMBean.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/AbstractValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/AbstractValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/BinaryValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/BinaryValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/BooleanValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/BooleanValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DateValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DateValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DecimalValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DecimalValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DoubleValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/DoubleValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/LongValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/LongValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/NameValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/NameValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/PathValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/PathValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/ReferenceValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/ReferenceValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerializableBinary.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerializableBinary.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/iterator/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/iterator/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/client/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/iterator/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/iterator/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/observation/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/observation/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/observation/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/observation/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/remote/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/remote/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/remote/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/remote/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/iterator/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/iterator/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/iterator/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/iterator/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/server/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/value/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/value/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/value/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/value/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/xml/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/xml/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/xml/package.html
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/javadoc/org/apache/jackrabbit/rmi/xml/package.html
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/resources/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/resources/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/resources/META-INF/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/resources/META-INF/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/resources/META-INF/services/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/resources/META-INF/services/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/resources/jackrabbit-rmi-service.xml
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/resources/jackrabbit-rmi-service.xml
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/apache/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/apache/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/ConformanceTest.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/apache/jackrabbit/rmi/RepositoryStubImpl.java
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/resources/
      - copied from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/resources/log4j.properties
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/log4j.properties
    jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/test/resources/repositoryStubImpl.properties
      - copied unchanged from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/resources/repositoryStubImpl.properties
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/   (props changed)
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/README.txt
      - copied, changed from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/pom.xml
      - copied, changed from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/AbstractRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/AbstractRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ContextRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ContextRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/FilterRepositoryFactory.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/FilterRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/JNDIBindingServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/JNDIBindingServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/JNDIRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/JNDIRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ServletRepository.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ServletRepository.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ServletRepositoryFactory.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/ServletRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/jackrabbit/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/jackrabbit/JackrabbitRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/jackrabbit/JackrabbitRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/AbstractLoginFilter.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/AbstractLoginFilter.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/BasicLoginFilter.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/BasicLoginFilter.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/ContainerLoginFilter.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/ContainerLoginFilter.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/NullLoginFilter.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/login/NullLoginFilter.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/JNDIRemoteBindingServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/JNDIRemoteBindingServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/JNDIRemoteRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/JNDIRemoteRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RemoteBindingServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RemoteBindingServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RemoteRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RemoteRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/URLRemoteBindingServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/URLRemoteBindingServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/URLRemoteRepositoryServlet.java
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/URLRemoteRepositoryServlet.java
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/
      - copied from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/META-INF/
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt   (props changed)
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt   (props changed)
      - copied unchanged from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt
Removed:
    jackrabbit/branches/2.0/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/RMIRepositoryStub.java
Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/RELEASE-NOTES.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java
    jackrabbit/branches/2.0/jackrabbit-parent/pom.xml
    jackrabbit/branches/2.0/jackrabbit-spi2jcr/pom.xml
    jackrabbit/branches/2.0/jackrabbit-webapp/pom.xml
    jackrabbit/branches/2.0/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
    jackrabbit/branches/2.0/pom.xml

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,900305,900310,900314,900453,900702,900736,900762-900763,900767,901095,901122
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,900305,900310,900314,900453,900702,900736,900762-900763,900767,901095,901122,901139,901170,901176

Modified: jackrabbit/branches/2.0/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/RELEASE-NOTES.txt?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/2.0/RELEASE-NOTES.txt Wed Jan 20 13:22:14 2010
@@ -17,7 +17,8 @@
 
   * Upgrade to JCR 2.0. This Jackrabbit release implements and is based
     on the official JCR 2.0 API. All of the features required by the
-    JSR 283 specification have been implemented.
+    JSR 283 specification have been implemented. Note that the remote
+    access layers (RMI and WebDAV) only support a subset of JCR 2.0.
 
   * Upgrade to Java 5. All of Jackrabbit (except the jcr-tests component)
     now requires Java 5 as the base platform. Java 1.4 environments are no
@@ -28,9 +29,9 @@
     that had been deprecated during the 1.x release cycle.
 
   * Separate JCR Commons components. Many of the general-purpose JCR
-    components like JCR-RMI and OCM are now developed and released
-    separately from the Jackrabbit content repository. See the individual
-    components for their most recent releases.
+    components like OCM are now developed and released separately from
+    the Jackrabbit content repository. See the individual components
+    for their most recent releases.
 
   * Database connection pooling is now available for all database backends.
     Non-pooled versions of the bundle persistence managers are still
@@ -52,6 +53,11 @@
     is not required for Oracle versions since 10R1. Use the Oracle9FileSystem
     class if you need support for Oracle 9 or earlier.
 
+  * Modified support of XA transactions over RMI. Instead of implementing
+    the org.apache.jackrabbit.api.XASession interface, JCR-RMI now makes the
+    client session implement the javax.transaction.xa.XAResource interface
+    directly whenever the server session does so.
+
 For more detailed information about all the changes in this and other
 Jackrabbit releases, please see the Jackrabbit issue tracker at
 

Modified: jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java Wed Jan 20 13:22:14 2010
@@ -82,6 +82,14 @@
     }
 
     /**
+     * Protected constructor for subclasses that want to override the
+     * {@link #getRepository()} method.
+     */
+    protected ProxyRepository() {
+        this.factory = null;
+    }
+
+    /**
      * Returns the proxied repository. Subclasses can override this
      * method to implement custom repository access mechanisms.
      *

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+.*
+target
+*.iml
+*.ipr
+*.iws

Copied: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/README.txt (from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-rmi/README.txt?p2=jackrabbit/branches/2.0/jackrabbit-jcr-rmi/README.txt&p1=jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt&r1=901139&r2=901184&rev=901184&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-rmi/README.txt Wed Jan 20 13:22:14 2010
@@ -1,44 +1,8 @@
 ===================================================
 Apache Jackrabbit JCR-RMI
-<http://jackrabbit.apache.org/commons/jcr-rmi.html>
 ===================================================
 
 JCR-RMI is a transparent Remote Method Invocation (RMI) layer for JCR.
 The layer makes it possible to remotely access JCR content repositories
 and is compatible with all JCR implementations.
 
-JCR-RMI is a part of the JCR Commons subproject of Apache Jackrabbit.
-Jackrabbit is a project of the Apache Software Foundation.
-
-Build instructions
-==================
-
-To build JCR-RMI, run the following command in this directory:
-
-    mvn clean install
-
-You need Java 5 (or higher) and Maven 2.0.9 (or higher) to do this.
-
-After the build finishes successfully, you can find the compiled JCR-RMI
-component in ./target/. The component will also have been installed
-in your local Maven repository.
-
-License (see also LICENSE.txt)
-==============================
-
-Collective work: Copyright 2010 The Apache Software Foundation.
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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.

Copied: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml (from r901139, jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml?p2=jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml&p1=jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml&r1=901139&r2=901184&rev=901184&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml Wed Jan 20 13:22:14 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
 
@@ -160,13 +160,13 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,2 @@
+/jackrabbit/branches/1.3/jackrabbit-jcr-rmi/pom.xml:631261
+/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml:901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,6 @@
+/jackrabbit/branches/1.3/jackrabbit-jcr-rmi/src:631261
+/jackrabbit/branches/1.5/jackrabbit-jcr-rmi/src:794012,794100,794102
+/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-rmi/src:774917-886178
+/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-rmi/src:812417-816332
+/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-rmi/src:795441-795863
+/jackrabbit/trunk/jackrabbit-jcr-rmi/src:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,900305,900310,900314,900453,900702,900736,900762-900763,900767,901095,901122,901139,901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/DefaultContentHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/DefaultContentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+/jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/DefaultContentHandler.java:794012,794100,794102
+/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/DefaultContentHandler.java:774917-886178
+/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/DefaultContentHandler.java:812417-816332
+/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/DefaultContentHandler.java:795441-795863
+/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/DefaultContentHandler.java:901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id Revision Author Date

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+/jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/SerializingContentHandler.java:794012,794100,794102
+/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/SerializingContentHandler.java:774917-886178
+/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/SerializingContentHandler.java:812417-816332
+/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/SerializingContentHandler.java:795441-795863
+/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/SerializingContentHandler.java:901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/ProxyRepository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/ProxyRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+/jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java:794012,794100,794102
+/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java:774917-886178
+/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java:812417-816332
+/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/ProxyRepository.java:795441-795863
+/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/ProxyRepository.java:901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RepositoryFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RepositoryFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+/jackrabbit/branches/1.5/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/RepositoryFactory.java:794012,794100,794102
+/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/RepositoryFactory.java:774917-886178
+/jackrabbit/sandbox/JCR-2170/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/RepositoryFactory.java:812417-816332
+/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/RepositoryFactory.java:795441-795863
+/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RepositoryFactory.java:901170,901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 20 13:22:14 2010
@@ -0,0 +1,5 @@
+target
+.*
+*.iml
+*.ipr
+*.iws

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/README.txt (from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-servlet/README.txt?p2=jackrabbit/branches/2.0/jackrabbit-jcr-servlet/README.txt&p1=jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt&r1=901170&r2=901184&rev=901184&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-servlet/README.txt Wed Jan 20 13:22:14 2010
@@ -1,44 +1,8 @@
 =======================================================
 Apache Jackrabbit JCR Servlets
-<http://jackrabbit.apache.org/commons/jcr-servlet.html>
 =======================================================
 
 JCR Servlets is a collection of servlets and other classes designed to
 make it easier to use Jackrabbit and other JCR content repositories in
 web applications.
 
-JCR Servlets is a part of the JCR Commons subproject of Apache Jackrabbit.
-Jackrabbit is a project of the Apache Software Foundation.
-
-Build instructions
-==================
-
-To build JCR Servlets, run the following command in this directory:
-
-    mvn clean install
-
-You need Java 1.4 (or higher) and Maven 2.0.9 (or higher) to do this.
-
-After the build finishes successfully, you can find the compiled JCR Servlets
-component in ./target/. The component will also have been installed in your
-local Maven repository.
-
-License (see also LICENSE.txt)
-==============================
-
-Collective work: Copyright 2009 The Apache Software Foundation.
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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.

Copied: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/pom.xml (from r901170, jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-servlet/pom.xml?p2=jackrabbit/branches/2.0/jackrabbit-jcr-servlet/pom.xml&p1=jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml&r1=901170&r2=901184&rev=901184&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-servlet/pom.xml Wed Jan 20 13:22:14 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
 
@@ -51,18 +51,18 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
   </dependencies>

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1 @@
+/jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/META-INF/LICENSE.txt:901176

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 20 13:22:14 2010
@@ -0,0 +1 @@
+/jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/resources/META-INF/NOTICE.txt:901176

Modified: jackrabbit/branches/2.0/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-parent/pom.xml?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-parent/pom.xml Wed Jan 20 13:22:14 2010
@@ -117,6 +117,34 @@
     </pluginManagement>
   </build>
 
+  <profiles>
+    <!-- JCR-661: The antrun tools.jar dependency is not needed on macs -->
+    <profile>
+      <id>non-mac</id>
+      <activation>
+        <os>
+          <family>!mac</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>sun</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.0</version>
+                <scope>system</scope>
+                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <reporting>
     <plugins>
       <plugin>
@@ -166,16 +194,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-rmi</artifactId>
-        <version>1.5.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-servlet</artifactId>
-        <version>1.5.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-jcr-benchmark</artifactId>
         <version>1.5.0</version>
       </dependency>

Modified: jackrabbit/branches/2.0/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-spi2jcr/pom.xml?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-spi2jcr/pom.xml Wed Jan 20 13:22:14 2010
@@ -137,11 +137,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr2spi</artifactId>
       <version>2.0-SNAPSHOT</version>
       <classifier>tests</classifier>

Modified: jackrabbit/branches/2.0/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-webapp/pom.xml?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-webapp/pom.xml Wed Jan 20 13:22:14 2010
@@ -52,10 +52,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-servlet</artifactId>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/branches/2.0/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java (original)
+++ jackrabbit/branches/2.0/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Wed Jan 20 13:22:14 2010
@@ -20,8 +20,8 @@
 import org.apache.jackrabbit.commons.repository.RepositoryFactory;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.jackrabbit.rmi.jackrabbit.JackrabbitServerAdapterFactory;
 import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
+import org.apache.jackrabbit.rmi.server.ServerAdapterFactory;
 import org.apache.jackrabbit.servlet.AbstractRepositoryServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -654,8 +654,8 @@
      */
     protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
 
-    	private static final RemoteAdapterFactory FACTORY =
-    		new JackrabbitServerAdapterFactory();
+        private static final RemoteAdapterFactory FACTORY =
+            new ServerAdapterFactory();
 
         public Remote createRemoteRepository(Repository repository)
                 throws RemoteException {

Modified: jackrabbit/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/pom.xml?rev=901184&r1=901183&r2=901184&view=diff
==============================================================================
--- jackrabbit/branches/2.0/pom.xml (original)
+++ jackrabbit/branches/2.0/pom.xml Wed Jan 20 13:22:14 2010
@@ -43,6 +43,8 @@
     <module>jackrabbit-core</module>
     <module>jackrabbit-webdav</module>
     <module>jackrabbit-jcr-server</module>
+    <module>jackrabbit-jcr-rmi</module>
+    <module>jackrabbit-jcr-servlet</module>
     <module>jackrabbit-webapp</module>
     <module>jackrabbit-jca</module>
     <module>jackrabbit-spi</module>



Mime
View raw message