Adds a experimental dir to the Celix project and moves some bundles t…

…o that dir.

Currently more stable and unstable bundles are in the same dir, to make a more clear distiction what is consider really unstable/experimental the misc/experimental dir can be used.

CMakeLists.txt

@@ -105,6 +105,9 @@ add_subdirectory(libs)
 #Bundles
 add_subdirectory(bundles)
 
+#Experimental Bundles/Libraries
+add_subdirectory(misc/experimental)
+
 #Example as last, because some example will check if underlining options are enabled
 add_subdirectory(examples/celix-examples examples)
 

bundles/CMakeLists.txt

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_subdirectory(config_admin)
 add_subdirectory(device_access)
 add_subdirectory(deployment_admin)
 add_subdirectory(remote_services)

bundles/pubsub/CMakeLists.txt

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-celix_subproject(PUBSUB "Option to build the pubsub bundles" OFF DEPS UTILS)
+celix_subproject(PUBSUB "Option to build the pubsub bundles" OFF DEPS FRAMEWORK)
 if (PUBSUB)
 
     option(BUILD_PUBSUB_PSA_ZMQ "Build ZeroMQ PubSub Admin (LGPL License)" OFF)
@@ -24,15 +24,13 @@ if (PUBSUB)
         option(BUILD_ZMQ_SECURITY "Build with security for ZeroMQ." OFF)
     endif (BUILD_PUBSUB_PSA_ZMQ)
 
-    option(BUILD_PUBSUB_PSA_NANOMSG "Build NanoMsg PubSub Admin - Experimental" OFF)
     add_subdirectory(pubsub_api)
     add_subdirectory(pubsub_spi)
     add_subdirectory(pubsub_topology_manager)
     add_subdirectory(pubsub_discovery)
     add_subdirectory(pubsub_serializer_json)
     add_subdirectory(pubsub_admin_zmq)
     add_subdirectory(pubsub_admin_tcp)
-    add_subdirectory(pubsub_admin_nanomsg)
     add_subdirectory(pubsub_admin_udp_mc)
     add_subdirectory(pubsub_admin_websocket)
     add_subdirectory(keygen)

misc/experimental/CMakeLists.txt

@@ -0,0 +1,23 @@
+# 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.
+
+celix_subproject(EXPERIMENTAL "Options to enable building the experimental - non stable - bundles/libraries. " OFF DEPS FRAMEWORK)
+if (EXPERIMENTAL)
+
+    add_subdirectory(bundles)
+
+endif ()

misc/experimental/README.md

@@ -0,0 +1,21 @@
+<!--
+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.
+-->
+
+# Intro
+
+This directory contains experimental bundles and libraries.
+These bundles/libraries are not considered stable and/or their API can still drastically change.

misc/experimental/bundles/CMakeLists.txt

@@ -0,0 +1,20 @@
+# 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.
+
+add_subdirectory(config_admin)
+add_subdirectory(event_admin)
+add_subdirectory(pubsub_admin_nanomsg)

bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt → misc/experimental/bundles/pubsub_admin_nanomsg/CMakeLists.txt

@@ -42,7 +42,6 @@ if (BUILD_PUBSUB_PSA_NANOMSG)
         ${NANOMSG_INCLUDE_DIR}
         ${JANSSON_INCLUDE_DIR}
         src
-        ../pubsub_topology_manager/src
     )
 
     install_celix_bundle(celix_pubsub_admin_nanomsg EXPORT celix COMPONENT pubsub)