AMQP-826: Fix package tangle

JIRA: https://jira.spring.io/browse/AMQP-826

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEvent.java renamed to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.amqp.rabbit.listener;
+package org.springframework.amqp.rabbit.core;
 
 import java.util.Map;
 

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BrokerEventListener.java renamed to spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BrokerEventListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.amqp.rabbit.listener;
+package org.springframework.amqp.rabbit.core;
 
 import java.util.Arrays;
 
@@ -32,7 +32,8 @@
 import org.springframework.amqp.rabbit.connection.Connection;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionListener;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
+import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.SmartLifecycle;

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/BrokerEventListenerTests.java

@@ -29,6 +29,8 @@
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.BrokerEvent;
+import org.springframework.amqp.rabbit.core.BrokerEventListener;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.junit.RabbitAvailable;
 import org.springframework.amqp.rabbit.junit.RabbitAvailableCondition;