db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oyste...@apache.org
Subject svn commit: r634706 - in /db/derby/code/trunk: java/engine/org/apache/derby/ java/engine/org/apache/derby/iapi/services/replication/ java/engine/org/apache/derby/iapi/store/raw/log/ java/engine/org/apache/derby/iapi/store/replication/ java/engine/org/a...
Date Fri, 07 Mar 2008 15:10:58 GMT
Author: oysteing
Date: Fri Mar  7 07:10:54 2008
New Revision: 634706

URL: http://svn.apache.org/viewvc?rev=634706&view=rev
Log:
DERBY-3432: Move replication code from org.apache.derby.impl.services.replication to o.a.d.i.store.replication
Contributed by Jorgen Loland.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/
      - copied from r634684, db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/replication/
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/replication/master/
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/replication/slave/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/
      - copied from r634684, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
      - copied, changed from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/ReplicationLogger.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/buffer/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/master/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/net/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/
      - copied from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/slave/
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/replication/
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferFullException.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/LogShipper.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessage.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SlaveAddress.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
    db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/project.xml

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java Fri
Mar  7 07:10:54 2008
@@ -23,7 +23,7 @@
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.property.PersistentSet;
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
 import org.apache.derby.iapi.store.raw.data.DataFactory;
 import org.apache.derby.iapi.store.raw.Corruptable;
 import org.apache.derby.iapi.store.raw.RawStoreFactory;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 /*
  
    Derby - Class
-   org.apache.derby.iapi.services.replication.master.MasterFactory
+   org.apache.derby.iapi.store.replication.master.MasterFactory
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
 */
 
-package org.apache.derby.iapi.services.replication.master;
+package org.apache.derby.iapi.store.replication.master;
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.reference.Property;
@@ -70,7 +70,7 @@
 
     /** The name of the Master Factory, used to boot the service.  */
     public static final String MODULE =
-        "org.apache.derby.iapi.services.replication.master.MasterFactory";
+        "org.apache.derby.iapi.store.replication.master.MasterFactory";
 
     /* Property names that are used as key values in the Properties objects*/
     

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 /*
  
    Derby - Class
-   org.apache.derby.iapi.services.replication.slave.SlaveFactory
+   org.apache.derby.iapi.store.replication.slave.SlaveFactory
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
 */
 
-package org.apache.derby.iapi.services.replication.slave;
+package org.apache.derby.iapi.store.replication.slave;
 
 import org.apache.derby.iapi.error.StandardException;
 
@@ -44,7 +44,7 @@
 
     /** The name of the Slave Factory, used to boot the service.  */
     public static final String MODULE =
-        "org.apache.derby.iapi.services.replication.slave.SlaveFactory";
+        "org.apache.derby.iapi.store.replication.slave.SlaveFactory";
 
     /* Strings used as keys in the Properties objects*/
 
@@ -138,8 +138,8 @@
      *
      * @exception StandardException Thrown if slave is connected with
      * master
-     * @see org.apache.derby.iapi.services.replication.master.MasterFactory
-     * @see org.apache.derby.impl.services.replication.master.MasterController#flushedTo
+     * @see org.apache.derby.iapi.store.replication.master.MasterFactory
+     * @see org.apache.derby.impl.store.replication.master.MasterController#flushedTo
      */
     public void failover() throws StandardException;
     

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java Fri Mar  7
07:10:54 2008
@@ -73,7 +73,7 @@
 import org.apache.derby.io.StorageFile;
 import org.apache.derby.catalog.UUID;
 
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java Fri Mar  7
07:10:54 2008
@@ -29,7 +29,7 @@
 import org.apache.derby.iapi.services.context.ContextManager;
 import org.apache.derby.iapi.services.context.ContextService;
 import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
 
 import java.sql.Driver;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Fri Mar
 7 07:10:54 2008
