Author: rgreig
Date: Thu Nov 23 14:21:46 2006
New Revision: 478686

URL: http://svn.apache.org/viewvc?view=rev&rev=478686
Log:
Start of merge from trunk - some manual restructuring

Added:
    incubator/qpid/branches/new_persistence/java/broker/main/
      - copied from r477134, 
incubator/qpid/branches/new_persistence/java/broker/src/
    incubator/qpid/branches/new_persistence/java/broker/main/java/
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/AMQChannel.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/AMQChannel.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/exchange/DestNameExchange.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/exchange/DestNameExchange.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/exchange/DestWildExchange.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/exchange/DestWildExchange.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/exchange/HeadersExchange.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/exchange/HeadersExchange.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/AMQMessage.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/AMQMessage.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/AMQMessageHandle.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/AMQMessageHandle.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/AMQQueue.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/AMQQueue.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/InMemoryMessageHandle.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/InMemoryMessageHandle.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/MessageHandleFactory.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/MessageHandleFactory.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/DeliverMessageOperation.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/DeliverMessageOperation.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/LocalTransactionalContext.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/LocalTransactionalContext.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/NonTransactionalContext.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/NonTransactionalContext.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/StoreMessageOperation.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/StoreMessageOperation.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/TxnBuffer.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/TxnBuffer.java
    
incubator/qpid/branches/new_persistence/java/broker/main/org/apache/qpid/server/txn/TxnOp.java
      - copied unchanged from r478100, 
incubator/qpid/branches/new_persistence/java/broker/src/org/apache/qpid/server/txn/TxnOp.java
Removed:
    incubator/qpid/branches/new_persistence/java/broker/src/

Reply via email to