From f636611caca7dfe1f6b7a2da6d0da530ffb6e502 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 2 Sep 2014 09:58:25 +0200
Subject: [PATCH] Revert "server: Add event bus bean as commented xml in
 META-INF core"

Breaks CloudStack startup. You're better off putting this on the wiki

This reverts commit c730bc3491f8b684c5ae51e0bff54cf7577cc246.
---
 .../core/spring-event-bus-context.xml         | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 server/resources/META-INF/cloudstack/core/spring-event-bus-context.xml

diff --git a/server/resources/META-INF/cloudstack/core/spring-event-bus-context.xml b/server/resources/META-INF/cloudstack/core/spring-event-bus-context.xml
deleted file mode 100644
index 3e1a8ed68a4..00000000000
--- a/server/resources/META-INF/cloudstack/core/spring-event-bus-context.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  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.
--->
-<!--
-<beans xmlns="http://www.springframework.org/schema/beans"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:context="http://www.springframework.org/schema/context"
-xmlns:aop="http://www.springframework.org/schema/aop"
-xsi:schemaLocation="http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-   <bean id="eventNotificationBus" class="org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus">
-      <property name="name" value="eventNotificationBus"/>
-      <property name="server" value="127.0.0.1"/>
-      <property name="port" value="5672"/>
-      <property name="username" value="guest"/>
-      <property name="password" value="guest"/>
-      <property name="exchange" value="cloudstack-events"/>
-   </bean>
-</beans>
--->