@@ -48,8 +48,8 @@
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
 import org.apache.derby.iapi.store.access.XATransactionController;
 
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 
 /* can't import due to name overlap:
 import java.sql.Connection;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java Fri Mar
 7 07:10:54 2008
@@ -88,8 +88,8 @@
 import java.security.PrivilegedExceptionAction;
 import java.lang.SecurityException;
 
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 
 /**
 	A Raw store that implements the RawStoreFactory module by delegating all the

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
Fri Mar  7 07:10:54 2008
@@ -36,7 +36,7 @@
 
 import org.apache.derby.iapi.services.io.FormatIdOutputStream;
 import org.apache.derby.iapi.services.io.ArrayOutputStream;
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
 import org.apache.derby.iapi.store.raw.RawStoreFactory;
 
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Fri
Mar  7 07:10:54 2008
@@ -74,8 +74,8 @@
 import org.apache.derby.iapi.services.property.PersistentSet;
 
 //for replication
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 import org.apache.derby.iapi.services.io.ArrayInputStream;
 
 import org.apache.derby.iapi.store.access.DatabaseInstant;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java Fri
Mar  7 07:10:54 2008
@@ -37,7 +37,7 @@
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 import org.apache.derby.iapi.store.raw.log.Logger;
 import org.apache.derby.iapi.store.raw.log.LogScan;
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
 
 import org.apache.derby.iapi.store.raw.data.DataFactory;
 import org.apache.derby.iapi.store.raw.xact.TransactionFactory;

Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
(from r634705, db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/ReplicationLogger.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/ReplicationLogger.java&r1=634705&r2=634706&rev=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/replication/ReplicationLogger.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 /*
  
    Derby - Class
-   org.apache.derby.impl.services.replication.ReplicationLogger
+   org.apache.derby.impl.store.replication.ReplicationLogger
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication;
+package org.apache.derby.impl.store.replication;
 
 import java.util.Date;
 import org.apache.derby.iapi.reference.MessageId;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.services.replication.buffer.LogBufferElement
+   Derby - Class org.apache.derby.impl.store.replication.buffer.LogBufferElement
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
 
  */
 
-package org.apache.derby.impl.services.replication.buffer;
+package org.apache.derby.impl.store.replication.buffer;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferFullException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferFullException.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferFullException.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/LogBufferFullException.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.services.replication.buffer.LogBufferFullException
+   Derby - Class org.apache.derby.impl.store.replication.buffer.LogBufferFullException
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
 
  */
 
