celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [celix] 01/01: Adds a experimental dir to the Celix project and moves some bundles to that dir.
Date Tue, 24 Sep 2019 19:04:40 GMT
This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/experimental_dir
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 0d650c7546b2c572a537b056c11c9d7712dd98fb
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
AuthorDate: Tue Sep 24 21:02:25 2019 +0200

    Adds a experimental dir to the Celix project and moves some bundles to 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                                     |   3 +
 bundles/CMakeLists.txt                             |   1 -
 bundles/pubsub/CMakeLists.txt                      |   4 +-
 .../experimental/CMakeLists.txt                    |   9 +-
 misc/experimental/README.md                        |  21 ++++
 .../experimental/bundles/CMakeLists.txt            |   6 +-
 .../bundles}/config_admin/CMakeLists.txt           |   0
 .../experimental/bundles}/config_admin/README.md   |   0
 .../config_admin/config_admin_tst/CMakeLists.txt   |   0
 .../config_admin_tst/config.properties.in          |   0
 .../config_admin_tst/config_admin_test.cpp         |   0
 .../config_admin_tst/example_test/CMakeLists.txt   |   0
 .../example_test}/META-INF/MANIFEST.MF             |   0
 .../private/include/example_managed_service_impl.h |   0
 .../example_test/private/src/activator.c           |   0
 .../private/src/example_managed_service_impl.c     |   0
 .../config_admin_tst/example_test2/CMakeLists.txt  |   0
 .../example_test2}/META-INF/MANIFEST.MF            |   0
 .../include/example2_managed_service_impl.h        |   0
 .../example_test2/private/src/activator.c          |   0
 .../private/src/example_managed_service_impl.c     |   0
 .../bundles}/config_admin/example/CMakeLists.txt   |   0
 .../config_admin/example/private/include/example.h |   0
 .../example/private/src/bundle_activator.c         |   0
 .../config_admin/example/private/src/example.c     |   0
 .../bundles}/config_admin/service/CMakeLists.txt   |   0
 .../config_admin/service/META-INF/MANIFEST.MF      |   0
 .../private/include/configuration_admin_factory.h  |   0
 .../private/include/configuration_admin_impl.h     |   0
 .../service/private/include/configuration_impl.h   |   0
 .../service/private/include/configuration_store.h  |   0
 .../service/private/include/framework_patch.h      |   0
 .../private/include/managed_service_tracker.h      |   0
 .../service/private/include/updated_thread_pool.h  |   0
 .../config_admin/service/private/src/activator.c   |   0
 .../private/src/configuration_admin_factory.c      |   0
 .../service/private/src/configuration_admin_impl.c |   0
 .../service/private/src/configuration_impl.c       |   0
 .../service/private/src/configuration_store.c      |   0
 .../service/private/src/managed_service_impl.c     |   0
 .../service/private/src/managed_service_tracker.c  |   0
 .../service/private/src/updated_thread_pool.c      |   0
 .../service/public/include/configuration.h         |   0
 .../service/public/include/configuration_admin.h   |   0
 .../service/public/include/configuration_event.h   |   0
 .../public/include/configuration_listener.h        |   0
 .../service/public/include/configuration_plugin.h  |   0
 .../service/public/include/managed_service.h       |   0
 .../bundles}/event_admin/CMakeLists.txt            |   0
 .../event_admin/event_admin/CMakeLists.txt         |   0
 .../event_admin/private/include/event_admin_impl.h |   0
 .../private/src/event_admin_activator.c            |   0
 .../event_admin/private/src/event_admin_impl.c     |   0
 .../event_admin/private/src/event_impl.c           |   0
 .../event_admin/public/include/event_admin.h       |   0
 .../event_admin/public/include/event_constants.h   |   0
 .../event_admin/public/include/event_handler.h     |   0
 .../event_admin/event_handler/CMakeLists.txt       |   0
 .../private/include/event_handler_impl.h           |   0
 .../private/src/event_handler_activator.c          |   0
 .../event_handler/private/src/event_handler_impl.c |   0
 .../event_admin/event_publisher/CMakeLists.txt     |   0
 .../private/include/event_publisher_impl.h         |   0
 .../private/src/event_publisher_activator.c        |   0
 .../private/src/event_publisher_impl.c             |   0
 .../bundles}/pubsub_admin_nanomsg/CMakeLists.txt   |   1 -
 .../bundles}/pubsub_admin_nanomsg/src/LogHelper.h  |   0
 .../src/psa_nanomsg_activator.cc                   |   0
 .../src/pubsub_nanomsg_admin.cc                    |   0
 .../src/pubsub_nanomsg_admin.h                     |   0
 .../src/pubsub_nanomsg_common.cc                   |   0
 .../src/pubsub_nanomsg_common.h                    |   0
 .../src/pubsub_nanomsg_topic_receiver.cc           |   0
 .../src/pubsub_nanomsg_topic_receiver.h            |   0
 .../src/pubsub_nanomsg_topic_sender.cc             |   0
 .../src/pubsub_nanomsg_topic_sender.h              |   0
 .../src/pubsub_psa_nanomsg_constants.h             |   0
 misc/roadmap/improvement_ideas.md                  |  54 ---------
 misc/roadmap/roadmap.md                            | 122 ---------------------
 79 files changed, 34 insertions(+), 187 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76bf074..ba7bfe7 100644
