This is an automated email from the ASF dual-hosted git repository.
rlenferink pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/master by this push:
new 003ebb8 Updated develop -> master
003ebb8 is described below
commit 003ebb8e8afe9078d0de7e2b9b0b626e2a512bd7
Author: Roy Lenferink <[email protected]>
AuthorDate: Fri May 8 11:54:45 2020 +0200
Updated develop -> master
---
README.md | 2 +-
bundles/remote_services/README.md | 6 +++---
libs/etcdlib/README.md | 14 +++++++-------
misc/Dockerfile.Android | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index a1a9b5e..0e93020 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
-->
-# Apache Celix [](https://travis-ci.org/apache/celix)
[](https://coveralls.io/github/apache/celix?branch=develop)
[](https://scan.coverity.com/projects/6685)
+# Apache Celix [](https://travis-ci.org/apache/celix)
[](https://coveralls.io/github/apache/celix?branch=master)
[](https://scan.coverity.com/projects/6685)
Apache Celix is an implementation of the OSGi specification adapted to C and
C++ (C++11). It is a framework to develop (dynamic) modular software
applications using component and/or service-oriented programming.
## Building
diff --git a/bundles/remote_services/README.md
b/bundles/remote_services/README.md
index b742270..3c1d962 100644
--- a/bundles/remote_services/README.md
+++ b/bundles/remote_services/README.md
@@ -106,9 +106,9 @@ To develop for the Remote Service Admin implementation of
Celix, one needs the f
The Celix source repository provides a simple calculator example that shows
all of the described parts:
-1. [The calculator service
interface](https://github.com/apache/celix/blob/develop/bundles/remote_services/examples/calculator_api/include/calculator_service.h),
providing three methods: one for adding two numbers, one for subtracting two
numbers, and lastly, a method that calculates the square root of a number;
-2. [A calculator service
implementation](https://github.com/apache/celix/blob/develop/bundles/remote_services/examples/calculator_service/src/calculator_impl.c)
that simply implements the three previously described functions. To mark this
service as "remote service", you need to add the `service.exported.interfaces`
service property to its service registration. This way, the RSA implementation
can expose it as remote service to others;
-3. [A service
client](https://github.com/apache/celix/blob/develop/bundles/remote_services/examples/calculator_shell/src/add_command.c),
that exposes the three calculator methods to as Celix shell commands. The
implementation simply retrieves the calculator service as it would do with any
other Celix service.
+1. [The calculator service
interface](https://github.com/apache/celix/blob/master/bundles/remote_services/examples/calculator_api/include/calculator_service.h),
providing three methods: one for adding two numbers, one for subtracting two
numbers, and lastly, a method that calculates the square root of a number;
+2. [A calculator service
implementation](https://github.com/apache/celix/blob/master/bundles/remote_services/examples/calculator_service/src/calculator_impl.c)
that simply implements the three previously described functions. To mark this
service as "remote service", you need to add the `service.exported.interfaces`
service property to its service registration. This way, the RSA implementation
can expose it as remote service to others;
+3. [A service
client](https://github.com/apache/celix/blob/master/bundles/remote_services/examples/calculator_shell/src/add_command.c),
that exposes the three calculator methods to as Celix shell commands. The
implementation simply retrieves the calculator service as it would do with any
other Celix service.
If you have access to the Celix source repository, you can run the calculator
example using various discovery implementations by invoking the `deploy`
target. You can find the example deployments in the `CELIX_BUILD/deploy`
directory. For example, to run the calculator example using the configured
discovery mechanism, you should open two terminals. In the first terminal, type:
diff --git a/libs/etcdlib/README.md b/libs/etcdlib/README.md
index 2670153..4c3f94b 100644
--- a/libs/etcdlib/README.md
+++ b/libs/etcdlib/README.md
@@ -25,13 +25,13 @@ Etcdlib can be used as part of Celix but is also usable
stand-alone.
## Preparing
The following packages (libraries + headers) should be installed on your
system:
-* Development Environment
- * build-essentials (gcc/g++ or clang/clang++)
- * cmake (3.2 or higher)
+* Development Environment
+ * build-essentials (gcc/g++ or clang/clang++)
+ * cmake (3.2 or higher)
-* Etcdlib Dependencies
- * curl
- * jansson
+* Etcdlib Dependencies
+ * curl
+ * jansson
## Download the Apache Celix sources
To get started you first have to download the Apache Celix sources. This can
be done by cloning the Apache Celix git repository:
@@ -43,7 +43,7 @@ export WS=${HOME}/workspace
cd ${WS}
# clone the repro
-git clone --single-branch --branch develop https://github.com/apache/celix.git
+git clone --single-branch --branch master https://github.com/apache/celix.git
```
## Building
diff --git a/misc/Dockerfile.Android b/misc/Dockerfile.Android
index b37d712..8e27f09 100644
--- a/misc/Dockerfile.Android
+++ b/misc/Dockerfile.Android
@@ -130,7 +130,7 @@ RUN curl -L -O
ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz && \
# finally add celix src
-RUN git clone -b develop --single-branch https://github.com/apache/celix.git
celix
+RUN git clone -b master --single-branch https://github.com/apache/celix.git
celix
CMD mkdir -p celix/build-android && cd celix/build-android && cmake
-DANDROID=TRUE -DENABLE_TESTING=OFF -DBUILD_EXAMPLES=OFF
-DBUILD_DEPENDENCY_MANAGER_CXX=OFF -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_REMOTE_SHELL=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=OFF -DBUILD_RSA_TOPOLOGY_MANAGER=ON
-DFFI_LIBRARY=/build/output/libffi/lib/libffi.a -DFFI_INCLUDE_DIR=/build [...]