-package org.apache.derby.impl.services.replication.buffer;
+package org.apache.derby.impl.store.replication.buffer;
 
 public class LogBufferFullException extends Exception{
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.services.replication.buffer.ReplicationLogBuffer
+   Derby - Class org.apache.derby.impl.store.replication.buffer.ReplicationLogBuffer
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,14 +19,14 @@
 
 */
 
-package org.apache.derby.impl.services.replication.buffer;
+package org.apache.derby.impl.store.replication.buffer;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import java.util.NoSuchElementException;
 import java.util.LinkedList;
 
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
 
 /**
  * Used for the replication master role only. When a Derby instance

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.master.AsynchronousLogShipper
+   Derby - Class org.apache.derby.impl.store.replication.master.AsynchronousLogShipper
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.master;
+package org.apache.derby.impl.store.replication.master;
 
 import java.io.IOException;
 import java.util.NoSuchElementException;
@@ -30,10 +30,10 @@
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-import org.apache.derby.impl.services.replication.ReplicationLogger;
-import org.apache.derby.impl.services.replication.buffer.ReplicationLogBuffer;
-import org.apache.derby.impl.services.replication.net.ReplicationMessage;
-import org.apache.derby.impl.services.replication.net.ReplicationMessageTransmit;
+import org.apache.derby.impl.store.replication.ReplicationLogger;
+import org.apache.derby.impl.store.replication.buffer.ReplicationLogBuffer;
+import org.apache.derby.impl.store.replication.net.ReplicationMessage;
+import org.apache.derby.impl.store.replication.net.ReplicationMessageTransmit;
 
 /**
  * <p>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/LogShipper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/LogShipper.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/LogShipper.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/LogShipper.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.master.LogShipper
+   Derby - Class org.apache.derby.impl.store.replication.master.LogShipper
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.master;
+package org.apache.derby.impl.store.replication.master;
 
 import java.io.IOException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 /*
  
    Derby - Class
-   org.apache.derby.impl.services.replication.master.MasterController
+   org.apache.derby.impl.store.replication.master.MasterController
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
 */
 
-package org.apache.derby.impl.services.replication.master;
+package org.apache.derby.impl.store.replication.master;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
@@ -38,13 +38,13 @@
 import org.apache.derby.iapi.store.raw.log.LogFactory;
 import org.apache.derby.iapi.store.raw.data.DataFactory;
 
-import org.apache.derby.iapi.services.replication.master.MasterFactory;
+import org.apache.derby.iapi.store.replication.master.MasterFactory;
 
-import org.apache.derby.impl.services.replication.net.ReplicationMessage;
-import org.apache.derby.impl.services.replication.ReplicationLogger;
-import org.apache.derby.impl.services.replication.net.ReplicationMessageTransmit;
-import org.apache.derby.impl.services.replication.buffer.ReplicationLogBuffer;
-import org.apache.derby.impl.services.replication.buffer.LogBufferFullException;
+import org.apache.derby.impl.store.replication.net.ReplicationMessage;
+import org.apache.derby.impl.store.replication.ReplicationLogger;
+import org.apache.derby.impl.store.replication.net.ReplicationMessageTransmit;
+import org.apache.derby.impl.store.replication.buffer.ReplicationLogBuffer;
+import org.apache.derby.impl.store.replication.buffer.LogBufferFullException;
 
 import java.util.Properties;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessage.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessage.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessage.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.net.ReplicationMessage
+   Derby - Class org.apache.derby.impl.store.replication.net.ReplicationMessage
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.net;
+package org.apache.derby.impl.store.replication.net;
 
 import java.io.Externalizable;
 import java.io.IOException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.net.ReplicationMessageReceive
+   Derby - Class org.apache.derby.impl.store.replication.net.ReplicationMessageReceive
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.net;
+package org.apache.derby.impl.store.replication.net;
 
 import java.io.IOException;
 import java.net.ServerSocket;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.net.ReplicationMessageTransmit
+   Derby - Class org.apache.derby.impl.store.replication.net.ReplicationMessageTransmit
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
    limitations under the License.
  
  */
-package org.apache.derby.impl.services.replication.net;
+package org.apache.derby.impl.store.replication.net;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SlaveAddress.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SlaveAddress.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SlaveAddress.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SlaveAddress.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.net.SlaveAddress
+   Derby - Class org.apache.derby.impl.store.replication.net.SlaveAddress
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.net;
+package org.apache.derby.impl.store.replication.net;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SocketConnection.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.impl.services.replication.net.SocketConnection
+   Derby - Class org.apache.derby.impl.store.replication.net.SocketConnection
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.net;
+package org.apache.derby.impl.store.replication.net;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
Fri Mar  7 07:10:54 2008
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.services.replication.slave.ReplicationLogScan
+   Derby - Class org.apache.derby.impl.store.replication.slave.ReplicationLogScan
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
 
  */
 
-package org.apache.derby.impl.services.replication.slave;
+package org.apache.derby.impl.store.replication.slave;
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.reference.SQLState;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
Fri Mar  7 07:10:54 2008
@@ -1,7 +1,7 @@
 /*
  
    Derby - Class
-   org.apache.derby.impl.services.replication.slave.SlaveController
+   org.apache.derby.impl.store.replication.slave.SlaveController
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +20,7 @@
  
  */
 
-package org.apache.derby.impl.services.replication.slave;
+package org.apache.derby.impl.store.replication.slave;
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.reference.Attribute;
@@ -35,10 +35,10 @@
 import org.apache.derby.iapi.store.raw.log.LogFactory;
 import org.apache.derby.impl.store.raw.log.LogToFile;
 
-import org.apache.derby.impl.services.replication.ReplicationLogger;
-import org.apache.derby.impl.services.replication.net.ReplicationMessage;
-import org.apache.derby.impl.services.replication.net.ReplicationMessageReceive;
-import org.apache.derby.iapi.services.replication.slave.SlaveFactory;
+import org.apache.derby.impl.store.replication.ReplicationLogger;
+import org.apache.derby.impl.store.replication.net.ReplicationMessage;
+import org.apache.derby.impl.store.replication.net.ReplicationMessageReceive;
+import org.apache.derby.iapi.store.replication.slave.SlaveFactory;
 
 import java.io.EOFException;
 import java.io.IOException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Fri Mar  7 07:10:54
2008
@@ -323,10 +323,10 @@
 cloudscape.config.rawStore=derby
 
 # Replication Master
-derby.module.replication.master=org.apache.derby.impl.services.replication.master.MasterController
+derby.module.replication.master=org.apache.derby.impl.store.replication.master.MasterController
 cloudscape.config.replication.master=derby
 # Replication Slave
-derby.module.replication.slave=org.apache.derby.impl.services.replication.slave.SlaveController
+derby.module.replication.slave=org.apache.derby.impl.store.replication.slave.SlaveController
 cloudscape.config.replication.slave=derby
 
 #

Modified: db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/project.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/project.xml?rev=634706&r1=634705&r2=634706&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/project.xml (original)
+++ db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/project.xml Fri Mar  7 07:10:54 2008
@@ -3,11 +3,11 @@
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
-            <name>derby</name>
+            <name>derby-repl</name>
         </general-data>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
             <!-- Do not use Project Properties customizer when editing this file manually.
-->
-            <name>derby</name>
+            <name>derby-repl</name>
             <properties>
                 <property name="project.dir">../../../..</property>
                 <property name="ant.script">${project.dir}/build.xml</property>
@@ -69,6 +69,11 @@
                     <label>java/tools</label>
                     <type>java</type>
                     <location>${project.dir}/java/tools</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>derby-repl</label>
+                    <location>.</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>



Mime
View raw message