From 5c8d7a45e3747a9cd770b77776f98a9020dfa099 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 00:25:43 +0000 Subject: QPID-5646: Detect and build against earlier versions of Proton. - This should detect any version of Proton that either uses pkg-config or native cmake config files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582139 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeLists.txt | 2 ++ qpid/cpp/CMakeModules/FindProton.cmake | 61 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 qpid/cpp/CMakeModules/FindProton.cmake diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index 837a71cd44..d057254d45 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -29,6 +29,8 @@ else() set (OPTIONAL_ARG OPTIONAL) endif() +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules) + # Parse the version from QPID_VERSION.txt. # Use the top level qpid/ file if we're in an SVN checkout, source dir otherwise. find_file(QPID_VERSION_FILE NAMES QPID_VERSION.txt PATHS ${PROJECT_SOURCE_DIR}/.. ${PROJECT_SOURCE_DIR} NO_DEFAULT_PATH) diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake new file mode 100644 index 0000000000..caf836d69a --- /dev/null +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -0,0 +1,61 @@ +# +# 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. +# + +include(FindPackageHandleStandardArgs) +include(FindPackageMessage) + +# First try to find the Installed Proton config (Proton 0.7 and later) +find_package(Proton CONFIG QUIET) +if (Proton_FOUND) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() +endif () + +# Now look for the cooky Proton config installed with some earlier +# versions of Proton +find_package(proton CONFIG QUIET) +if (proton_FOUND) + include("${proton_DIR}/libqpid-proton.cmake") + set (Proton_VERSION ${PROTON_VERSION}) + set (Proton_INCLUDE_DIRS ${PROTON_INCLUDE_DIRS}) + set (Proton_LIBRARIES ${PROTON_LIBRARIES}) + set (Proton_FOUND true) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() +endif () + +# Now look for any pkg-config configuration +find_package(PkgConfig QUIET) + +if (PKG_CONFIG_FOUND) + if (NOT Proton_FIND_VERSION) + pkg_check_modules(Proton libqpid-proton QUIET) + elseif(NOT Proton_FIND_VERSION_EXACT) + pkg_check_modules(Proton libqpid-proton>=${Proton_FIND_VERSION} QUIET) + else() + pkg_check_modules(Proton libqpid-proton=${Proton_FIND_VERSION} QUIET) + endif() + if (Proton_FOUND) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() + endif () +endif() + +# Proton not found print a standard error message +find_package_handle_standard_args(Proton CONFIG_MODE) -- cgit v1.2.1 From 5ca94ee652fad46fb9f05642d84e8d3bac00acef Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 05:01:49 +0000 Subject: QPID-5646: Fixes Proton detection to work with cmake 2.6 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582187 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeModules/FindProton.cmake | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake index caf836d69a..c5ab2d6c77 100644 --- a/qpid/cpp/CMakeModules/FindProton.cmake +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -21,7 +21,7 @@ include(FindPackageHandleStandardArgs) include(FindPackageMessage) # First try to find the Installed Proton config (Proton 0.7 and later) -find_package(Proton CONFIG QUIET) +find_package(Proton QUIET NO_MODULE) if (Proton_FOUND) find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") return() @@ -29,7 +29,7 @@ endif () # Now look for the cooky Proton config installed with some earlier # versions of Proton -find_package(proton CONFIG QUIET) +find_package(proton QUIET NO_MODULE) if (proton_FOUND) include("${proton_DIR}/libqpid-proton.cmake") set (Proton_VERSION ${PROTON_VERSION}) @@ -44,12 +44,17 @@ endif () find_package(PkgConfig QUIET) if (PKG_CONFIG_FOUND) + # Check for cmake 2.6 + if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") + set (FindPkgQUIET QUIET) + endif() + if (NOT Proton_FIND_VERSION) - pkg_check_modules(Proton libqpid-proton QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton) elseif(NOT Proton_FIND_VERSION_EXACT) - pkg_check_modules(Proton libqpid-proton>=${Proton_FIND_VERSION} QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton>=${Proton_FIND_VERSION}) else() - pkg_check_modules(Proton libqpid-proton=${Proton_FIND_VERSION} QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION}) endif() if (Proton_FOUND) find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") @@ -58,4 +63,6 @@ if (PKG_CONFIG_FOUND) endif() # Proton not found print a standard error message -find_package_handle_standard_args(Proton CONFIG_MODE) +if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") + find_package_handle_standard_args(Proton CONFIG_MODE) +endif() -- cgit v1.2.1 From ada81c79c8c8cae1ca8a1a14d8ccfd537391d5ce Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 27 Mar 2014 12:09:02 +0000 Subject: QPID-5639 : add dependency stub for cryptojs library git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582272 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/lib/poms/cryptojs-3.1.2.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 qpid/java/lib/poms/cryptojs-3.1.2.xml diff --git a/qpid/java/lib/poms/cryptojs-3.1.2.xml b/qpid/java/lib/poms/cryptojs-3.1.2.xml new file mode 100644 index 0000000000..2c07143af3 --- /dev/null +++ b/qpid/java/lib/poms/cryptojs-3.1.2.xml @@ -0,0 +1,22 @@ + + + + org.webjars + cryptojs + 3.1.2 + -- cgit v1.2.1 From db060e520106b321fcc686d9752b71c8f5cca105 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 15:01:56 +0000 Subject: QPID-5646: Fixes Proton detection to work with non standard pkg-config location git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582337 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeModules/FindProton.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake index c5ab2d6c77..e6eae5d9d9 100644 --- a/qpid/cpp/CMakeModules/FindProton.cmake +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -57,6 +57,8 @@ if (PKG_CONFIG_FOUND) pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION}) endif() if (Proton_FOUND) + find_library(Proton_LIBRARY ${Proton_LIBRARIES} HINTS ${Proton_LIBRARY_DIRS}) + set (Proton_LIBRARIES ${Proton_LIBRARY}) find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") return() endif () -- cgit v1.2.1 From c8ec1fb747a23ae61dca7879e43e0aecefb4a113 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Fri, 28 Mar 2014 12:38:10 +0000 Subject: QPID-5651: [C++ broker] segfault in qpid::linearstore::journal::jdir::clear_dir when declaring durable queue git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582730 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/linearstore/journal/jdir.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp index 36f180c21f..72b94d0098 100644 --- a/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp +++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp @@ -104,6 +104,7 @@ jdir::clear_dir(const std::string& dirname/*, const std::string& DIR* dir = open_dir(dirname, "clear_dir", true); if (!dir && create_flag) { create_dir(dirname); + dir = open_dir(dirname, "clear_dir", true); } //#ifndef RHM_JOWRITE struct dirent* entry; -- cgit v1.2.1 From 0ec3fc2ed0e3e8e80997cac72178925f7ba4f650 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 28 Mar 2014 15:50:04 +0000 Subject: QPID-5048: added basic cpp broker test profile Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582781 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/pom.xml | 50 +++++++++++++++++++++++++++++++++++- qpid/java/test-profiles/cpp.excludes | 2 ++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index fa2a5c486b..d1440b3e80 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -53,7 +53,7 @@ Documentation for the Qpid components can be accessed on our website at:${line.separator}http://qpid.apache.org/documentation.html - (java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10) + (java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp) ${project.build.directory}/license-maven-plugin @@ -655,6 +655,54 @@ + + cpp + + + profile + cpp + + + + cpp + cpp + spawned + Exception constructed + Listening on TCP + ${cpp-broker-dir}/qpidd -p @PORT --data-dir ${qpid.work}/@PORT -t --auth no --no-module-dir + + Excludes CPPExcludes ${profile}.excludes ${profile.specific.excludes} cpp.excludes + CPPPrefetchExcludes CPPTransientExcludes + v0_10 + true + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-cpp-broker-dir-defined + + enforce + + + + + cpp-broker-dir + You must set a the CPP broker directory property for this profile. (e.g. -Dcpp-broker-dir=/somedir/cpp/src) + + + true + + + + + + + + diff --git a/qpid/java/test-profiles/cpp.excludes b/qpid/java/test-profiles/cpp.excludes index c8fae1797e..2e7610e8e2 100644 --- a/qpid/java/test-profiles/cpp.excludes +++ b/qpid/java/test-profiles/cpp.excludes @@ -27,3 +27,5 @@ org.apache.qpid.test.client.message.JMSDestinationTest#testMovedToQueue // This test requires a broker capable of 0-8/9 and 0-10 org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend +//BDB System Tests +org.apache.qpid.server.store.berkeleydb.* -- cgit v1.2.1 From 99231e1918fb20c750e7261f531d31ecec12b8f1 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 28 Mar 2014 15:50:38 +0000 Subject: QPID-5048: modified deployment plugin config so only expected artifacts get deployed Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582782 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/qpid-perftests-systests/pom.xml | 11 ----------- qpid/java/qpid-systests-parent/pom.xml | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/qpid/java/qpid-perftests-systests/pom.xml b/qpid/java/qpid-perftests-systests/pom.xml index 4557e903ff..e77ad53334 100644 --- a/qpid/java/qpid-perftests-systests/pom.xml +++ b/qpid/java/qpid-perftests-systests/pom.xml @@ -115,16 +115,5 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml index eaea72cb22..e3633e4eb8 100644 --- a/qpid/java/qpid-systests-parent/pom.xml +++ b/qpid/java/qpid-systests-parent/pom.xml @@ -216,6 +216,16 @@ true + + + org.apache.maven.plugins + maven-deploy-plugin + + + true + + + -- cgit v1.2.1