--- a/CMakeLists.txt
+++ b/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)
 
diff --git a/bundles/CMakeLists.txt b/bundles/CMakeLists.txt
index 351a4ff..98f003b 100644
--- a/bundles/CMakeLists.txt
+++ b/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)
diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt
index a084aa5..264cd88 100644
--- a/bundles/pubsub/CMakeLists.txt
+++ b/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,7 +24,6 @@ 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)
@@ -32,7 +31,6 @@ if (PUBSUB)
     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)
diff --git a/bundles/config_admin/config_admin_tst/config.properties.in b/misc/experimental/CMakeLists.txt
similarity index 80%
copy from bundles/config_admin/config_admin_tst/config.properties.in
copy to misc/experimental/CMakeLists.txt
index 7e8c14d..d19585c 100644
--- a/bundles/config_admin/config_admin_tst/config.properties.in
+++ b/misc/experimental/CMakeLists.txt
@@ -15,6 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cosgi.auto.start.1=@config_admin_bundle_file@ @example_test_bundle_file@ @example_test2_bundle_file@
-LOGHELPER_ENABLE_STDOUT_FALLBACK=true
-org.osgi.framework.storage.clean=onFirstInit
\ No newline at end of file
+celix_subproject(EXPERIMENTAL "Options to enable building the experimental - non stable -
bundles/libraries. " OFF DEPS FRAMEWORK)
+if (EXPERIMENTAL)
+
+    add_subdirectory(bundles)
+
+endif ()
\ No newline at end of file
diff --git a/misc/experimental/README.md b/misc/experimental/README.md
new file mode 100644
index 0000000..d56c614
--- /dev/null
+++ b/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.
diff --git a/bundles/config_admin/config_admin_tst/config.properties.in b/misc/experimental/bundles/CMakeLists.txt
similarity index 81%
copy from bundles/config_admin/config_admin_tst/config.properties.in
copy to misc/experimental/bundles/CMakeLists.txt
index 7e8c14d..0405735 100644
--- a/bundles/config_admin/config_admin_tst/config.properties.in
+++ b/misc/experimental/bundles/CMakeLists.txt
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cosgi.auto.start.1=@config_admin_bundle_file@ @example_test_bundle_file@ @example_test2_bundle_file@
-LOGHELPER_ENABLE_STDOUT_FALLBACK=true
-org.osgi.framework.storage.clean=onFirstInit
\ No newline at end of file
+add_subdirectory(config_admin)
+add_subdirectory(event_admin)
+add_subdirectory(pubsub_admin_nanomsg)
diff --git a/bundles/config_admin/CMakeLists.txt b/misc/experimental/bundles/config_admin/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/CMakeLists.txt
diff --git a/bundles/config_admin/README.md b/misc/experimental/bundles/config_admin/README.md
similarity index 100%
rename from bundles/config_admin/README.md
rename to misc/experimental/bundles/config_admin/README.md
diff --git a/bundles/config_admin/config_admin_tst/CMakeLists.txt b/misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/config_admin_tst/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
diff --git a/bundles/config_admin/config_admin_tst/config.properties.in b/misc/experimental/bundles/config_admin/config_admin_tst/config.properties.in
similarity index 100%
rename from bundles/config_admin/config_admin_tst/config.properties.in
rename to misc/experimental/bundles/config_admin/config_admin_tst/config.properties.in
diff --git a/bundles/config_admin/config_admin_tst/config_admin_test.cpp b/misc/experimental/bundles/config_admin/config_admin_tst/config_admin_test.cpp
similarity index 100%
rename from bundles/config_admin/config_admin_tst/config_admin_test.cpp
rename to misc/experimental/bundles/config_admin/config_admin_tst/config_admin_test.cpp
diff --git a/bundles/config_admin/config_admin_tst/example_test/CMakeLists.txt b/misc/experimental/bundles/config_admin/config_admin_tst/example_test/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test/CMakeLists.txt
diff --git a/bundles/config_admin/config_admin_tst/example_test2/META-INF/MANIFEST.MF b/misc/experimental/bundles/config_admin/config_admin_tst/example_test/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test2/META-INF/MANIFEST.MF
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test/META-INF/MANIFEST.MF
diff --git a/bundles/config_admin/config_admin_tst/example_test/private/include/example_managed_service_impl.h
b/misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/include/example_managed_service_impl.h
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test/private/include/example_managed_service_impl.h
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/include/example_managed_service_impl.h
diff --git a/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c b/misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/src/activator.c
diff --git a/bundles/config_admin/config_admin_tst/example_test/private/src/example_managed_service_impl.c
b/misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/src/example_managed_service_impl.c
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test/private/src/example_managed_service_impl.c
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test/private/src/example_managed_service_impl.c
diff --git a/bundles/config_admin/config_admin_tst/example_test2/CMakeLists.txt b/misc/experimental/bundles/config_admin/config_admin_tst/example_test2/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test2/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test2/CMakeLists.txt
diff --git a/bundles/config_admin/config_admin_tst/example_test/META-INF/MANIFEST.MF b/misc/experimental/bundles/config_admin/config_admin_tst/example_test2/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test/META-INF/MANIFEST.MF
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test2/META-INF/MANIFEST.MF
diff --git a/bundles/config_admin/config_admin_tst/example_test2/private/include/example2_managed_service_impl.h
b/misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/include/example2_managed_service_impl.h
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test2/private/include/example2_managed_service_impl.h
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/include/example2_managed_service_impl.h
diff --git a/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c b/misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/src/activator.c
diff --git a/bundles/config_admin/config_admin_tst/example_test2/private/src/example_managed_service_impl.c
b/misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/src/example_managed_service_impl.c
similarity index 100%
rename from bundles/config_admin/config_admin_tst/example_test2/private/src/example_managed_service_impl.c
rename to misc/experimental/bundles/config_admin/config_admin_tst/example_test2/private/src/example_managed_service_impl.c
diff --git a/bundles/config_admin/example/CMakeLists.txt b/misc/experimental/bundles/config_admin/example/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/example/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/example/CMakeLists.txt
diff --git a/bundles/config_admin/example/private/include/example.h b/misc/experimental/bundles/config_admin/example/private/include/example.h
similarity index 100%
rename from bundles/config_admin/example/private/include/example.h
rename to misc/experimental/bundles/config_admin/example/private/include/example.h
diff --git a/bundles/config_admin/example/private/src/bundle_activator.c b/misc/experimental/bundles/config_admin/example/private/src/bundle_activator.c
similarity index 100%
rename from bundles/config_admin/example/private/src/bundle_activator.c
rename to misc/experimental/bundles/config_admin/example/private/src/bundle_activator.c
diff --git a/bundles/config_admin/example/private/src/example.c b/misc/experimental/bundles/config_admin/example/private/src/example.c
similarity index 100%
rename from bundles/config_admin/example/private/src/example.c
rename to misc/experimental/bundles/config_admin/example/private/src/example.c
diff --git a/bundles/config_admin/service/CMakeLists.txt b/misc/experimental/bundles/config_admin/service/CMakeLists.txt
similarity index 100%
rename from bundles/config_admin/service/CMakeLists.txt
rename to misc/experimental/bundles/config_admin/service/CMakeLists.txt
diff --git a/bundles/config_admin/service/META-INF/MANIFEST.MF b/misc/experimental/bundles/config_admin/service/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/config_admin/service/META-INF/MANIFEST.MF
rename to misc/experimental/bundles/config_admin/service/META-INF/MANIFEST.MF
diff --git a/bundles/config_admin/service/private/include/configuration_admin_factory.h b/misc/experimental/bundles/config_admin/service/private/include/configuration_admin_factory.h
similarity index 100%
rename from bundles/config_admin/service/private/include/configuration_admin_factory.h
rename to misc/experimental/bundles/config_admin/service/private/include/configuration_admin_factory.h
diff --git a/bundles/config_admin/service/private/include/configuration_admin_impl.h b/misc/experimental/bundles/config_admin/service/private/include/configuration_admin_impl.h
similarity index 100%
rename from bundles/config_admin/service/private/include/configuration_admin_impl.h
rename to misc/experimental/bundles/config_admin/service/private/include/configuration_admin_impl.h
diff --git a/bundles/config_admin/service/private/include/configuration_impl.h b/misc/experimental/bundles/config_admin/service/private/include/configuration_impl.h
similarity index 100%
rename from bundles/config_admin/service/private/include/configuration_impl.h
rename to misc/experimental/bundles/config_admin/service/private/include/configuration_impl.h
diff --git a/bundles/config_admin/service/private/include/configuration_store.h b/misc/experimental/bundles/config_admin/service/private/include/configuration_store.h
similarity index 100%
rename from bundles/config_admin/service/private/include/configuration_store.h
rename to misc/experimental/bundles/config_admin/service/private/include/configuration_store.h
diff --git a/bundles/config_admin/service/private/include/framework_patch.h b/misc/experimental/bundles/config_admin/service/private/include/framework_patch.h
similarity index 100%
rename from bundles/config_admin/service/private/include/framework_patch.h
rename to misc/experimental/bundles/config_admin/service/private/include/framework_patch.h
diff --git a/bundles/config_admin/service/private/include/managed_service_tracker.h b/misc/experimental/bundles/config_admin/service/private/include/managed_service_tracker.h
similarity index 100%
rename from bundles/config_admin/service/private/include/managed_service_tracker.h
rename to misc/experimental/bundles/config_admin/service/private/include/managed_service_tracker.h
diff --git a/bundles/config_admin/service/private/include/updated_thread_pool.h b/misc/experimental/bundles/config_admin/service/private/include/updated_thread_pool.h
similarity index 100%
rename from bundles/config_admin/service/private/include/updated_thread_pool.h
rename to misc/experimental/bundles/config_admin/service/private/include/updated_thread_pool.h
diff --git a/bundles/config_admin/service/private/src/activator.c b/misc/experimental/bundles/config_admin/service/private/src/activator.c
similarity index 100%
rename from bundles/config_admin/service/private/src/activator.c
rename to misc/experimental/bundles/config_admin/service/private/src/activator.c
diff --git a/bundles/config_admin/service/private/src/configuration_admin_factory.c b/misc/experimental/bundles/config_admin/service/private/src/configuration_admin_factory.c
similarity index 100%
rename from bundles/config_admin/service/private/src/configuration_admin_factory.c
rename to misc/experimental/bundles/config_admin/service/private/src/configuration_admin_factory.c
diff --git a/bundles/config_admin/service/private/src/configuration_admin_impl.c b/misc/experimental/bundles/config_admin/service/private/src/configuration_admin_impl.c
similarity index 100%
rename from bundles/config_admin/service/private/src/configuration_admin_impl.c
rename to misc/experimental/bundles/config_admin/service/private/src/configuration_admin_impl.c
diff --git a/bundles/config_admin/service/private/src/configuration_impl.c b/misc/experimental/bundles/config_admin/service/private/src/configuration_impl.c
similarity index 100%
rename from bundles/config_admin/service/private/src/configuration_impl.c
rename to misc/experimental/bundles/config_admin/service/private/src/configuration_impl.c
diff --git a/bundles/config_admin/service/private/src/configuration_store.c b/misc/experimental/bundles/config_admin/service/private/src/configuration_store.c
similarity index 100%
rename from bundles/config_admin/service/private/src/configuration_store.c
rename to misc/experimental/bundles/config_admin/service/private/src/configuration_store.c
diff --git a/bundles/config_admin/service/private/src/managed_service_impl.c b/misc/experimental/bundles/config_admin/service/private/src/managed_service_impl.c
similarity index 100%
rename from bundles/config_admin/service/private/src/managed_service_impl.c
rename to misc/experimental/bundles/config_admin/service/private/src/managed_service_impl.c
diff --git a/bundles/config_admin/service/private/src/managed_service_tracker.c b/misc/experimental/bundles/config_admin/service/private/src/managed_service_tracker.c
similarity index 100%
rename from bundles/config_admin/service/private/src/managed_service_tracker.c
rename to misc/experimental/bundles/config_admin/service/private/src/managed_service_tracker.c
diff --git a/bundles/config_admin/service/private/src/updated_thread_pool.c b/misc/experimental/bundles/config_admin/service/private/src/updated_thread_pool.c
similarity index 100%
rename from bundles/config_admin/service/private/src/updated_thread_pool.c
rename to misc/experimental/bundles/config_admin/service/private/src/updated_thread_pool.c
diff --git a/bundles/config_admin/service/public/include/configuration.h b/misc/experimental/bundles/config_admin/service/public/include/configuration.h
similarity index 100%
rename from bundles/config_admin/service/public/include/configuration.h
rename to misc/experimental/bundles/config_admin/service/public/include/configuration.h
diff --git a/bundles/config_admin/service/public/include/configuration_admin.h b/misc/experimental/bundles/config_admin/service/public/include/configuration_admin.h
similarity index 100%
rename from bundles/config_admin/service/public/include/configuration_admin.h
rename to misc/experimental/bundles/config_admin/service/public/include/configuration_admin.h
diff --git a/bundles/config_admin/service/public/include/configuration_event.h b/misc/experimental/bundles/config_admin/service/public/include/configuration_event.h
similarity index 100%
rename from bundles/config_admin/service/public/include/configuration_event.h
rename to misc/experimental/bundles/config_admin/service/public/include/configuration_event.h
diff --git a/bundles/config_admin/service/public/include/configuration_listener.h b/misc/experimental/bundles/config_admin/service/public/include/configuration_listener.h
similarity index 100%
rename from bundles/config_admin/service/public/include/configuration_listener.h
rename to misc/experimental/bundles/config_admin/service/public/include/configuration_listener.h
diff --git a/bundles/config_admin/service/public/include/configuration_plugin.h b/misc/experimental/bundles/config_admin/service/public/include/configuration_plugin.h
similarity index 100%
rename from bundles/config_admin/service/public/include/configuration_plugin.h
rename to misc/experimental/bundles/config_admin/service/public/include/configuration_plugin.h
diff --git a/bundles/config_admin/service/public/include/managed_service.h b/misc/experimental/bundles/config_admin/service/public/include/managed_service.h
similarity index 100%
rename from bundles/config_admin/service/public/include/managed_service.h
rename to misc/experimental/bundles/config_admin/service/public/include/managed_service.h
diff --git a/bundles/event_admin/CMakeLists.txt b/misc/experimental/bundles/event_admin/CMakeLists.txt
similarity index 100%
rename from bundles/event_admin/CMakeLists.txt
rename to misc/experimental/bundles/event_admin/CMakeLists.txt
diff --git a/bundles/event_admin/event_admin/CMakeLists.txt b/misc/experimental/bundles/event_admin/event_admin/CMakeLists.txt
similarity index 100%
rename from bundles/event_admin/event_admin/CMakeLists.txt
rename to misc/experimental/bundles/event_admin/event_admin/CMakeLists.txt
diff --git a/bundles/event_admin/event_admin/private/include/event_admin_impl.h b/misc/experimental/bundles/event_admin/event_admin/private/include/event_admin_impl.h
similarity index 100%
rename from bundles/event_admin/event_admin/private/include/event_admin_impl.h
rename to misc/experimental/bundles/event_admin/event_admin/private/include/event_admin_impl.h
diff --git a/bundles/event_admin/event_admin/private/src/event_admin_activator.c b/misc/experimental/bundles/event_admin/event_admin/private/src/event_admin_activator.c
similarity index 100%
rename from bundles/event_admin/event_admin/private/src/event_admin_activator.c
rename to misc/experimental/bundles/event_admin/event_admin/private/src/event_admin_activator.c
diff --git a/bundles/event_admin/event_admin/private/src/event_admin_impl.c b/misc/experimental/bundles/event_admin/event_admin/private/src/event_admin_impl.c
similarity index 100%
rename from bundles/event_admin/event_admin/private/src/event_admin_impl.c
rename to misc/experimental/bundles/event_admin/event_admin/private/src/event_admin_impl.c
diff --git a/bundles/event_admin/event_admin/private/src/event_impl.c b/misc/experimental/bundles/event_admin/event_admin/private/src/event_impl.c
similarity index 100%
rename from bundles/event_admin/event_admin/private/src/event_impl.c
rename to misc/experimental/bundles/event_admin/event_admin/private/src/event_impl.c
diff --git a/bundles/event_admin/event_admin/public/include/event_admin.h b/misc/experimental/bundles/event_admin/event_admin/public/include/event_admin.h
similarity index 100%
rename from bundles/event_admin/event_admin/public/include/event_admin.h
rename to misc/experimental/bundles/event_admin/event_admin/public/include/event_admin.h
diff --git a/bundles/event_admin/event_admin/public/include/event_constants.h b/misc/experimental/bundles/event_admin/event_admin/public/include/event_constants.h
similarity index 100%
rename from bundles/event_admin/event_admin/public/include/event_constants.h
rename to misc/experimental/bundles/event_admin/event_admin/public/include/event_constants.h
diff --git a/bundles/event_admin/event_admin/public/include/event_handler.h b/misc/experimental/bundles/event_admin/event_admin/public/include/event_handler.h
similarity index 100%
rename from bundles/event_admin/event_admin/public/include/event_handler.h
rename to misc/experimental/bundles/event_admin/event_admin/public/include/event_handler.h
diff --git a/bundles/event_admin/event_handler/CMakeLists.txt b/misc/experimental/bundles/event_admin/event_handler/CMakeLists.txt
similarity index 100%
rename from bundles/event_admin/event_handler/CMakeLists.txt
rename to misc/experimental/bundles/event_admin/event_handler/CMakeLists.txt
diff --git a/bundles/event_admin/event_handler/private/include/event_handler_impl.h b/misc/experimental/bundles/event_admin/event_handler/private/include/event_handler_impl.h
similarity index 100%
rename from bundles/event_admin/event_handler/private/include/event_handler_impl.h
rename to misc/experimental/bundles/event_admin/event_handler/private/include/event_handler_impl.h
diff --git a/bundles/event_admin/event_handler/private/src/event_handler_activator.c b/misc/experimental/bundles/event_admin/event_handler/private/src/event_handler_activator.c
similarity index 100%
rename from bundles/event_admin/event_handler/private/src/event_handler_activator.c
rename to misc/experimental/bundles/event_admin/event_handler/private/src/event_handler_activator.c
diff --git a/bundles/event_admin/event_handler/private/src/event_handler_impl.c b/misc/experimental/bundles/event_admin/event_handler/private/src/event_handler_impl.c
similarity index 100%
rename from bundles/event_admin/event_handler/private/src/event_handler_impl.c
rename to misc/experimental/bundles/event_admin/event_handler/private/src/event_handler_impl.c
diff --git a/bundles/event_admin/event_publisher/CMakeLists.txt b/misc/experimental/bundles/event_admin/event_publisher/CMakeLists.txt
similarity index 100%
rename from bundles/event_admin/event_publisher/CMakeLists.txt
rename to misc/experimental/bundles/event_admin/event_publisher/CMakeLists.txt
diff --git a/bundles/event_admin/event_publisher/private/include/event_publisher_impl.h b/misc/experimental/bundles/event_admin/event_publisher/private/include/event_publisher_impl.h
similarity index 100%
rename from bundles/event_admin/event_publisher/private/include/event_publisher_impl.h
rename to misc/experimental/bundles/event_admin/event_publisher/private/include/event_publisher_impl.h
diff --git a/bundles/event_admin/event_publisher/private/src/event_publisher_activator.c b/misc/experimental/bundles/event_admin/event_publisher/private/src/event_publisher_activator.c
similarity index 100%
rename from bundles/event_admin/event_publisher/private/src/event_publisher_activator.c
rename to misc/experimental/bundles/event_admin/event_publisher/private/src/event_publisher_activator.c
diff --git a/bundles/event_admin/event_publisher/private/src/event_publisher_impl.c b/misc/experimental/bundles/event_admin/event_publisher/private/src/event_publisher_impl.c
similarity index 100%
rename from bundles/event_admin/event_publisher/private/src/event_publisher_impl.c
rename to misc/experimental/bundles/event_admin/event_publisher/private/src/event_publisher_impl.c
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt b/misc/experimental/bundles/pubsub_admin_nanomsg/CMakeLists.txt
similarity index 98%
rename from bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt
rename to misc/experimental/bundles/pubsub_admin_nanomsg/CMakeLists.txt
index 86a5000..b9344f3 100644
--- a/bundles/pubsub/pubsub_admin_nanomsg/CMakeLists.txt
+++ b/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)
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/LogHelper.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/LogHelper.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/LogHelper.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/LogHelper.h
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/psa_nanomsg_activator.cc
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.cc
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_admin.h
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.cc
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.cc
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.cc
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_common.h
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.cc
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_receiver.h
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.cc b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.cc
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.cc
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.cc
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_nanomsg_topic_sender.h
diff --git a/bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_psa_nanomsg_constants.h b/misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_psa_nanomsg_constants.h
similarity index 100%
rename from bundles/pubsub/pubsub_admin_nanomsg/src/pubsub_psa_nanomsg_constants.h
rename to misc/experimental/bundles/pubsub_admin_nanomsg/src/pubsub_psa_nanomsg_constants.h
diff --git a/misc/roadmap/improvement_ideas.md b/misc/roadmap/improvement_ideas.md
deleted file mode 100644
index 32db322..0000000
--- a/misc/roadmap/improvement_ideas.md
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-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.
--->
-
-# Improvement Ideas
- 
-# Introduce dlmopen for library imports.
-Currently library are loaded LOCAL for bundles. This works alright, but makes it hard to
add a concept 
-of exporting and importing libraries. 
-
-The trick is that the NEEDED header in the importing libraries 
-should match the target exported library SONAME header and no other exported libraries SONAME
headers. 
-One solution to make this work is to alter the NEEDED & SONAME runtime. 
- 
-For glibc there is now an other alternative, namely using dlmopen. dlmopen makes it possible
to load 
-libraries in a given namespace. For bundle this can be used to create a library namespace
per bundle 
-and load exported libraries int importing bundle namespace. A clean solution, but this currently

