celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlenfer...@apache.org
Subject celix git commit: CELIX-406: Updated descriptor paths for pubsub component
Date Tue, 07 Mar 2017 18:33:26 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 3b1491e52 -> 97135eb71


CELIX-406: Updated descriptor paths for pubsub component


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/97135eb7
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/97135eb7
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/97135eb7

Branch: refs/heads/develop
Commit: 97135eb715eb2fa6932d542a992b075efb27fd50
Parents: 3b1491e
Author: Roy Lenferink <lenferinkroy@gmail.com>
Authored: Tue Mar 7 19:32:33 2017 +0100
Committer: Roy Lenferink <lenferinkroy@gmail.com>
Committed: Tue Mar 7 19:32:33 2017 +0100

----------------------------------------------------------------------
 pubsub/examples/mp_pubsub/publisher/CMakeLists.txt  | 2 +-
 pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt | 2 +-
 pubsub/examples/pubsub/publisher/CMakeLists.txt     | 2 +-
 pubsub/examples/pubsub/publisher2/CMakeLists.txt    | 2 +-
 pubsub/examples/pubsub/subscriber/CMakeLists.txt    | 2 +-
 pubsub/pubsub_common/public/src/dyn_msg_utils.c     | 6 ++----
 pubsub/pubsub_topology_manager/CMakeLists.txt       | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt b/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
index 76a01f1..de77156 100644
--- a/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
+++ b/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
@@ -34,7 +34,7 @@ bundle_files(org.apache.celix.pubsub_publisher.MpPublisher
 	${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
 	${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
 	${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
-	DESTINATION "META-INF/descriptors"
+	DESTINATION "META-INF/descriptors/messages"
 )
 
 bundle_files(org.apache.celix.pubsub_publisher.MpPublisher

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt b/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
index a77bb89..75ec635 100644
--- a/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
+++ b/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
@@ -34,7 +34,7 @@ bundle_files( org.apache.celix.pubsub_subscriber.MpSubscriber
 	    ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
 	    ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
 	    ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
-	DESTINATION "META-INF/descriptors"
+	DESTINATION "META-INF/descriptors/messages"
 )
 
 bundle_files(org.apache.celix.pubsub_subscriber.MpSubscriber

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/examples/pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/publisher/CMakeLists.txt b/pubsub/examples/pubsub/publisher/CMakeLists.txt
index e35c137..d932611 100644
--- a/pubsub/examples/pubsub/publisher/CMakeLists.txt
+++ b/pubsub/examples/pubsub/publisher/CMakeLists.txt
@@ -32,7 +32,7 @@ add_bundle(org.apache.celix.pubsub_publisher.PoiPublisher
 bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher
 		${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
 		${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
-    DESTINATION "META-INF/descriptors"
+    DESTINATION "META-INF/descriptors/messages"
 )
 
 bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/examples/pubsub/publisher2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/publisher2/CMakeLists.txt b/pubsub/examples/pubsub/publisher2/CMakeLists.txt
index b83f7dd..c44a760 100644
--- a/pubsub/examples/pubsub/publisher2/CMakeLists.txt
+++ b/pubsub/examples/pubsub/publisher2/CMakeLists.txt
@@ -32,7 +32,7 @@ add_bundle(org.apache.celix.pubsub_publisher.PoiPublisher2
 bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher2
 	${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
 	${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
-    DESTINATION "META-INF/descriptors"
+    DESTINATION "META-INF/descriptors/messages"
 )
 
 bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher2

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/examples/pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/subscriber/CMakeLists.txt b/pubsub/examples/pubsub/subscriber/CMakeLists.txt
index 7fd9fae..da6a362 100644
--- a/pubsub/examples/pubsub/subscriber/CMakeLists.txt
+++ b/pubsub/examples/pubsub/subscriber/CMakeLists.txt
@@ -33,7 +33,7 @@ add_bundle(org.apache.celix.pubsub_subscriber.PoiSubscriber
 bundle_files(org.apache.celix.pubsub_subscriber.PoiSubscriber
 	    ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
 	    ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
-    DESTINATION "META-INF/descriptors"
+    DESTINATION "META-INF/descriptors/messages"
 )
 
 bundle_files(org.apache.celix.pubsub_subscriber.PoiSubscriber

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/pubsub_common/public/src/dyn_msg_utils.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_common/public/src/dyn_msg_utils.c b/pubsub/pubsub_common/public/src/dyn_msg_utils.c
index 11e4507..1c6bbcd 100644
--- a/pubsub/pubsub_common/public/src/dyn_msg_utils.c
+++ b/pubsub/pubsub_common/public/src/dyn_msg_utils.c
@@ -56,7 +56,7 @@ void fillMsgTypesMap(hash_map_pt msgTypesMap,bundle_pt bundle){
 	root = getMsgDescriptionDir(bundle);
 
 	if(root != NULL){
-		asprintf(&metaInfPath, "%s/META-INF/descriptors", root);
+		asprintf(&metaInfPath, "%s/META-INF/descriptors/messages", root);
 
 		addMsgDescriptorsFromBundle(root, bundle, msgTypesMap);
 		addMsgDescriptorsFromBundle(metaInfPath, bundle, msgTypesMap);
@@ -99,9 +99,7 @@ static char * getMsgDescriptionDir(bundle_pt bundle)
 			root = getcwd(NULL, 0);
 		}
 	} else {
-	    char *dir;
-		bundle_getEntry(bundle, ".", &dir);
-		root = dir;
+		bundle_getEntry(bundle, ".", &root);
 	}
 
 	return root;

http://git-wip-us.apache.org/repos/asf/celix/blob/97135eb7/pubsub/pubsub_topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_topology_manager/CMakeLists.txt b/pubsub/pubsub_topology_manager/CMakeLists.txt
index 76eef19..cf2f4fa 100644
--- a/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -36,7 +36,7 @@ add_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
 
 bundle_files(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
    ${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include/pubsub_topic_info.descriptor
-    DESTINATION "META-INF/"
+    DESTINATION "META-INF/descriptors/services"
 )
 
 target_link_libraries(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager celix_framework
celix_utils)


Mime
View raw message