From aeb2793707799a2d459888fc0ed0dd9faf1c7c78 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Wed, 30 Apr 2014 13:08:49 +0000 Subject: QPID-5715,QPID-5412: Add remote replication nodes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1591281 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/model/BrokerModel.java | 1 + .../qpid/server/model/RemoteReplicationNode.java | 29 ++++++++++++++++++++++ .../apache/qpid/server/model/VirtualHostNode.java | 5 ++++ .../AbstractStandardVirtualHostNode.java | 10 +++++++- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RemoteReplicationNode.java (limited to 'qpid/java/broker-core') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java index 8d742b2bbd..20adad0afe 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java @@ -72,6 +72,7 @@ public final class BrokerModel extends Model addRelationship(Broker.class, Plugin.class); addRelationship(VirtualHostNode.class, VirtualHost.class); + addRelationship(VirtualHostNode.class, RemoteReplicationNode.class); addRelationship(VirtualHost.class, Exchange.class); addRelationship(VirtualHost.class, Queue.class); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RemoteReplicationNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RemoteReplicationNode.java new file mode 100644 index 0000000000..21cbfcf194 --- /dev/null +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/RemoteReplicationNode.java @@ -0,0 +1,29 @@ +/* + * + * 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.qpid.server.model; + +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.ManagedObject; + +@ManagedObject(category=true, managesChildren=false, creatable=false) +public interface RemoteReplicationNode> extends ConfiguredObject +{ +} diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java index 8d80ad19d7..5f536b0467 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java @@ -20,6 +20,8 @@ */ package org.apache.qpid.server.model; +import java.util.Collection; + import org.apache.qpid.server.store.DurableConfigurationStore; @ManagedObject(category=true, managesChildren=false) @@ -33,4 +35,7 @@ public interface VirtualHostNode> extends Configure VirtualHost getVirtualHost(); DurableConfigurationStore getConfigurationStore(); + + @SuppressWarnings("rawtypes") + Collection getRemoteReplicationNodes(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java index 72c619ec1c..12a379f9ca 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java @@ -22,17 +22,19 @@ package org.apache.qpid.server.virtualhostnode; import java.io.File; import java.security.PrivilegedAction; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; import org.apache.log4j.Logger; - import org.apache.qpid.server.logging.messages.ConfigStoreMessages; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.RemoteReplicationNode; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.VirtualHostNode; @@ -155,6 +157,12 @@ public abstract class AbstractStandardVirtualHostNode> getRemoteReplicationNodes() + { + return Collections.emptyList(); + } + // protected for unit testing purposes protected Map getDefaultMessageStoreSettings() { -- cgit v1.2.1