-only works for glibc (linux).
-
-
-# Fix the performance use case and add C++ support
-There was a locking example which also functioned as a performance test to measure the impact
of
-using services instead of direct function calls. 
-During the removal of APR this example stopped working. Add it back, fix it and add a C++
use case
-as example.
-See [locking example tree](https://github.com/apache/celix/tree/216032cae956379d4a740f37ae5caee7e957bd98/examples/locking)
-
-# Cleanup Celix project structure
-Celix is growing and getting more sub project, this is fine but maybe the structure needs
a cleanup to 
-create a more clear root directory structure. 
-
-# Extend the test environment
-
-# Improve documentation
-
-# Create one or more "real life" applications based on Celix to show the potential of Celix
-
-# Add pub sub admins. 
-The current implementation uses JSON over multicast UDP or over ZMQ.  
-One or more could be added. i.e. serialization based on Apache-Avro, communication over TCP
/ Kafka / Shared Memory  
-Add interfaces for other languages (Python / Rust / Go / ...)  
diff --git a/misc/roadmap/roadmap.md b/misc/roadmap/roadmap.md
deleted file mode 100644
index fce9f7c..0000000
--- a/misc/roadmap/roadmap.md
+++ /dev/null
@@ -1,122 +0,0 @@
-<!--
-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.
--->
-
-# Roadmap
-
-Note this roadmap is still a draft.
-
-# Apache Celix 2.0.1 
-
-Date: TBD (juli/aug 2017?)
-
-## Improve PubSub (CELIX-407)
-
-1. Finalize introduction serializer services  
-1. Ensure code coverage of ~ 70% 
-
-## Finalize Runtime Creation (CELIX-408)
-
-1. Ensure that the runtime command are used for testing some distributed test (e.g. pubsub)
-
-## Add Support for running Celix as a single executable (TODO issue)
-For different reasons it could be interesting to support running bundles from a single executable.
-Primarily security, but also startup performance.
-
-To start this can be achieved by creating static version of the celix provided bundles. These
static 
-bundles should have unique symbols, e.g  shell_bundleActivator_create instead of a 
-"normal" bundleActivator_create. The normal  activator functions should then 
-only be used (using a define or separated source file) when building a shared library bundle.
-A additional property (e.g. "cosgi.auto.static.start=shell, shell_tui") can be used to specify
which 
-symbol prefixes to use.
-
-Note that if this is implemented it would also be a good moment to add a compile option /
launcher option
-to disable dynamic loading of libraries. This way shared library based bundles can be used
during 
-development, but for production a static executable with no capability to add bundles runtime

-could be used if preferable. 
-
-# Apache Celix 2.1.0
-
-Date: TBD (Jan 2018)
-
-Note a short comming is that there is still no good support for export and import libraries
between
-bundles. For Linux dlmopen is a solution, but for a more broader UNIX support a more "creative"

-solution is needed (e.g. Just in time replacing the SONAME and NEEDED values in the respective
shared libraries)
-
-## Extend Dependency Manager C/C++ (CELIX-409)
-
-The dependency manager offers declarative API for working with services and is arguable more
easier 
-to use than the official OSGi Api. Extend the DM so that in can be used for virtually any
bundle 
-without directly using the bundle context, bundle, module, service ref, service registration,
etc API.
-This provided a much smaller API providing almost the same functionality.
-
-This means:
-1. Add support for service factory 
-1. Add support for providing listener hooks. Note that this is already supported by registering

-   a `listener_hook_service` service, but maybe a more abstracted way.
-1. Add support looking up and opening resources in the bundle.
-1. Replace add,remove, etc callbacks which uses the service reference, with callbacks using
properties
-1. Test if the dm correctly works when adding / removing provided services and service dependencies
after a component is started.
-1. Getting framework properties (e.g. bundleContext_getProperty)
-1. Support for getting basic info from bundle (version, symbolic name, manifest)
-
-## Add framework services (TODO issue)
-Apache Celix is a framework for service oriented programming, this should also include for
interacting with the 
-framework itself. Create framework services for:
-
-1. bundle management: installing, Starting, Stopping, deinstalling, listing, etc bundles.
-1. service registry info: nr of service registered, nr of service listeners, etc.
-1. framework listenerL start, stop, error events (whiteboard)
-1. bundle listener: installed, start, stop, deinstalled events (whiteboard)
-
-## Support dependency manager from framework (TODO issue)
-Because the dependency manager is actual the preferred way to write bundles, this should
be support
-like "normal" activators" directly from the framework without using a static library.
-
-## Refactor Celix provided bundles to use dependency manager and framework services (TODO
issue)
-Refactor Celix bundles (shell, shell_tuu, RSA, etc) to use the dependency manager instead
of a "vanilla" 
-bundle activator. The dependency manager should be the preferred way to handle services.

