Author: abroekhuis
Date: Mon May 19 10:16:53 2014
New Revision: 1595815
URL: http://svn.apache.org/r1595815
Log:
CELIX-111, CELIX-112: Updated CMakeFiles, added missing bundle symbolic name.
Modified:
incubator/celix/trunk/framework/private/mock/bundle_revision_mock.c
incubator/celix/trunk/framework/private/mock/framework_mock.c
incubator/celix/trunk/framework/private/mock/resolver_mock.c
incubator/celix/trunk/remote_services/calculator_endpoint/CMakeLists.txt
incubator/celix/trunk/remote_services/calculator_proxy/CMakeLists.txt
incubator/celix/trunk/remote_services/calculator_service/CMakeLists.txt
incubator/celix/trunk/remote_services/calculator_shell/CMakeLists.txt
Modified: incubator/celix/trunk/framework/private/mock/bundle_revision_mock.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/mock/bundle_revision_mock.c?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/mock/bundle_revision_mock.c
(original)
+++ incubator/celix/trunk/framework/private/mock/bundle_revision_mock.c Mon May
19 10:16:53 2014
@@ -54,3 +54,10 @@ celix_status_t bundleRevision_getManifes
return mock_c()->returnValue().value.intValue;
}
+celix_status_t bundleRevision_getHandles(bundle_revision_pt revision,
array_list_pt *handles) {
+ mock_c()->actualCall("bundleRevision_getHandles")
+ ->withPointerParameters("revision", revision)
+ ->_andPointerOutputParameters("handles", (void **) handles);
+ return mock_c()->returnValue().value.intValue;
+}
+
Modified: incubator/celix/trunk/framework/private/mock/framework_mock.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/mock/framework_mock.c?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/mock/framework_mock.c (original)
+++ incubator/celix/trunk/framework/private/mock/framework_mock.c Mon May 19
10:16:53 2014
@@ -265,7 +265,7 @@ service_reference_pt listToArray(array_l
return mock_c()->returnValue().value.pointerValue;
}
-celix_status_t framework_markResolvedModules(framework_pt framework,
hash_map_pt wires) {
+celix_status_t framework_markResolvedModules(framework_pt framework,
linked_list_pt wires) {
mock_c()->actualCall("framework_markResolvedModules");
return mock_c()->returnValue().value.intValue;
}
Modified: incubator/celix/trunk/framework/private/mock/resolver_mock.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/mock/resolver_mock.c?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/mock/resolver_mock.c (original)
+++ incubator/celix/trunk/framework/private/mock/resolver_mock.c Mon May 19
10:16:53 2014
@@ -27,7 +27,7 @@
#include "resolver.h"
-hash_map_pt resolver_resolve(module_pt root) {
+linked_list_pt resolver_resolve(module_pt root) {
mock_c()->actualCall("resolver_resolve")
->withPointerParameters("module", root);
return mock_c()->returnValue().value.pointerValue;
Modified:
incubator/celix/trunk/remote_services/calculator_endpoint/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_endpoint/CMakeLists.txt?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_endpoint/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/calculator_endpoint/CMakeLists.txt
Mon May 19 10:16:53 2014
@@ -23,6 +23,9 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_endpoint/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
+SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_endpoint")
+SET(BUNDLE_VERSION "0.0.1")
+
bundle(org.example.api.Calculator_endpoint SOURCES
private/src/calculator_endpoint_activator
private/src/calculator_endpoint_impl.c
Modified: incubator/celix/trunk/remote_services/calculator_proxy/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_proxy/CMakeLists.txt?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_proxy/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/calculator_proxy/CMakeLists.txt Mon
May 19 10:16:53 2014
@@ -24,6 +24,9 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_proxy")
+SET(BUNDLE_VERSION "0.0.1")
+
bundle(org.example.api.Calculator_proxy SOURCES
private/src/calculator_proxy_activator
private/src/calculator_proxy_impl.c
Modified:
incubator/celix/trunk/remote_services/calculator_service/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_service/CMakeLists.txt?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_service/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/calculator_service/CMakeLists.txt Mon
May 19 10:16:53 2014
@@ -21,6 +21,9 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
+SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator")
+SET(BUNDLE_VERSION "0.0.1")
+
bundle(calculator SOURCES
private/src/calculator_impl
private/src/calculator_activator
Modified: incubator/celix/trunk/remote_services/calculator_shell/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_shell/CMakeLists.txt?rev=1595815&r1=1595814&r2=1595815&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_shell/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/calculator_shell/CMakeLists.txt Mon
May 19 10:16:53 2014
@@ -15,6 +15,9 @@
# specific language governing permissions and limitations
# under the License.
+SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_shell")
+SET(BUNDLE_VERSION "0.0.1")
+
bundle(calculator_shell SOURCES
private/src/add_command
private/src/sub_command
