Error during merge. SVN reported a conflict but didn't when editing the conflict it didn't see any.... it was wrong.. or rather I should have checked the file.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@534883 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 264 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 15edb2289f..af0f5e534e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -1,4 +1,3 @@
-<<<<<<< .working
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -270,266 +269,4 @@ public class VirtualHost implements Accessable
     {
         return _virtualHostMBean;
     }
-}
-=======
-/*

- *

- * 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.virtualhost;

-

-import javax.management.NotCompliantMBeanException;

-

-import org.apache.commons.configuration.Configuration;

-import org.apache.log4j.Logger;

-import org.apache.qpid.server.AMQBrokerManagerMBean;

-import org.apache.qpid.server.security.access.AccessManager;

-import org.apache.qpid.server.security.access.AccessManagerImpl;

-import org.apache.qpid.server.security.access.Accessable;

-import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;

-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;

-import org.apache.qpid.server.configuration.Configurator;

-import org.apache.qpid.server.exchange.DefaultExchangeFactory;

-import org.apache.qpid.server.exchange.DefaultExchangeRegistry;

-import org.apache.qpid.server.exchange.ExchangeFactory;

-import org.apache.qpid.server.exchange.ExchangeRegistry;

-import org.apache.qpid.server.management.AMQManagedObject;

-import org.apache.qpid.server.management.ManagedObject;

-import org.apache.qpid.server.queue.DefaultQueueRegistry;

-import org.apache.qpid.server.queue.QueueRegistry;

-import org.apache.qpid.server.registry.ApplicationRegistry;

-import org.apache.qpid.server.store.MessageStore;

-

-public class VirtualHost implements Accessable

-{

-    private static final Logger _logger = Logger.getLogger(VirtualHost.class);

-

-

-    private final String _name;

-

-    private QueueRegistry _queueRegistry;

-

-    private ExchangeRegistry _exchangeRegistry;

-

-    private ExchangeFactory _exchangeFactory;

-

-    private MessageStore _messageStore;

-

-    protected VirtualHostMBean _virtualHostMBean;

-

-    private AMQBrokerManagerMBean _brokerMBean;

-

-    private AuthenticationManager _authenticationManager;

-

-    private AccessManager _accessManager;

-

-

-    public void setAccessableName(String name)

-    {

-        _logger.warn("Setting Accessable Name for VirualHost is not allowed. ("

-                     + name + ") ignored remains :" + getAccessableName());

-    }

-

-    public String getAccessableName()

-    {

-        return _name;

-    }

-

-

-    /**

-     * Abstract MBean class. This has some of the methods implemented from management intrerface for exchanges. Any

-     * implementaion of an Exchange MBean should extend this class.

-     */

-    public class VirtualHostMBean extends AMQManagedObject implements ManagedVirtualHost

-    {

-        public VirtualHostMBean() throws NotCompliantMBeanException

-        {

-            super(ManagedVirtualHost.class, "VirtualHost");

-        }

-

-        public String getObjectInstanceName()

-        {

-            return _name.toString();

-        }

-

-        public String getName()

-        {

-            return _name.toString();

-        }

-

-        public VirtualHost getVirtualHost()

-        {

-            return VirtualHost.this;

-        }

-

-

-    } // End of MBean class

-

-    /**

-     * Used for testing only

-     * @param name

-     * @param store

-     * @throws Exception

-     */

-    public VirtualHost(String name, MessageStore store) throws Exception

-    {

-        this(name, null, store);

-    }

-

-    /**

-     * Normal Constructor

-     * @param name

-     * @param hostConfig

-     * @throws Exception

-     */

-    public VirtualHost(String name, Configuration hostConfig) throws Exception

-    {

-        this(name, hostConfig, null);

-    }

-

-    private VirtualHost(String name, Configuration hostConfig, MessageStore store) throws Exception

-    {

-        _name = name;

-

-        _virtualHostMBean = new VirtualHostMBean();

-        // This isn't needed to be registered

-        //_virtualHostMBean.register();

-

-        _queueRegistry = new DefaultQueueRegistry(this);

-        _exchangeFactory = new DefaultExchangeFactory(this);

-        _exchangeRegistry = new DefaultExchangeRegistry(this);

-

-        if (store != null)

-        {

-            _messageStore = store;

-        }

-        else

-        {

-            if (hostConfig == null)

-            {

-                throw new IllegalAccessException("HostConfig and MessageStore cannot be null");

-            }

-            initialiseMessageStore(hostConfig);

-        }

-

-        _exchangeRegistry.initialise();

-

-        _logger.warn("VirtualHost authentication Managers require spec change to be operational.");

-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(name, hostConfig);

-

-        _accessManager = new AccessManagerImpl(name, hostConfig);

-

-        _brokerMBean = new AMQBrokerManagerMBean(_virtualHostMBean);

-        _brokerMBean.register();

-    }

-

-    private void initialiseMessageStore(Configuration config) throws Exception

-    {

-        String messageStoreClass = config.getString("store.class");

-

-        Class clazz = Class.forName(messageStoreClass);

-        Object o = clazz.newInstance();

-

-        if (!(o instanceof MessageStore))

-        {

-            throw new ClassCastException("Message store class must implement " + MessageStore.class + ". Class " + clazz +

-                                         " does not.");

-        }

-        _messageStore = (MessageStore) o;

-        _messageStore.configure(this, "store", config);

-    }

-

-

-    public <T> T getConfiguredObject(Class<T> instanceType, Configuration config)

-    {

-        T instance;

-        try

-        {

-            instance = instanceType.newInstance();

-        }

-        catch (Exception e)

-        {

-            _logger.error("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor");

-            throw new IllegalArgumentException("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor", e);

-        }

-        Configurator.configure(instance);

-

-        return instance;

-    }

-

-

-    public String getName()

-    {

-        return _name;

-    }

-

-    public QueueRegistry getQueueRegistry()

-    {

-        return _queueRegistry;

-    }

-

-    public ExchangeRegistry getExchangeRegistry()

-    {

-        return _exchangeRegistry;

-    }

-

-    public ExchangeFactory getExchangeFactory()

-    {

-        return _exchangeFactory;

-    }

-

-    public ApplicationRegistry getApplicationRegistry()

-    {

-        throw new UnsupportedOperationException();

-    }

-

-    public MessageStore getMessageStore()

-    {

-        return _messageStore;

-    }

-

-    public AuthenticationManager getAuthenticationManager()

-    {

-        return _authenticationManager;

-    }

-

-    public AccessManager getAccessManager()

-    {

-        return _accessManager;

-    }

-

-    public void close() throws Exception

-    {

-        if (_messageStore != null)

-        {

-            _messageStore.close();

-        }

-    }

-

-    public ManagedObject getBrokerMBean()

-    {

-        return _brokerMBean;

-    }

-

-    public ManagedObject getManagedObject()

-    {

-        return _virtualHostMBean;

-    }

-}

->>>>>>> .merge-right.r534117
+}
\ No newline at end of file