Merge pull request #19 in ASAPO/asapo from Rename-hidra2-to-asapo to develop

* commit '0cd2bf30':
  rename

3d_party/ctest_junit_convert/conv.xsl

@@ -2,7 +2,7 @@
 <xsl:output method="xml" indent="yes"/>
 
 	<xsl:template match="/Site">
-		<testsuite name="hidrai2 tests">
+		<testsuite name="asapo tests">
 			<xsl:variable name="BuildName"><xsl:value-of select="@BuildName"/></xsl:variable>
 			<xsl:variable name="BuildStamp"><xsl:value-of select="@BuildStamp"/></xsl:variable>
 			<xsl:variable name="Name"><xsl:value-of select="@Name"/></xsl:variable>

CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
-project(HIDRA2)
+project(ASAPO)
 set(CMAKE_CXX_STANDARD 11)
 IF(WIN32)
     set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
@@ -11,21 +11,22 @@ ENDIF(WIN32)
 #TODO: Better way then GLOBAL PROPERTY
 IF(WIN32)
     find_package(Threads REQUIRED)
-    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
+    SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
 ELSEIF(UNIX)
-    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES Threads::Threads)
+    SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES Threads::Threads)
 ENDIF(WIN32)
 
 option(BUILD_TESTS "Uses googletest to build tests" OFF)
 option(BUILD_INTEGRATION_TESTS "Include integration tests (CMAKE >3.7 is needed)" OFF)
 option(BUILD_DOCS "Uses doxygen to build the documentaion" OFF)
 option(BUILD_BROKER "Build broker" OFF)
+
 option(BUILD_WORKER_TOOLS "Build worker tools" OFF)
 option(BUILD_EXAMPLES "Build examples" OFF)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/)
 
-set (HIDRA2_CXX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common/cpp/include)
+set (ASAPO_CXX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common/cpp/include)
 
 find_package (Threads)
 

CMakeModules/check_test.sh

@@ -4,7 +4,7 @@ set -e
 
 TARGET=$1
 BINARY_DIR=$2
-HIDRA2_MINIMUM_COVERAGE=$3
+ASAPO_MINIMUM_COVERAGE=$3
 
 make ${TARGET}
 
@@ -12,12 +12,12 @@ coverage=`cat ${BINARY_DIR}/${TARGET}.txt`
 if [ -z "$coverage" ]; then
  coverage=0
 fi
-if (( coverage < HIDRA2_MINIMUM_COVERAGE )); then
+if (( coverage < ASAPO_MINIMUM_COVERAGE )); then
 	exec >&2
 	echo
 	echo "*****"
 	echo
-	echo ${TARGET} coverage is ${coverage}% - less than required ${HIDRA2_MINIMUM_COVERAGE}%
+	echo ${TARGET} coverage is ${coverage}% - less than required ${ASAPO_MINIMUM_COVERAGE}%
 	echo	
 	echo "*****"
 	echo

CMakeModules/coverage_go.sh

 #!/bin/bash
 
 OUT_DIR=$1
-HIDRA2_MINIMUM_COVERAGE=$2
+ASAPO_MINIMUM_COVERAGE=$2
 
 export GOPATH=$GOPATH:$3
 
