You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/07/26 23:31:10 UTC
svn commit: r1507464 - in /qpid/trunk/qpid/cpp: ./ bindings/
bindings/qmf/python/ bindings/qmf/ruby/ bindings/qmf/tests/ include/qmf/
include/qmf/engine/ include/qpid/agent/ src/ src/qmf/engine/
src/qpid/agent/ src/tests/
Author: astitcher
Date: Fri Jul 26 21:31:09 2013
New Revision: 1507464
URL: http://svn.apache.org/r1507464
Log:
QPID-4940: Remove obsolete qmf code
- Remove qmf1 engine code
- Remove qmf1 language bindings
- Remove qmf1 agent code (it depends on engine)
- Fix up cmake to build
Removed:
qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf/python/python.i
qpid/trunk/qpid/cpp/bindings/qmf/python/qmf.py
qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf/ruby/qmf.rb
qpid/trunk/qpid/cpp/bindings/qmf/ruby/ruby.i
qpid/trunk/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py
qpid/trunk/qpid/cpp/bindings/qmf/tests/python_console.py
qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb
qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests
qpid/trunk/qpid/cpp/bindings/qmf/tests/test_base.rb
qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h
qpid/trunk/qpid/cpp/include/qmf/engine/ConnectionSettings.h
qpid/trunk/qpid/cpp/include/qmf/engine/Console.h
qpid/trunk/qpid/cpp/include/qmf/engine/Event.h
qpid/trunk/qpid/cpp/include/qmf/engine/Message.h
qpid/trunk/qpid/cpp/include/qmf/engine/Object.h
qpid/trunk/qpid/cpp/include/qmf/engine/ObjectId.h
qpid/trunk/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h
qpid/trunk/qpid/cpp/include/qmf/engine/Query.h
qpid/trunk/qpid/cpp/include/qmf/engine/ResilientConnection.h
qpid/trunk/qpid/cpp/include/qmf/engine/Schema.h
qpid/trunk/qpid/cpp/include/qmf/engine/Typecode.h
qpid/trunk/qpid/cpp/include/qmf/engine/Value.h
qpid/trunk/qpid/cpp/include/qmf/qmfengine.i
qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h
qpid/trunk/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ConsoleImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/ConsoleImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/EventImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/EventImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/MessageImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/MessageImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.h
qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/ResilientConnection.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.h
qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.h
qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.cpp
qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.h
qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
qpid/trunk/qpid/cpp/src/tests/testagent.cpp
qpid/trunk/qpid/cpp/src/tests/testagent.xml
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1507464&r1=1507463&r2=1507464&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Fri Jul 26 21:31:09 2013
@@ -64,8 +64,7 @@ set_absolute_install_path (QPIDC_CONF_FI
set_absolute_install_path (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf)
install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
-install(FILES include/qmf/qmfengine.i
- include/qmf/qmf2.i
+install(FILES include/qmf/qmf2.i
DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf)
if (WIN32)
Modified: qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/CMakeLists.txt?rev=1507464&r1=1507463&r2=1507464&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/CMakeLists.txt Fri Jul 26 21:31:09 2013
@@ -81,7 +81,6 @@ if (SWIG_FOUND)
add_subdirectory(qpid/python)
add_subdirectory(qmf2/python)
- add_subdirectory(qmf/python)
endif (PYTHONLIBS_FOUND)
if (RUBY_FOUND)
@@ -93,7 +92,6 @@ if (SWIG_FOUND)
# string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_ARCH_DIR})
add_subdirectory(qpid/ruby)
add_subdirectory(qmf2/ruby)
- add_subdirectory(qmf/ruby)
endif (RUBY_FOUND)
if (PERLLIBS_FOUND)
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1507464&r1=1507463&r2=1507464&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Jul 26 21:31:09 2013
@@ -1373,30 +1373,6 @@ if (UNIX)
install (CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${QPID_LOCALSTATE_DIR}/spool/qpidd)")
endif (UNIX)
-set (qmf_SOURCES
- qpid/agent/ManagementAgentImpl.cpp
- qpid/agent/ManagementAgentImpl.h
- )
-set (qmf_HEADERS
- ../include/qpid/agent/ManagementAgent.h
- ../include/qpid/agent/QmfAgentImportExport.h
- ../include/qmf/BrokerImportExport.h
- )
-
-add_msvc_version (qmf library dll)
-add_library (qmf SHARED ${qmf_SOURCES})
-target_link_libraries (qmf qmfengine)
-set_target_properties (qmf PROPERTIES
- VERSION ${qmf_version}
- SOVERSION ${qmf_version_major})
-install (TARGETS qmf OPTIONAL
- DESTINATION ${QPID_INSTALL_LIBDIR}
- COMPONENT ${QPID_COMPONENT_QMF})
-install (FILES ${qmf_HEADERS}
- DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qpid/agent
- COMPONENT ${QPID_COMPONENT_QMF})
-install_pdb (qmf ${QPID_COMPONENT_QMF})
-
if (NOT WIN32)
set (qmf2_platform_headers
../include/qmf/posix/EventNotifier.h
@@ -1487,68 +1463,6 @@ endif (NOT WIN32)
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf2 ${QPID_COMPONENT_QMF})
-set (qmfengine_SOURCES
- qmf/engine/Agent.cpp
- qmf/engine/BrokerProxyImpl.cpp
- qmf/engine/BrokerProxyImpl.h
- qmf/engine/ConnectionSettingsImpl.cpp
- qmf/engine/ConnectionSettingsImpl.h
- qmf/engine/ConsoleImpl.cpp
- qmf/engine/ConsoleImpl.h
- qmf/engine/EventImpl.cpp
- qmf/engine/EventImpl.h
- qmf/engine/MessageImpl.cpp
- qmf/engine/MessageImpl.h
- qmf/engine/ObjectIdImpl.cpp
- qmf/engine/ObjectIdImpl.h
- qmf/engine/ObjectImpl.cpp
- qmf/engine/ObjectImpl.h
- qmf/engine/Protocol.cpp
- qmf/engine/Protocol.h
- qmf/engine/QueryImpl.cpp
- qmf/engine/QueryImpl.h
- qmf/engine/SequenceManager.cpp
- qmf/engine/SequenceManager.h
- qmf/engine/SchemaImpl.cpp
- qmf/engine/SchemaImpl.h
- qmf/engine/ValueImpl.cpp
- qmf/engine/ValueImpl.h
- )
-
-set (qmfengine_HEADERS
- ../include/qmf/engine/Agent.h
- ../include/qmf/engine/ConnectionSettings.h
- ../include/qmf/engine/Console.h
- ../include/qmf/engine/Event.h
- ../include/qmf/engine/Message.h
- ../include/qmf/engine/Object.h
- ../include/qmf/engine/ObjectId.h
- ../include/qmf/engine/QmfEngineImportExport.h
- ../include/qmf/engine/Query.h
- ../include/qmf/engine/ResilientConnection.h
- ../include/qmf/engine/Schema.h
- ../include/qmf/engine/Typecode.h
- ../include/qmf/engine/Value.h
- )
-install (FILES ${qmfengine_HEADERS}
- DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf/engine
- COMPONENT ${QPID_COMPONENT_QMF})
-
-if (NOT WIN32)
- list(APPEND qmfengine_SOURCES qmf/engine/ResilientConnection.cpp)
-endif (NOT WIN32)
-add_msvc_version (qmfengine library dll)
-
-add_library (qmfengine SHARED ${qmfengine_SOURCES})
-target_link_libraries (qmfengine qpidclient)
-set_target_properties (qmfengine PROPERTIES
- VERSION ${qmfengine_version}
- SOVERSION ${qmfengine_version_major})
-install (TARGETS qmfengine OPTIONAL
- DESTINATION ${QPID_INSTALL_LIBDIR}
- COMPONENT ${QPID_COMPONENT_QMF})
-install_pdb (qmfengine ${QPID_COMPONENT_QMF})
-
set (qmfconsole_SOURCES
qpid/console/Agent.cpp
qpid/console/Broker.cpp
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org