celix git commit: CELIX-228: Added README.md to give a short intro into Apache Celix for github users
Repository: celix Updated Branches: refs/heads/master 5984c1a70 - b577cce99 CELIX-228: Added README.md to give a short intro into Apache Celix for github users Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b577cce9 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b577cce9 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b577cce9 Branch: refs/heads/master Commit: b577cce9942adbda310d4bc7f134144dd0d6ae90 Parents: 5984c1a Author: Pepijn Noltes pepijnnol...@gmail.com Authored: Fri Mar 27 11:12:56 2015 +0100 Committer: Pepijn Noltes pepijnnol...@gmail.com Committed: Fri Mar 27 11:12:56 2015 +0100 -- README.md | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/celix/blob/b577cce9/README.md -- diff --git a/README.md b/README.md new file mode 100644 index 000..e187ebb --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +#Apache Celix +Apache Celix is an implementation of the OSGi specification adapted to C. It will follow the API as close as possible, but since the OSGi specification is written primarily for Java, there will be differences (Java is OO, C is procedural). An important aspect of the implementation is interoperability between Java and C. This interoperability is achieved by porting and implementing the Remote Services specification in Celix. + +##Building +For information how to build Apache Celix see BUILDING + +##Introduction to Apache Celix +For an introduction into Apache Celix see [Getting Started Guide](https://celix.apache.org/documentation/getting_started.html)
[jira] [Comment Edited] (CELIX-228) Update website for move to git
[ https://issues.apache.org/jira/browse/CELIX-228?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14380581#comment-14380581 ] Pepijn Noltes edited comment on CELIX-228 at 3/27/15 10:19 AM: --- Update the following pages: (x) releasing.mdtext (x) buildingandrunning.mdtext (x) getting_started.mdtext (x) examples/helloworld-links.mdtext (x) links.mdtext (/) README.md in github was (Author: pnoltes): Update the following pages: (x) releasing.mdtext (x) buildingandrunning.mdtext (x) getting_started.mdtext (x) examples/helloworld-links.mdtext (x) links.mdtext (x) README.md in github Update website for move to git -- Key: CELIX-228 URL: https://issues.apache.org/jira/browse/CELIX-228 Project: Celix Issue Type: Improvement Reporter: Pepijn Noltes Assignee: Pepijn Noltes -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (CELIX-229) Make APR optional
Alexander Broekhuis created CELIX-229: - Summary: Make APR optional Key: CELIX-229 URL: https://issues.apache.org/jira/browse/CELIX-229 Project: Celix Issue Type: Bug Reporter: Alexander Broekhuis Even though APR is still not yet completely removed from all different subproject, it is save enough to make APR optional. To do this the following is needed: * Add a build option to enable/disable APR * Create a header file with define for APR usage in the source (when APR is used, the framework has to provide it to the bundles) * Add dependency to subprojects needing APR -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[1/2] celix git commit: CELIX-230: Initial refatoring. Got ps up again, usage and description not yet working.
Repository: celix
Updated Branches:
refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
[created] 595f3e993
CELIX-230: Initial refatoring. Got ps up again, usage and description not yet
working.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/cea3f9ec
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/cea3f9ec
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/cea3f9ec
Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: cea3f9ec04d0ff8dcc76e3c38ba60dc7a55d250f
Parents: b3271bc
Author: Pepijn Noltes pepijnnol...@gmail.com
Authored: Fri Mar 27 17:35:00 2015 +0100
Committer: Pepijn Noltes pepijnnol...@gmail.com
Committed: Fri Mar 27 17:35:00 2015 +0100
--
framework/private/src/service_reference.c | 2 +-
launcher/private/src/launcher.c | 2 +
shell/CMakeLists.txt | 28 +---
shell/private/include/help_command.h | 33
shell/private/include/inspect_command.h | 33
shell/private/include/install_command.h | 33
shell/private/include/log_command.h | 33
shell/private/include/ps_command.h| 33
shell/private/include/start_command.h | 33
shell/private/include/std_commands.h | 40 +
shell/private/include/stop_command.h | 33
shell/private/include/uninstall_command.h | 33
shell/private/include/update_command.h| 35 -
shell/private/src/activator.c | 192 +--
shell/private/src/ps_command.c| 209 -
shell/private/src/shell.c | 64
shell/public/include/command.h| 11 +-
shell/public/include/command_impl.h | 48 --
shell/public/include/shell.h | 1 -
shell/public/src/command.c| 45 --
20 files changed, 252 insertions(+), 689 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/celix/blob/cea3f9ec/framework/private/src/service_reference.c
--
diff --git a/framework/private/src/service_reference.c
b/framework/private/src/service_reference.c
index 9f954c5..a9bfff4 100644
--- a/framework/private/src/service_reference.c
+++ b/framework/private/src/service_reference.c
@@ -26,6 +26,7 @@
#include stdio.h
#include stdlib.h
#include constants.h
+#include stdint.h
#include service_reference.h
@@ -37,7 +38,6 @@
#include bundle.h
#include celix_log.h
-
celix_status_t serviceReference_create(bundle_pt bundle,
service_registration_pt registration, service_reference_pt *reference) {
celix_status_t status = CELIX_SUCCESS;
http://git-wip-us.apache.org/repos/asf/celix/blob/cea3f9ec/launcher/private/src/launcher.c
--
diff --git a/launcher/private/src/launcher.c b/launcher/private/src/launcher.c
index 139d355..1a1f71e 100644
--- a/launcher/private/src/launcher.c
+++ b/launcher/private/src/launcher.c
@@ -27,6 +27,8 @@
#include string.h
#include stdlib.h
#include libgen.h
+#include signal.h
+
#include curl/curl.h
http://git-wip-us.apache.org/repos/asf/celix/blob/cea3f9ec/shell/CMakeLists.txt
--
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 07f4c6e..8308369 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -23,30 +23,18 @@ if (SHELL)
SET_HEADERS(Bundle-Name: Apache Celix Shell)
bundle(shell SOURCES
- public/src/command
private/src/activator
private/src/shell
private/src/ps_command
- private/src/start_command
- private/src/stop_command
- private/src/install_command
- private/src/update_command
- private/src/uninstall_command
- private/src/log_command
- private/src/inspect_command
- private/src/help_command
-
-private/include/inspect_command.h
-private/include/install_command.h
-private/include/log_command.h
-private/include/ps_command.h
-private/include/shell_private.h
-private/include/start_command.h
-private/include/stop_command.h
-private/include/uninstall_command.h
-private/include/update_command.h
-private/include/help_command.h
+ #private/src/start_command
+ #private/src/stop_command
+ #private/src/install_command
+ #private/src/update_command
+ #private/src/uninstall_command
+ #private/src/log_command
+ #private/src/inspect_command
+ #private/src/help_command
)
install_bundle(shell
Git Push Summary
Repository: celix Updated Branches: refs/heads/shell_command [deleted] 595f3e993
[2/2] celix git commit: CELIX-230: Fixed bug, added start command
CELIX-230: Fixed bug, added start command
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/595f3e99
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/595f3e99
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/595f3e99
Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 595f3e9931f5b0ab11d2a2e6ea39360e85a40695
Parents: cea3f9e
Author: Pepijn Noltes pepijnnol...@gmail.com
Authored: Fri Mar 27 17:58:31 2015 +0100
Committer: Pepijn Noltes pepijnnol...@gmail.com
Committed: Fri Mar 27 17:58:31 2015 +0100
--
shell/CMakeLists.txt | 2 +-
shell/private/src/activator.c | 15 +++---
shell/private/src/start_command.c | 37 --
3 files changed, 22 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/celix/blob/595f3e99/shell/CMakeLists.txt
--
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 8308369..09777d3 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -27,7 +27,7 @@ if (SHELL)
private/src/activator
private/src/shell
private/src/ps_command
- #private/src/start_command
+ private/src/start_command
#private/src/stop_command
#private/src/install_command
#private/src/update_command
http://git-wip-us.apache.org/repos/asf/celix/blob/595f3e99/shell/private/src/activator.c
--
diff --git a/shell/private/src/activator.c b/shell/private/src/activator.c
index 595894e..ce01b59 100644
--- a/shell/private/src/activator.c
+++ b/shell/private/src/activator.c
@@ -47,6 +47,7 @@ struct command {
static struct command std_commands[] = {
{psCommand_execute, ps, list installed bundles., ps [-l | -s |
-u], NULL, NULL, NULL},
+{startCommand_execute, start, start bundle(s)., start id [id
...], NULL, NULL, NULL},
{NULL, NULL, NULL, NULL, NULL, NULL, NULL} /*marker for last element*/
};
@@ -56,15 +57,8 @@ struct bundle_instance {
service_registration_pt registration;
service_listener_pt listener;
- service_registration_pt commandRegistrations;
- command_service_pt commandServices;
- properties_pt commandProperties;
-
/*
ps
- service_registration_pt startCommand;
- command_pt startCmd;
- command_service_pt startCmdSrv;
service_registration_pt stopCommand;
command_pt stopCmd;
@@ -180,6 +174,7 @@ celix_status_t bundleActivator_start(void * userData,
bundle_context_pt context)
if (status != CELIX_SUCCESS) {
break;
}
+i += 1;
}
}
@@ -198,7 +193,9 @@ celix_status_t bundleActivator_stop(void * userData,
bundle_context_pt context)
while (std_commands[i].exec != NULL) {
if (std_commands[i].reg!= NULL) {
serviceRegistration_unregister(std_commands[i].reg);
+std_commands[i].reg = NULL;
}
+i += 1;
}
status = bundleContext_removeServiceListener(context, bi-listener);
@@ -220,5 +217,9 @@ celix_status_t bundleActivator_destroy(void * userData,
bundle_context_pt contex
i += 1;
}
+ if (bi != NULL) {
+free(bi);
+ }
+
return CELIX_SUCCESS;
}
http://git-wip-us.apache.org/repos/asf/celix/blob/595f3e99/shell/private/src/start_command.c
--
diff --git a/shell/private/src/start_command.c
b/shell/private/src/start_command.c
index 89103eb..0e5f5e0 100644
--- a/shell/private/src/start_command.c
+++ b/shell/private/src/start_command.c
@@ -25,51 +25,40 @@
*/
#include stdlib.h
#include string.h
+#include stdio.h
-#include command_impl.h
+#include celix_errno.h
+#include std_commands.h
#include array_list.h
#include bundle_context.h
#include bundle.h
-void startCommand_execute(command_pt command, char * line, void (*out)(char
*), void (*err)(char *));
+celix_status_t startCommand_execute(void *handle, char * line, FILE
*outStream, FILE *errStream) {
+ celix_status_t status = CELIX_SUCCESS;
+ bundle_context_pt context = handle;
-command_pt startCommand_create(bundle_context_pt context) {
- command_pt command = (command_pt) malloc(sizeof(*command));
- command-bundleContext = context;
- command-name = start;
- command-shortDescription = start bundle(s).;
- command-usage = start id [id ...];
- command-executeCommand = startCommand_execute;
- return command;
-}
-
-void
Git Push Summary
Repository: celix Updated Branches: refs/heads/feature/CELIX-77_config_admin [created] 3b1f1756a
celix git commit: CELIX-229:
Repository: celix
Updated Branches:
refs/heads/develop b3271bcad - e8984dad1
CELIX-229:
* Removed unneeded APR_INCLUDE_DIR and APR_LIBRARY usage in cmake files
* corrected some missing includes
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e8984dad
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e8984dad
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e8984dad
Branch: refs/heads/develop
Commit: e8984dad1f646edd73cba196d1d77c5dd3594ea1
Parents: b3271bc
Author: Pepijn Noltes pepijnnol...@gmail.com
Authored: Fri Mar 27 21:01:18 2015 +0100
Committer: Pepijn Noltes pepijnnol...@gmail.com
Committed: Fri Mar 27 21:01:18 2015 +0100
--
deployment_admin/CMakeLists.txt | 4 +---
deployment_admin/private/src/deployment_admin.c | 1 +
device_access/device_access/CMakeLists.txt | 2 +-
device_access/driver_locator/CMakeLists.txt | 2 +-
device_access/example/base_driver/CMakeLists.txt | 2 +-
device_access/example/consuming_driver/CMakeLists.txt| 2 +-
device_access/example/refining_driver/CMakeLists.txt | 2 +-
.../example/refining_driver/private/src/refining_driver.c| 1 +
framework/private/src/service_reference.c| 1 +
launcher/private/src/launcher.c | 1 +
utils/CMakeLists.txt | 1 -
11 files changed, 10 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/deployment_admin/CMakeLists.txt
--
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index cdb1acd..cd267bf 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -27,8 +27,6 @@ if (DEPLOYMENT_ADMIN)
SET_HEADERS(Bundle-Name: Apache Celix Deployment Admin)
include_directories(${CURL_INCLUDE_DIR})
-include_directories(${APR_INCLUDE_DIR})
-include_directories(${APRUTIL_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/utils/public/include)
include_directories(${PROJECT_SOURCE_DIR}/deployment_admin/private/include)
include_directories(${PROJECT_SOURCE_DIR}/deployment_admin/public/include)
@@ -60,5 +58,5 @@ if (DEPLOYMENT_ADMIN)
public/include/resource_processor.h
)
-target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES}
${APR_LIBRARY} ${APRUTIL_LIBRARY})
+target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
endif (DEPLOYMENT_ADMIN)
http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/deployment_admin/private/src/deployment_admin.c
--
diff --git a/deployment_admin/private/src/deployment_admin.c
b/deployment_admin/private/src/deployment_admin.c
index 6ef80dc..8c81b59 100644
--- a/deployment_admin/private/src/deployment_admin.c
+++ b/deployment_admin/private/src/deployment_admin.c
@@ -29,6 +29,7 @@
#include stdio.h
#include unistd.h
#include string.h
+#include stdint.h
#include dirent.h
#include sys/types.h
http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/device_access/device_access/CMakeLists.txt
--
diff --git a/device_access/device_access/CMakeLists.txt
b/device_access/device_access/CMakeLists.txt
index 82b9e09..7d7b79b 100644
--- a/device_access/device_access/CMakeLists.txt
+++ b/device_access/device_access/CMakeLists.txt
@@ -52,4 +52,4 @@
include_directories(${PROJECT_SOURCE_DIR}/log_service/public/include)
include_directories(public/include)
include_directories(private/include)
-target_link_libraries(device_manager celix_framework celix_utils
${APR_LIBRARY})
+target_link_libraries(device_manager celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/device_access/driver_locator/CMakeLists.txt
--
diff --git a/device_access/driver_locator/CMakeLists.txt
b/device_access/driver_locator/CMakeLists.txt
index 29b0352..61d25f9 100644
--- a/device_access/driver_locator/CMakeLists.txt
+++ b/device_access/driver_locator/CMakeLists.txt
@@ -33,4 +33,4 @@ include_directories(private/include)
include_directories(${PROJECT_SOURCE_DIR}/framework/public/include)
include_directories(${PROJECT_SOURCE_DIR}/utils/public/include)
-target_link_libraries(driver_locator celix_utils celix_framework
${APR_LIBRARY})
+target_link_libraries(driver_locator celix_utils celix_framework)
celix git commit: CELIX-230: * Updated all commands to use new structure and service registration. * Moved static global field to shell activator instance. * (Re)implemented getUsage and getDescriptio
Repository: celix
Updated Branches:
refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
595f3e993 - 4d52743ee
CELIX-230:
* Updated all commands to use new structure and service registration.
* Moved static global field to shell activator instance.
* (Re)implemented getUsage and getDescription functions of the shell.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4d52743e
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4d52743e
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4d52743e
Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: 4d52743eee05782afd0cb8b1b3f9d2de7808d1aa
Parents: 595f3e9
Author: Alexander Broekhuis a.broekh...@gmail.com
Authored: Fri Mar 27 22:01:30 2015 +0100
Committer: Alexander Broekhuis a.broekh...@gmail.com
Committed: Fri Mar 27 22:01:30 2015 +0100
--
shell/CMakeLists.txt | 14 ++--
shell/private/include/shell_private.h | 2 +-
shell/private/src/activator.c | 114 ++-
shell/private/src/help_command.c | 44 +++
shell/private/src/inspect_command.c | 121 ++---
shell/private/src/install_command.c | 49 +++-
shell/private/src/log_command.c | 47 +++
shell/private/src/ps_command.c| 5 +-
shell/private/src/shell.c | 55 ++---
shell/private/src/stop_command.c | 34 +++-
shell/private/src/uninstall_command.c | 33 ++--
shell/private/src/update_command.c| 42 +++---
shell/public/include/shell.h | 1 +
13 files changed, 194 insertions(+), 367 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/celix/blob/4d52743e/shell/CMakeLists.txt
--
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 09777d3..66194ce 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -28,13 +28,13 @@ if (SHELL)
private/src/shell
private/src/ps_command
private/src/start_command
- #private/src/stop_command
- #private/src/install_command
- #private/src/update_command
- #private/src/uninstall_command
- #private/src/log_command
- #private/src/inspect_command
- #private/src/help_command
+ private/src/stop_command
+ private/src/install_command
+ private/src/update_command
+ private/src/uninstall_command
+ private/src/log_command
+ private/src/inspect_command
+ private/src/help_command
)
install_bundle(shell
http://git-wip-us.apache.org/repos/asf/celix/blob/4d52743e/shell/private/include/shell_private.h
--
diff --git a/shell/private/include/shell_private.h
b/shell/private/include/shell_private.h
index db609ca..9734ad5 100644
--- a/shell/private/include/shell_private.h
+++ b/shell/private/include/shell_private.h
@@ -45,7 +45,7 @@ celix_status_t shell_addCommand(shell_pt shell,
service_reference_pt reference);
char * shell_getCommandUsage(shell_pt shell, char * commandName);
char * shell_getCommandDescription(shell_pt shell, char * commandName);
-service_reference_pt shell_getCommandReference(shell_pt shell, char * command);
+celix_status_t shell_getCommandReference(shell_pt shell_ptr, char
*command_name_str, service_reference_pt *command_reference_ptr);
void shell_executeCommand(shell_pt shell, char * commandLine, void (*out)(char
*), void (*error)(char *));
void shell_serviceChanged(service_listener_pt listener, service_event_pt
event);
http://git-wip-us.apache.org/repos/asf/celix/blob/4d52743e/shell/private/src/activator.c
--
diff --git a/shell/private/src/activator.c b/shell/private/src/activator.c
index ce01b59..cfa8bb3 100644
--- a/shell/private/src/activator.c
+++ b/shell/private/src/activator.c
@@ -24,16 +24,12 @@
* \copyright Apache License, Version 2.0
*/
#include stdlib.h
-#include string.h
#include shell_private.h
#include bundle_activator.h
-#include bundle_context.h
-#include service_registration.h
-#include service_listener.h
-#include utils.h
#include std_commands.h
-#include properties.h
+
+#define NUMBER_OF_COMMANDS 10
struct command {
celix_status_t (*exec)(void *handle, char *commandLine, FILE *out, FILE
*err);
@@ -45,55 +41,18 @@ struct command {
properties_pt props;
};
-static struct command std_commands[] = {
-{psCommand_execute, ps, list installed bundles., ps [-l | -s |
-u], NULL, NULL, NULL},
-{startCommand_execute, start, start bundle(s)., start id [id
...], NULL, NULL, NULL},
-{NULL, NULL, NULL, NULL, NULL, NULL, NULL} /*marker for