-Also instead of directly using the API from bundle_context, bundle, module, etc the framework
services
-should be used.
-
-## Create dfi descriptor generator (TODO issue)
-Create a descriptor generator which can parse type and service headers. 
-This can be relatively easy  achieved by (e.g.) using the libclang library. 
-Also extend the CMake add_bundle command and create a CMake bundle_add_descriptors command
to be able
-to add the descriptors to the bundle
-
-## Use dfi descriptor in service registrations/references (TODO issue)
-When available dfi descriptors can be used in Celix to validate if service are compatible
and
-in case of the provided service having more functions than the consumer needs, create a (cast
to) 
-a compatible consumer version.
-
-# Apache Celix 3.0.0
-
-Date: TBD (aug 2018)
-
-## Remove support for "vanilla" bundle activators (TODO issue)
-When all Celix provided bundles are using the dependency manager and framework services support
for
-the "vanilla"  bundle activator can be dropped. Also a lot internals can be refactored because
the public
-API should have shrunk quite a bit; This should lead to smaller code base -> less complex,
easier to maintain
-and a smaller footprint.
-
-  
-## Refactor service registry to a single threaded design (TODO issue)
-Celix currently has some nested lock. It would be preferable to remove these, but this is
difficult 
-because they are used to sync events which react on registering/unregistering services. Specially
when 
-a unregister/register event leads to other services being registered/unregistered. One way
to deal with 
-this sync problem is to remove it by adding a single thread which handle al interaction between
bundles 
-and the service registry.


Mime
View raw message