You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/12/02 17:28:46 UTC
svn commit: r481575 -
/directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/
Author: akarasulu
Date: Sat Dec 2 08:28:42 2006
New Revision: 481575
URL: http://svn.apache.org/viewvc?view=rev&rev=481575
Log:
committing some old code I was toying with regarding replication configuration info
Added:
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/NotificationScheme.java
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationTrigger.java
- copied, changed from r479506, directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationSchedule.java
Removed:
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationGroup.java
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationSchedule.java
Modified:
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/Replica.java
directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java
Added: directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/NotificationScheme.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/NotificationScheme.java?view=auto&rev=481575
==============================================================================
--- directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/NotificationScheme.java (added)
+++ directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/NotificationScheme.java Sat Dec 2 08:28:42 2006
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.directory.server.replication.configuration;
+
+/**
+ * Document me!
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class NotificationScheme
+{
+
+}
Modified: directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/Replica.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/Replica.java?view=diff&rev=481575&r1=481574&r2=481575
==============================================================================
--- directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/Replica.java (original)
+++ directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/Replica.java Sat Dec 2 08:28:42 2006
@@ -19,6 +19,10 @@
*/
package org.apache.directory.server.replication.configuration;
+
+import java.net.InetSocketAddress;
+
+
/**
* Document me!
*
@@ -27,5 +31,30 @@
*/
public class Replica
{
+ private ReplicaId id;
+ private InetSocketAddress address;
+
+
+ public void setId( ReplicaId id )
+ {
+ this.id = id;
+ }
+
+
+ public ReplicaId getId()
+ {
+ return id;
+ }
+
+
+ public void setAddress( InetSocketAddress address )
+ {
+ this.address = address;
+ }
+
+ public InetSocketAddress getAddress()
+ {
+ return address;
+ }
}
Modified: directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java?view=diff&rev=481575&r1=481574&r2=481575
==============================================================================
--- directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java (original)
+++ directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java Sat Dec 2 08:28:42 2006
@@ -20,6 +20,7 @@
package org.apache.directory.server.replication.configuration;
+import java.util.List;
import java.util.Set;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -67,9 +68,9 @@
Set<String> inclusions;
/**
- * The replication group composing this agreement.
+ * The replication group (list of replicas) composing this agreement.
*/
- ReplicationGroup replicationGroup;
+ List<Replica> replicationGroup;
/**
* The replicatin area defined as a subtreeSpecification.
@@ -82,7 +83,8 @@
LdapDN replicationBase;
/**
- * The schedule to use for initiating replication cycles. This may be:
+ * The schedule to use for initiating replication cycles. You can have more than
+ * one trigger assigned to initiate replication. This may be:
* <ul>
* <li>periodic</li>
* <li>manual</li>
@@ -92,5 +94,10 @@
* <li>minimum time after the last replication cycle</li>
* </ul>
*/
- ReplicationSchedule replicationSchedule;
+ Set<ReplicationTrigger> replicationSchedule;
+
+ /**
+ * Who to notify, why and how.
+ */
+ NotificationScheme notificationScheme;
}
Copied: directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationTrigger.java (from r479506, directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationSchedule.java)
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationTrigger.java?view=diff&rev=481575&p1=directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationSchedule.java&r1=479506&p2=directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationTrigger.java&r2=481575
==============================================================================
--- directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationSchedule.java (original)
+++ directory/trunks/apacheds/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationTrigger.java Sat Dec 2 08:28:42 2006
@@ -26,6 +26,6 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public interface ReplicationSchedule
+public interface ReplicationTrigger
{
}