@@ -22,12 +22,12 @@ coverage=`go tool cover -func=$OUT_DIR/coverage-all.out | grep total | cut -d ")
 #firefox ./coverage.html &
 go tool cover -html=$OUT_DIR/coverage-all.out -o ${OUT_DIR}/coverage.html
 rm -rf ${OUT_DIR}/coverage-all.out ${OUT_DIR}/coverage.out
-if (( coverage < HIDRA2_MINIMUM_COVERAGE )); then
+if (( coverage < ASAPO_MINIMUM_COVERAGE )); then
 	exec >&2
 	echo
 	echo "*****"
 	echo
-	echo coverage is ${coverage}% - less than required ${HIDRA2_MINIMUM_COVERAGE}%
+	echo coverage is ${coverage}% - less than required ${ASAPO_MINIMUM_COVERAGE}%
 	echo	
 	echo "*****"
 	echo

CMakeModules/testing_cpp.cmake

@@ -3,7 +3,7 @@ if (BUILD_TESTS OR BUILD_INTEGRATION_TESTS OR BUILD_EXAMPLES)
 endif ()
 
 if (BUILD_TESTS)
-    set(HIDRA2_MINIMUM_COVERAGE 70)
+    set(ASAPO_MINIMUM_COVERAGE 70)
     find_package(Threads)
     find_program(MEMORYCHECK_COMMAND valgrind)
     set(MEMORYCHECK_COMMAND_OPTIONS
@@ -37,9 +37,9 @@ function(add_plain_unit_test target test_source_files linktarget)
         ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
         target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
-        GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-        message(STATUS "HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
-        target_link_libraries(test-${target} ${HIDRA2_COMMON_IO_LIBRARIES})
+        GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+        message(STATUS "ASAPO_COMMON_IO_LIBRARIES: '${ASAPO_COMMON_IO_LIBRARIES}'")
+        target_link_libraries(test-${target} ${ASAPO_COMMON_IO_LIBRARIES})
 
         if (NOT ${test_libraries} STREQUAL "")
             target_link_libraries(test-${target} ${test_libraries})
@@ -81,9 +81,9 @@ function(gtest target test_source_files linktarget)
         ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
         target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
-        GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-        message(STATUS "HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
-        target_link_libraries(test-${target} ${HIDRA2_COMMON_IO_LIBRARIES})
+        GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+        message(STATUS "ASAPO_COMMON_IO_LIBRARIES: '${ASAPO_COMMON_IO_LIBRARIES}'")
+        target_link_libraries(test-${target} ${ASAPO_COMMON_IO_LIBRARIES})
 
         if (NOT ${test_libraries} STREQUAL "")
             target_link_libraries(test-${target} ${test_libraries})
@@ -101,7 +101,7 @@ function(gtest target test_source_files linktarget)
             SETUP_TARGET_FOR_COVERAGE(NAME coverage-${target} EXECUTABLE test-${target} ${target})
             add_test(NAME coveragetest-${target}
                     COMMAND ${CMAKE_MODULE_PATH}/check_test.sh
-                    coverage-${target} ${CMAKE_BINARY_DIR} ${HIDRA2_MINIMUM_COVERAGE})
+                    coverage-${target} ${CMAKE_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE})
             set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
             SET_TESTS_PROPERTIES(coveragetest-${target} PROPERTIES DEPENDS test-${target})
             set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)

CMakeModules/testing_go.cmake

@@ -3,7 +3,7 @@ if (BUILD_TESTS)
 endif ()
 
 if (BUILD_TESTS)
-    set(HIDRA2_MINIMUM_COVERAGE 80)
+    set(ASAPO_MINIMUM_COVERAGE 80)
     find_program(MEMORYCHECK_COMMAND valgrind)
     set(MEMORYCHECK_COMMAND_OPTIONS
             "--trace-children=yes --leak-check=full --error-exitcode=1 --suppressions=${CMAKE_SOURCE_DIR}/tests/valgrind.suppressions")
@@ -22,7 +22,7 @@ function(gotest target test_source_files)
         if (CMAKE_COMPILER_IS_GNUCXX)
         add_test(NAME coveragetest-${target}
                         COMMAND ${CMAKE_MODULE_PATH}/coverage_go.sh
-                        ${CMAKE_CURRENT_BINARY_DIR} ${HIDRA2_MINIMUM_COVERAGE} ${gopath}
+                        ${CMAKE_CURRENT_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE} ${gopath}
                         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
         set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
         endif()

README.md

-# hidra2
+# asapo
 
 # C++ Projects
  

broker/CMakeLists.txt

-set (TARGET_NAME hidra2-broker)
+set (TARGET_NAME asapo-broker)
 
 if (NOT "$ENV{GOPATH}" STREQUAL "")
 	set(GOPATH $ENV{GOPATH})
@@ -20,15 +20,15 @@ ENDIF()
 
 include(testing_go)
 
-add_custom_target(hidra2-broker ALL
+add_custom_target(asapo-broker ALL
     COMMAND  ${CMAKE_COMMAND} -E env GOPATH=${gopath}
-    go build ${GO_OPTS} -o ${exe_name} hidra2_broker/main
+    go build ${GO_OPTS} -o ${exe_name} asapo_broker/main
     VERBATIM)
 define_property(TARGET PROPERTY EXENAME
         BRIEF_DOCS <executable name>
         FULL_DOCS <full-doc>)
 
-set_target_properties(hidra2-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${exe_name})
+set_target_properties(asapo-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${exe_name})
 
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} DESTINATION bin)

broker/src/hidra2_broker/database/mongodb.go → broker/src/asapo_broker/database/mongodb.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
-	"hidra2_broker/utils"
+	"asapo_broker/utils"
 	"sync"
 	"time"
 )

broker/src/hidra2_broker/database/mongodb_test.go → broker/src/asapo_broker/database/mongodb_test.go

@@ -5,7 +5,7 @@ package database
 import (
 	"encoding/json"
 	"github.com/stretchr/testify/assert"
-	"hidra2_broker/utils"
+	"asapo_broker/utils"
 	"sync"
 	"testing"
 )

broker/src/hidra2_broker/main/broker.go → broker/src/asapo_broker/main/broker.go

@@ -4,9 +4,9 @@ package main
 
 import (
 	"flag"
-	"hidra2_broker/database"
-	log "hidra2_broker/logger"
-	"hidra2_broker/server"
+	"asapo_broker/database"
+	log "asapo_broker/logger"
+	"asapo_broker/server"
 	"os"
 )
 

broker/src/hidra2_broker/server/get_next.go → broker/src/asapo_broker/server/get_next.go

@@ -2,9 +2,9 @@ package server
 
 import (
 	"github.com/gorilla/mux"
-	"hidra2_broker/database"
-	"hidra2_broker/logger"
-	"hidra2_broker/utils"
+	"asapo_broker/database"
+	"asapo_broker/logger"
+	"asapo_broker/utils"
 	"net/http"
 )
 

broker/src/hidra2_broker/server/get_next_test.go → broker/src/asapo_broker/server/get_next_test.go

@@ -5,9 +5,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"hidra2_broker/database"
-	"hidra2_broker/logger"
-	"hidra2_broker/utils"
+	"asapo_broker/database"
+	"asapo_broker/logger"
+	"asapo_broker/utils"
 	"net/http"
 	"net/http/httptest"
 	"strings"

broker/src/hidra2_broker/server/listroutes.go → broker/src/asapo_broker/server/listroutes.go

 package server
 
 import (
-	"hidra2_broker/utils"
+	"asapo_broker/utils"
 )
 
 var listRoutes = utils.Routes{