Remove rabbitmq support

We are not using them and it is not manained Change-Id: Ic701307c42190e0f994c59ce18cacf98f9041e39
coolfat · May 23, 2016 · 842938c · 842938c
1 parent 140f1ba
commit 842938c
Show file tree

Hide file tree

Showing 23 changed files with 2 additions and 1,786 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,6 @@ pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.5)
 pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.5>=1.7.0~0)
 pkg_check_modules(GSTREAMER_SDP REQUIRED gstreamer-sdp-1.5>=1.7.0~0)
 pkg_check_modules(EVENT REQUIRED libevent>=2.0.16-stable)
-pkg_check_modules(RABBITMQ REQUIRED librabbitmq>=0.4.1)
 
 add_subdirectory(server)
 

diff --git a/debian/control b/debian/control
@@ -16,8 +16,7 @@ Build-Depends:
  libboost-thread-dev,
  libboost-log-dev,
  libevent-dev,
- libssl-dev,
- librabbitmq-dev
+ libssl-dev
 Standards-Version: 3.9.4
 
 Package: kurento-media-server-6.0

diff --git a/kurento.conf.info b/kurento.conf.info
@@ -23,13 +23,5 @@ mediaServer
 ;         password ""
 ;       }
     }
-;     rabbitmq
-;     {
-;       address 127.0.0.1
-;       port 5672
-;       username guest
-;       password guest
-;       vhost /
-;     }
   }
 }
diff --git a/kurento.conf.ini b/kurento.conf.ini
@@ -19,11 +19,3 @@ threads=10
 ; [mediaServer.net.websocket.registrar]
 ; address=ws://localhost:9090
 ; localAddress=localhost
-
-; [mediaServer.net.rabbitmq]
-; address=127.0.0.1
-; port=5672
-; username=guest
-; password=guest
-; vhost=/
-
diff --git a/kurento.conf.json b/kurento.conf.json
@@ -9,16 +9,6 @@
         "garbageCollectorPeriod": 240
     },
     "net" : {
-      // Uncomment just one of them
-      /*
-      "rabbitmq": {
-        "address" : "127.0.0.1",
-        "port" : 5672,
-        "username" : "guest",
-        "password" : "guest",
-        "vhost" : "/"
-      }
-      */
       "websocket": {
         "port": 8888,
         //"secure": {

diff --git a/server/transport/CMakeLists.txt b/server/transport/CMakeLists.txt
@@ -7,26 +7,22 @@ set (TRANSPORT_SOURCES
 
 add_library (transport ${TRANSPORT_SOURCES})
 
-add_dependencies(transport rabbitMQTransport)
+add_dependencies(transport websocketTransport)
 
 target_link_libraries(transport
   ${GSTREAMER_LIBRARIES}
   ${KMSCORE_LIBRARIES}
-  rabbitMQTransport
   websocketTransport
 )
 
 set_property (TARGET transport
   PROPERTY INCLUDE_DIRECTORIES
     ${CMAKE_SOURCE_DIR}/server/signalHandler
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/rabbitmq/
     ${CMAKE_CURRENT_SOURCE_DIR}/websocket/
     ${GSTREAMER_INCLUDE_DIRS}
     ${GLIBMM_INCLUDE_DIRS}
     ${KMSCORE_INCLUDE_DIRS}
 )
 
-add_subdirectory(rabbitmq)
-
 add_subdirectory(websocket)
diff --git a/server/transport/TransportFactory.cpp b/server/transport/TransportFactory.cpp
@@ -20,7 +20,6 @@
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 #define GST_DEFAULT_NAME "KurentoTransportFactory"
 
-#include <RabbitMQTransportFactory.hpp>
 #include <WebSocketTransportFactory.hpp>
 
 namespace kurento
@@ -60,8 +59,6 @@ TransportFactory::StaticConstructor::StaticConstructor()
 {
   GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, GST_DEFAULT_NAME, 0,
                            GST_DEFAULT_NAME);
-  TransportFactory::registerFactory (std::shared_ptr<TransportFactory>
-                                     (new RabbitMQTransportFactory() ) );
   TransportFactory::registerFactory (std::shared_ptr<TransportFactory>
                                      (new WebSocketTransportFactory() ) );
 }

diff --git a/server/transport/rabbitmq/CMakeLists.txt b/server/transport/rabbitmq/CMakeLists.txt
diff --git a/server/transport/rabbitmq/ExponentialBackoffStrategy.cpp b/server/transport/rabbitmq/ExponentialBackoffStrategy.cpp
diff --git a/server/transport/rabbitmq/ExponentialBackoffStrategy.hpp b/server/transport/rabbitmq/ExponentialBackoffStrategy.hpp