You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2013/12/17 09:59:25 UTC
svn commit: r1551490 [2/2] - in /incubator/celix/trunk:
dependency_manager/private/src/ dependency_manager/public/include/
deployment_admin/private/src/ deployment_admin/public/include/
device_access/device_access/private/src/ device_access/device_acce...
Modified: incubator/celix/trunk/framework/private/src/manifest_parser.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/manifest_parser.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/manifest_parser.c (original)
+++ incubator/celix/trunk/framework/private/src/manifest_parser.c Tue Dec 17 08:59:23 2013
@@ -66,7 +66,7 @@ celix_status_t manifestParser_create(mod
parser->manifest = manifest;
parser->owner = owner;
- bundleVersion = manifest_getValue(manifest, BUNDLE_VERSION);
+ bundleVersion = manifest_getValue(manifest, OSGI_FRAMEWORK_BUNDLE_VERSION);
if (bundleVersion != NULL) {
parser->bundleVersion = NULL;
version_createVersionFromString(memory_pool, bundleVersion, &parser->bundleVersion);
@@ -74,13 +74,13 @@ celix_status_t manifestParser_create(mod
parser->bundleVersion = NULL;
version_createEmptyVersion(memory_pool, &parser->bundleVersion);
}
- bundleSymbolicName = manifest_getValue(manifest, BUNDLE_SYMBOLICNAME);
+ bundleSymbolicName = manifest_getValue(manifest, OSGI_FRAMEWORK_BUNDLE_SYMBOLICNAME);
if (bundleSymbolicName != NULL) {
parser->bundleSymbolicName = bundleSymbolicName;
}
- parser->capabilities = manifestParser_parseExportHeader(owner, manifest_getValue(manifest, EXPORT_PACKAGE), memory_pool);
- parser->requirements = manifestParser_parseImportHeader(manifest_getValue(manifest, IMPORT_PACKAGE), memory_pool);
+ parser->capabilities = manifestParser_parseExportHeader(owner, manifest_getValue(manifest, OSGI_FRAMEWORK_EXPORT_PACKAGE), memory_pool);
+ parser->requirements = manifestParser_parseImportHeader(manifest_getValue(manifest, OSGI_FRAMEWORK_IMPORT_PACKAGE), memory_pool);
*manifest_parser = parser;
Modified: incubator/celix/trunk/framework/private/src/service_registration.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registration.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registration.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registration.c Tue Dec 17 08:59:23 2013
@@ -104,8 +104,8 @@ static celix_status_t serviceRegistratio
registration->properties = dictionary;
sprintf(sId, "%ld", registration->serviceId);
- properties_set(dictionary, (char *) SERVICE_ID, sId);
- properties_set(dictionary, (char *) OBJECTCLASS, registration->className);
+ properties_set(dictionary, (char *) OSGI_FRAMEWORK_SERVICE_ID, sId);
+ properties_set(dictionary, (char *) OSGI_FRAMEWORK_OBJECTCLASS, registration->className);
free(sId);
return CELIX_SUCCESS;
Modified: incubator/celix/trunk/framework/private/src/service_registry.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_registry.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_registry.c (original)
+++ incubator/celix/trunk/framework/private/src/service_registry.c Tue Dec 17 08:59:23 2013
@@ -223,7 +223,7 @@ celix_status_t serviceRegistry_registerS
// service_event_pt event = (service_event_pt) malloc(sizeof(*event));
// event->type = REGISTERED;
// event->reference = (*registration)->reference;
- registry->serviceChanged(registry->framework, SERVICE_EVENT_REGISTERED, *registration, NULL);
+ registry->serviceChanged(registry->framework, OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED, *registration, NULL);
// free(event);
// event = NULL;
}
@@ -250,7 +250,7 @@ celix_status_t serviceRegistry_unregiste
apr_thread_mutex_unlock(registry->mutex);
if (registry->serviceChanged != NULL) {
- registry->serviceChanged(registry->framework, SERVICE_EVENT_UNREGISTERING, registration, NULL);
+ registry->serviceChanged(registry->framework, OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING, registration, NULL);
}
apr_thread_mutex_lock(registry->mutex);
@@ -534,7 +534,7 @@ array_list_pt serviceRegistry_getUsingBu
celix_status_t serviceRegistry_addHooks(service_registry_pt registry, char *serviceName, void *serviceObject, service_registration_pt registration) {
celix_status_t status = CELIX_SUCCESS;
- if (strcmp(listener_hook_service_name, serviceName) == 0) {
+ if (strcmp(OSGI_FRAMEWORK_LISTENER_HOOK_SERVICE_NAME, serviceName) == 0) {
arrayList_add(registry->listenerHooks, registration);
}
@@ -547,8 +547,8 @@ celix_status_t serviceRegistry_removeHoo
properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
- serviceName = properties_get(props, (char *) OBJECTCLASS);
- if (strcmp(listener_hook_service_name, serviceName) == 0) {
+ serviceName = properties_get(props, (char *) OSGI_FRAMEWORK_OBJECTCLASS);
+ if (strcmp(OSGI_FRAMEWORK_LISTENER_HOOK_SERVICE_NAME, serviceName) == 0) {
arrayList_removeElement(registry->listenerHooks, registration);
}
@@ -580,7 +580,7 @@ celix_status_t serviceRegistry_getListen
celix_status_t serviceRegistry_servicePropertiesModified(service_registry_pt registry, service_registration_pt registration, properties_pt oldprops) {
if (registry->serviceChanged != NULL) {
- registry->serviceChanged(registry->framework, SERVICE_EVENT_MODIFIED, registration, oldprops);
+ registry->serviceChanged(registry->framework, OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED, registration, oldprops);
}
return CELIX_SUCCESS;
Modified: incubator/celix/trunk/framework/private/src/service_tracker.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/service_tracker.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/service_tracker.c (original)
+++ incubator/celix/trunk/framework/private/src/service_tracker.c Tue Dec 17 08:59:23 2013
@@ -47,8 +47,8 @@ celix_status_t serviceTracker_create(apr
status = CELIX_ILLEGAL_ARGUMENT;
} else {
if (status == CELIX_SUCCESS) {
- int len = strlen(service) + strlen(OBJECTCLASS) + 4;
- char *filter = apr_pstrcat(pool, "(", OBJECTCLASS, "=", service, ")", NULL);
+ int len = strlen(service) + strlen(OSGI_FRAMEWORK_OBJECTCLASS) + 4;
+ char *filter = apr_pstrcat(pool, "(", OSGI_FRAMEWORK_OBJECTCLASS, "=", service, ")", NULL);
if (filter == NULL) {
status = CELIX_ENOMEM;
} else {
@@ -217,14 +217,14 @@ void *serviceTracker_getServiceByReferen
void serviceTracker_serviceChanged(service_listener_pt listener, service_event_pt event) {
service_tracker_pt tracker = listener->handle;
switch (event->type) {
- case SERVICE_EVENT_REGISTERED:
- case SERVICE_EVENT_MODIFIED:
+ case OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED:
+ case OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED:
serviceTracker_track(tracker, event->reference, event);
break;
- case SERVICE_EVENT_UNREGISTERING:
+ case OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING:
serviceTracker_untrack(tracker, event->reference, event);
break;
- case SERVICE_EVENT_MODIFIED_ENDMATCH:
+ case OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH:
break;
}
}
Modified: incubator/celix/trunk/framework/private/src/version.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/version.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/version.c (original)
+++ incubator/celix/trunk/framework/private/src/version.c Tue Dec 17 08:59:23 2013
@@ -56,15 +56,15 @@ celix_status_t version_createVersion(apr
(*version)->qualifier = apr_pstrdup(pool, qualifier);
if (major < 0) {
- fw_log(FW_LOG_ERROR, "Negative major");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Negative major");
status = CELIX_ILLEGAL_ARGUMENT;
}
if (minor < 0) {
- fw_log(FW_LOG_ERROR, "Negative minor");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Negative minor");
status = CELIX_ILLEGAL_ARGUMENT;
}
if (micro < 0) {
- fw_log(FW_LOG_ERROR, "Negative micro");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Negative micro");
status = CELIX_ILLEGAL_ARGUMENT;
}
@@ -82,7 +82,7 @@ celix_status_t version_createVersion(apr
if ((ch == '_') || (ch == '-')) {
continue;
}
- fw_log(FW_LOG_ERROR, "Invalid qualifier");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Invalid qualifier");
status = CELIX_ILLEGAL_ARGUMENT;
break;
}
@@ -128,7 +128,7 @@ celix_status_t version_createVersionFrom
if (('0' <= ch) && (ch <= '9')) {
continue;
}
- fw_log(FW_LOG_ERROR, "Invalid format");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Invalid format");
status = CELIX_ILLEGAL_ARGUMENT;
break;
}
@@ -140,7 +140,7 @@ celix_status_t version_createVersionFrom
if (('0' <= ch) && (ch <= '9')) {
continue;
}
- fw_log(FW_LOG_ERROR, "Invalid format");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Invalid format");
status = CELIX_ILLEGAL_ARGUMENT;
break;
}
@@ -152,7 +152,7 @@ celix_status_t version_createVersionFrom
if (('0' <= ch) && (ch <= '9')) {
continue;
}
- fw_log(FW_LOG_ERROR, "Invalid format");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "Invalid format");
status = CELIX_ILLEGAL_ARGUMENT;
break;
}
Modified: incubator/celix/trunk/framework/private/test/bundle_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/bundle_test.cpp?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/bundle_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/bundle_test.cpp Tue Dec 17 08:59:23 2013
@@ -77,7 +77,7 @@ TEST(bundle, create) {
LONGS_EQUAL(CELIX_SUCCESS, status);
POINTERS_EQUAL(NULL, actual->context);
POINTERS_EQUAL(NULL, actual->activator);
- LONGS_EQUAL(BUNDLE_INSTALLED, actual->state);
+ LONGS_EQUAL(OSGI_FRAMEWORK_BUNDLE_INSTALLED, actual->state);
POINTERS_EQUAL(NULL, actual->handle);
POINTERS_EQUAL(archive, actual->archive);
CHECK(actual->modules);
@@ -142,7 +142,7 @@ TEST(bundle, createFromArchive) {
LONGS_EQUAL(CELIX_SUCCESS, status);
POINTERS_EQUAL(NULL, actual->context);
POINTERS_EQUAL(NULL, actual->activator);
- LONGS_EQUAL(BUNDLE_INSTALLED, actual->state);
+ LONGS_EQUAL(OSGI_FRAMEWORK_BUNDLE_INSTALLED, actual->state);
POINTERS_EQUAL(NULL, actual->handle);
POINTERS_EQUAL(archive, actual->archive);
CHECK(actual->modules);
@@ -278,21 +278,21 @@ TEST(bundle, getEntry) {
TEST(bundle, getState) {
bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle));
- bundle->state = BUNDLE_ACTIVE;
+ bundle->state = OSGI_FRAMEWORK_BUNDLE_ACTIVE;
- bundle_state_e actual = BUNDLE_UNKNOWN;
+ bundle_state_e actual = OSGI_FRAMEWORK_BUNDLE_UNKNOWN;
celix_status_t status = bundle_getState(bundle, &actual);
LONGS_EQUAL(CELIX_SUCCESS, status);
- POINTERS_EQUAL(BUNDLE_ACTIVE, actual);
+ POINTERS_EQUAL(OSGI_FRAMEWORK_BUNDLE_ACTIVE, actual);
}
TEST(bundle, setState) {
bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle));
- bundle->state = BUNDLE_UNKNOWN;
+ bundle->state = OSGI_FRAMEWORK_BUNDLE_UNKNOWN;
- celix_status_t status = bundle_setState(bundle, BUNDLE_INSTALLED);
+ celix_status_t status = bundle_setState(bundle, OSGI_FRAMEWORK_BUNDLE_INSTALLED);
LONGS_EQUAL(CELIX_SUCCESS, status);
- POINTERS_EQUAL(BUNDLE_INSTALLED, bundle->state);
+ POINTERS_EQUAL(OSGI_FRAMEWORK_BUNDLE_INSTALLED, bundle->state);
}
TEST(bundle, start) {
@@ -370,7 +370,7 @@ TEST(bundle, setPersistentStateInactive)
mock().expectOneCall("bundleArchive_setPersistentState")
.withParameter("archive", archive)
- .withParameter("state", BUNDLE_INSTALLED)
+ .withParameter("state", OSGI_FRAMEWORK_BUNDLE_INSTALLED)
.andReturnValue(CELIX_SUCCESS);
celix_status_t status = bundle_setPersistentStateInactive(bundle);
@@ -390,7 +390,7 @@ TEST(bundle, setPersistentStateUninstall
mock().expectOneCall("bundleArchive_setPersistentState")
.withParameter("archive", archive)
- .withParameter("state", BUNDLE_UNINSTALLED)
+ .withParameter("state", OSGI_FRAMEWORK_BUNDLE_UNINSTALLED)
.andReturnValue(CELIX_SUCCESS);
celix_status_t status = bundle_setPersistentStateUninstalled(bundle);
Modified: incubator/celix/trunk/framework/private/test/service_tracker_test.cpp
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/test/service_tracker_test.cpp?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/test/service_tracker_test.cpp (original)
+++ incubator/celix/trunk/framework/private/test/service_tracker_test.cpp Tue Dec 17 08:59:23 2013
@@ -484,7 +484,7 @@ TEST(service_tracker, serviceChangedRegi
void *src = (void *) 0x345;
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_REGISTERED;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED;
event->reference = ref;
mock()
@@ -520,7 +520,7 @@ TEST(service_tracker, serviceChangedModi
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_MODIFIED;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED;
event->reference = ref;
mock()
@@ -556,7 +556,7 @@ TEST(service_tracker, serviceChangedUnre
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_UNREGISTERING;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING;
event->reference = ref;
mock()
@@ -597,7 +597,7 @@ TEST(service_tracker, serviceChangedModi
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_MODIFIED_ENDMATCH;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH;
event->reference = ref;
serviceTracker_serviceChanged(listener, event);
@@ -636,7 +636,7 @@ TEST(service_tracker, serviceChangedRegi
void * handle = (void*) 0x60;
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_REGISTERED;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED;
event->reference = ref;
mock()
@@ -694,7 +694,7 @@ TEST(service_tracker, serviceChangedModi
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_MODIFIED;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED;
event->reference = ref;
void * handle = (void*) 0x60;
@@ -749,7 +749,7 @@ TEST(service_tracker, serviceChangedUnre
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_UNREGISTERING;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING;
event->reference = ref;
void * handle = (void*) 0x60;
@@ -798,7 +798,7 @@ TEST(service_tracker, serviceChangedUnre
arrayList_add(tracked, entry);
service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event));
- event->type = SERVICE_EVENT_UNREGISTERING;
+ event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING;
event->reference = ref;
void * handle = (void*) 0x60;
Modified: incubator/celix/trunk/framework/public/include/bundle_event.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_event.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_event.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_event.h Tue Dec 17 08:59:23 2013
@@ -29,16 +29,16 @@
enum bundle_event_type
{
- BUNDLE_EVENT_INSTALLED = 0x00000001,
- BUNDLE_EVENT_STARTED = 0x00000002,
- BUNDLE_EVENT_STOPPED = 0x00000004,
- BUNDLE_EVENT_UPDATED = 0x00000008,
- BUNDLE_EVENT_UNINSTALLED = 0x00000010,
- BUNDLE_EVENT_RESOLVED = 0x00000020,
- BUNDLE_EVENT_UNRESOLVED = 0x00000040,
- BUNDLE_EVENT_STARTING = 0x00000080,
- BUNDLE_EVENT_STOPPING = 0x00000100,
- BUNDLE_EVENT_LAZY_ACTIVATION = 0x00000200,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_INSTALLED = 0x00000001,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_STARTED = 0x00000002,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_STOPPED = 0x00000004,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_UPDATED = 0x00000008,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_UNINSTALLED = 0x00000010,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_RESOLVED = 0x00000020,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_UNRESOLVED = 0x00000040,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_STARTING = 0x00000080,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_STOPPING = 0x00000100,
+ OSGI_FRAMEWORK_BUNDLE_EVENT_LAZY_ACTIVATION = 0x00000200,
};
typedef enum bundle_event_type bundle_event_type_e;
Modified: incubator/celix/trunk/framework/public/include/bundle_state.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/bundle_state.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/bundle_state.h (original)
+++ incubator/celix/trunk/framework/public/include/bundle_state.h Tue Dec 17 08:59:23 2013
@@ -29,13 +29,13 @@
enum bundleState
{
- BUNDLE_UNKNOWN = 0x00000000,
- BUNDLE_UNINSTALLED = 0x00000001,
- BUNDLE_INSTALLED = 0x00000002,
- BUNDLE_RESOLVED = 0x00000004,
- BUNDLE_STARTING = 0x00000008,
- BUNDLE_STOPPING = 0x00000010,
- BUNDLE_ACTIVE = 0x00000020,
+ OSGI_FRAMEWORK_BUNDLE_UNKNOWN = 0x00000000,
+ OSGI_FRAMEWORK_BUNDLE_UNINSTALLED = 0x00000001,
+ OSGI_FRAMEWORK_BUNDLE_INSTALLED = 0x00000002,
+ OSGI_FRAMEWORK_BUNDLE_RESOLVED = 0x00000004,
+ OSGI_FRAMEWORK_BUNDLE_STARTING = 0x00000008,
+ OSGI_FRAMEWORK_BUNDLE_STOPPING = 0x00000010,
+ OSGI_FRAMEWORK_BUNDLE_ACTIVE = 0x00000020,
};
typedef enum bundleState bundle_state_e;
Modified: incubator/celix/trunk/framework/public/include/celix_log.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/celix_log.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/celix_log.h (original)
+++ incubator/celix/trunk/framework/public/include/celix_log.h Tue Dec 17 08:59:23 2013
@@ -36,18 +36,18 @@
#define framework_logIfError(status, error, fmsg, args...) \
if (status != CELIX_SUCCESS) { \
if (error != NULL) { \
- fw_logCode(FW_LOG_ERROR, status, #fmsg"; cause: "#error, ## args); \
+ fw_logCode(OSGI_FRAMEWORK_LOG_ERROR, status, #fmsg"; cause: "#error, ## args); \
} else { \
- fw_logCode(FW_LOG_ERROR, status, #fmsg, ## args); \
+ fw_logCode(OSGI_FRAMEWORK_LOG_ERROR, status, #fmsg, ## args); \
} \
}
enum framework_log_level
{
- FW_LOG_ERROR = 0x00000001,
- FW_LOG_WARNING = 0x00000002,
- FW_LOG_INFO = 0x00000003,
- FW_LOG_DEBUG = 0x00000004,
+ OSGI_FRAMEWORK_LOG_ERROR = 0x00000001,
+ OSGI_FRAMEWORK_LOG_WARNING = 0x00000002,
+ OSGI_FRAMEWORK_LOG_INFO = 0x00000003,
+ OSGI_FRAMEWORK_LOG_DEBUG = 0x00000004,
};
typedef enum framework_log_level framework_log_level_t;
Modified: incubator/celix/trunk/framework/public/include/constants.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/constants.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/constants.h (original)
+++ incubator/celix/trunk/framework/public/include/constants.h Tue Dec 17 08:59:23 2013
@@ -27,25 +27,25 @@
#ifndef CONSTANTS_H_
#define CONSTANTS_H_
-static const char * const OBJECTCLASS = "objectClass";
-static const char * const SERVICE_ID = "service.id";
-static const char * const SERVICE_PID = "service.pid";
-static const char * const SERVICE_RANKING = "service.ranking";
-
-static const char * const BUNDLE_ACTIVATOR_CREATE = "bundleActivator_create";
-static const char * const BUNDLE_ACTIVATOR_START = "bundleActivator_start";
-static const char * const BUNDLE_ACTIVATOR_STOP = "bundleActivator_stop";
-static const char * const BUNDLE_ACTIVATOR_DESTROY = "bundleActivator_destroy";
-
-static const char * const HEADER_LIBRARY = "library";
-
-static const char * const BUNDLE_SYMBOLICNAME = "Bundle-SymbolicName";
-static const char * const BUNDLE_VERSION = "Bundle-Version";
-static const char * const EXPORT_PACKAGE = "Export-Service";
-static const char * const IMPORT_PACKAGE = "Import-Service";
+static const char * const OSGI_FRAMEWORK_OBJECTCLASS = "objectClass";
+static const char * const OSGI_FRAMEWORK_SERVICE_ID = "service.id";
+static const char * const OSGI_FRAMEWORK_SERVICE_PID = "service.pid";
+static const char * const OSGI_FRAMEWORK_SERVICE_RANKING = "service.ranking";
+
+static const char * const OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_CREATE = "bundleActivator_create";
+static const char * const OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_START = "bundleActivator_start";
+static const char * const OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_STOP = "bundleActivator_stop";
+static const char * const OSGI_FRAMEWORK_BUNDLE_ACTIVATOR_DESTROY = "bundleActivator_destroy";
+
+static const char * const OSGI_FRAMEWORK_HEADER_LIBRARY = "library";
+
+static const char * const OSGI_FRAMEWORK_BUNDLE_SYMBOLICNAME = "Bundle-SymbolicName";
+static const char * const OSGI_FRAMEWORK_BUNDLE_VERSION = "Bundle-Version";
+static const char * const OSGI_FRAMEWORK_EXPORT_PACKAGE = "Export-Service";
+static const char * const OSGI_FRAMEWORK_IMPORT_PACKAGE = "Import-Service";
-static const char * const FRAMEWORK_STORAGE = "org.osgi.framework.storage";
-static const char * const FRAMEWORK_UUID = "org.osgi.framework.uuid";
+static const char * const OSGI_FRAMEWORK_FRAMEWORK_STORAGE = "org.osgi.framework.storage";
+static const char * const OSGI_FRAMEWORK_FRAMEWORK_UUID = "org.osgi.framework.uuid";
#endif /* CONSTANTS_H_ */
Modified: incubator/celix/trunk/framework/public/include/framework_event.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/framework_event.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/framework_event.h (original)
+++ incubator/celix/trunk/framework/public/include/framework_event.h Tue Dec 17 08:59:23 2013
@@ -29,16 +29,16 @@
enum framework_event_type
{
- FRAMEWORK_EVENT_STARTED = 0x00000001,
- FRAMEWORK_EVENT_ERROR = 0x00000002,
- FRAMEWORK_EVENT_PACKAGES_REFRESHED = 0x00000004,
- FRAMEWORK_EVENT_STARTLEVEL_CHANGED = 0x00000008,
- FRAMEWORK_EVENT_WARNING = 0x00000010,
- FRAMEWORK_EVENT_INFO = 0x00000020,
- FRAMEWORK_EVENT_STOPPED = 0x00000040,
- FRAMEWORK_EVENT_STOPPED_UPDATE = 0x00000080,
- FRAMEWORK_EVENT_STOPPED_BOOTCLASSPATH_MODIFIED = 0x00000100,
- FRAMEWORK_EVENT_WAIT_TIMEDOUT = 0x00000200,
+ OSGI_FRAMEWORK_EVENT_STARTED = 0x00000001,
+ OSGI_FRAMEWORK_EVENT_ERROR = 0x00000002,
+ OSGI_FRAMEWORK_EVENT_PACKAGES_REFRESHED = 0x00000004,
+ OSGI_FRAMEWORK_EVENT_STARTLEVEL_CHANGED = 0x00000008,
+ OSGI_FRAMEWORK_EVENT_WARNING = 0x00000010,
+ OSGI_FRAMEWORK_EVENT_INFO = 0x00000020,
+ OSGI_FRAMEWORK_EVENT_STOPPED = 0x00000040,
+ OSGI_FRAMEWORK_EVENT_STOPPED_UPDATE = 0x00000080,
+ OSGI_FRAMEWORK_EVENT_STOPPED_BOOTCLASSPATH_MODIFIED = 0x00000100,
+ OSGI_FRAMEWORK_EVENT_WAIT_TIMEDOUT = 0x00000200,
};
typedef enum framework_event_type framework_event_type_e;
Modified: incubator/celix/trunk/framework/public/include/listener_hook_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/listener_hook_service.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/listener_hook_service.h (original)
+++ incubator/celix/trunk/framework/public/include/listener_hook_service.h Tue Dec 17 08:59:23 2013
@@ -34,7 +34,7 @@ typedef struct listener_hook_service *li
#include "bundle_context.h"
-#define listener_hook_service_name "listener_hook_service"
+#define OSGI_FRAMEWORK_LISTENER_HOOK_SERVICE_NAME "listener_hook_service"
struct listener_hook_info {
bundle_context_pt context;
Modified: incubator/celix/trunk/framework/public/include/service_event.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_event.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_event.h (original)
+++ incubator/celix/trunk/framework/public/include/service_event.h Tue Dec 17 08:59:23 2013
@@ -31,10 +31,10 @@
enum serviceEventType
{
- SERVICE_EVENT_REGISTERED = 0x00000001,
- SERVICE_EVENT_MODIFIED = 0x00000002,
- SERVICE_EVENT_UNREGISTERING = 0x00000004,
- SERVICE_EVENT_MODIFIED_ENDMATCH = 0x00000008,
+ OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED = 0x00000001,
+ OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED = 0x00000002,
+ OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING = 0x00000004,
+ OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH = 0x00000008,
};
typedef enum serviceEventType service_event_type_e;
Modified: incubator/celix/trunk/launcher/private/src/launcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/private/src/launcher.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/private/src/launcher.c (original)
+++ incubator/celix/trunk/launcher/private/src/launcher.c Tue Dec 17 08:59:23 2013
@@ -107,7 +107,7 @@ int main(void) {
// Only add bundle if it is installed correctly
arrayList_add(installed, current);
} else {
- fw_logCode(FW_LOG_ERROR, CELIX_BUNDLE_EXCEPTION, "Could not install bundle from %s", location);
+ fw_logCode(OSGI_FRAMEWORK_LOG_ERROR, CELIX_BUNDLE_EXCEPTION, "Could not install bundle from %s", location);
}
linkedListIterator_remove(iter);
}
@@ -129,13 +129,13 @@ int main(void) {
}
if (status != CELIX_SUCCESS) {
- fw_logCode(FW_LOG_ERROR, status, "Problem creating framework");
+ fw_logCode(OSGI_FRAMEWORK_LOG_ERROR, status, "Problem creating framework");
}
apr_pool_destroy(memoryPool);
apr_terminate();
- fw_log(FW_LOG_INFO, "Launcher: Exit");
+ fw_log(OSGI_FRAMEWORK_LOG_INFO, "Launcher: Exit");
return 0;
}
Modified: incubator/celix/trunk/log_service/private/src/log.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log.c (original)
+++ incubator/celix/trunk/log_service/private/src/log.c Tue Dec 17 08:59:23 2013
@@ -173,7 +173,7 @@ celix_status_t log_bundleChanged(void *l
}
if (message != NULL) {
- status = logEntry_create(event->bundle, NULL, LOG_INFO, message, 0, logger->pool, &entry);
+ status = logEntry_create(event->bundle, NULL, OSGI_LOGSERVICE_INFO, message, 0, logger->pool, &entry);
if (status == CELIX_SUCCESS) {
status = log_addEntry(logger, entry);
}
@@ -187,7 +187,7 @@ celix_status_t log_frameworkEvent(void *
log_pt logger = ((framework_listener_pt) listener)->handle;
log_entry_pt entry = NULL;
- status = logEntry_create(event->bundle, NULL, (event->type == FRAMEWORK_EVENT_ERROR) ? LOG_ERROR : LOG_INFO, event->error, event->errorCode, logger->pool, &entry);
+ status = logEntry_create(event->bundle, NULL, (event->type == OSGI_FRAMEWORK_EVENT_ERROR) ? OSGI_LOGSERVICE_ERROR : OSGI_LOGSERVICE_INFO, event->error, event->errorCode, logger->pool, &entry);
if (status == CELIX_SUCCESS) {
status = log_addEntry(logger, entry);
}
Modified: incubator/celix/trunk/log_service/private/src/log_service_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log_service_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log_service_activator.c (original)
+++ incubator/celix/trunk/log_service/private/src/log_service_activator.c Tue Dec 17 08:59:23 2013
@@ -94,7 +94,7 @@ celix_status_t bundleActivator_start(voi
logFactory_create(mp, logger, &factory);
- bundleContext_registerServiceFactory(context, (char *) LOG_SERVICE_NAME, factory, NULL, &activator->logServiceFactoryReg);
+ bundleContext_registerServiceFactory(context, (char *) OSGI_LOGSERVICE_NAME, factory, NULL, &activator->logServiceFactoryReg);
logReaderService_create(logger, mp, &reader);
@@ -105,7 +105,7 @@ celix_status_t bundleActivator_start(voi
reader_service->removeLogListener = logReaderService_removeLogListener;
reader_service->removeAllLogListener = logReaderService_removeAllLogListener;
- bundleContext_registerService(context, (char *) LOG_READER_SERVICE_NAME, reader_service, NULL, &activator->logReaderServiceReg);
+ bundleContext_registerService(context, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, reader_service, NULL, &activator->logReaderServiceReg);
return status;
}
Modified: incubator/celix/trunk/log_service/public/include/log_reader_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_reader_service.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_reader_service.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_reader_service.h Tue Dec 17 08:59:23 2013
@@ -32,7 +32,7 @@
#include "linkedlist.h"
#include "log_listener.h"
-static const char * const LOG_READER_SERVICE_NAME = "log_reader_service";
+static const char * const OSGI_LOGSERVICE_READER_SERVICE_NAME = "log_reader_service";
typedef struct log_reader_data * log_reader_data_pt;
Modified: incubator/celix/trunk/log_service/public/include/log_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_service.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_service.h (original)
+++ incubator/celix/trunk/log_service/public/include/log_service.h Tue Dec 17 08:59:23 2013
@@ -30,16 +30,16 @@
#include "celix_errno.h"
#include "service_reference.h"
-static const char * const LOG_SERVICE_NAME = "log_service";
+static const char * const OSGI_LOGSERVICE_NAME = "log_service";
typedef struct log_service_data *log_service_data_pt;
enum log_level
{
- LOG_ERROR = 0x00000001,
- LOG_WARNING = 0x00000002,
- LOG_INFO = 0x00000003,
- LOG_DEBUG = 0x00000004,
+ OSGI_LOGSERVICE_ERROR = 0x00000001,
+ OSGI_LOGSERVICE_WARNING = 0x00000002,
+ OSGI_LOGSERVICE_INFO = 0x00000003,
+ OSGI_LOGSERVICE_DEBUG = 0x00000004,
};
typedef enum log_level log_level_t;
Modified: incubator/celix/trunk/log_writer/private/src/log_writer.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/log_writer.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/log_writer.c (original)
+++ incubator/celix/trunk/log_writer/private/src/log_writer.c Tue Dec 17 08:59:23 2013
@@ -60,7 +60,7 @@ celix_status_t logWriter_start(log_write
status = serviceTrackerCustomizer_create(writer->pool, writer, logWriter_addingServ, logWriter_addedServ, logWriter_modifiedServ, logWriter_removedServ, &cust);
if (status == CELIX_SUCCESS) {
- status = serviceTracker_create(writer->pool, writer->context, (char *) LOG_READER_SERVICE_NAME, cust, &tracker);
+ status = serviceTracker_create(writer->pool, writer->context, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, cust, &tracker);
if (status == CELIX_SUCCESS) {
writer->tracker = tracker;
status = serviceTracker_open(tracker);
Modified: incubator/celix/trunk/remote_services/calculator_endpoint/private/src/calculator_endpoint_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_endpoint/private/src/calculator_endpoint_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_endpoint/private/src/calculator_endpoint_activator.c (original)
+++ incubator/celix/trunk/remote_services/calculator_endpoint/private/src/calculator_endpoint_activator.c Tue Dec 17 08:59:23 2013
@@ -75,7 +75,7 @@ celix_status_t bundleActivator_start(voi
endpointService->handleRequest = calculatorEndpoint_handleRequest;
endpointService->setService = calculatorEndpoint_setService;
- bundleContext_registerService(context, REMOTE_ENDPOINT, endpointService, NULL, &activator->endpoint);
+ bundleContext_registerService(context, OSGI_RSA_REMOTE_ENDPOINT, endpointService, NULL, &activator->endpoint);
return status;
Modified: incubator/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_activator.c (original)
+++ incubator/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_activator.c Tue Dec 17 08:59:23 2013
@@ -88,13 +88,13 @@ celix_status_t bundleActivator_start(voi
char **services = malloc(2);
services[0] = CALCULATOR_SERVICE;
- services[1] = REMOTE_PROXY;
+ services[1] = OSGI_RSA_REMOTE_PROXY;
bundleContext_registerService(context, CALCULATOR_SERVICE, calculatorService, NULL, &activator->service);
properties_pt props = properties_create();
properties_set(props, (char *) "proxy.interface", (char *) CALCULATOR_SERVICE);
- bundleContext_registerService(context, REMOTE_PROXY, calculatorProxy, props, &activator->proxy);
+ bundleContext_registerService(context, OSGI_RSA_REMOTE_PROXY, calculatorProxy, props, &activator->proxy);
return status;
}
Modified: incubator/celix/trunk/remote_services/calculator_service/private/src/calculator_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_service/private/src/calculator_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_service/private/src/calculator_activator.c (original)
+++ incubator/celix/trunk/remote_services/calculator_service/private/src/calculator_activator.c Tue Dec 17 08:59:23 2013
@@ -78,7 +78,7 @@ celix_status_t bundleActivator_start(voi
service->sqrt = calculator_sqrt;
properties = properties_create();
- properties_set(properties, (char *) SERVICE_EXPORTED_INTERFACES, (char *) CALCULATOR_SERVICE);
+ properties_set(properties, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES, (char *) CALCULATOR_SERVICE);
bundleContext_registerService(context, (char *) CALCULATOR_SERVICE, service, properties, &activator->calculatorReg);
}
Modified: incubator/celix/trunk/remote_services/calculator_shell/private/src/calculator_shell_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calculator_shell/private/src/calculator_shell_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calculator_shell/private/src/calculator_shell_activator.c (original)
+++ incubator/celix/trunk/remote_services/calculator_shell/private/src/calculator_shell_activator.c Tue Dec 17 08:59:23 2013
@@ -88,15 +88,15 @@ celix_status_t bundleActivator_start(voi
activator->addCmd = addCommand_create(context);
calculatorShell_createCommandService(pool, activator->addCmd, &activator->addCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->addCmdSrv, NULL, &activator->addCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->addCmdSrv, NULL, &activator->addCommand);
activator->subCmd = subCommand_create(context);
calculatorShell_createCommandService(pool, activator->subCmd, &activator->subCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->subCmdSrv, NULL, &activator->subCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->subCmdSrv, NULL, &activator->subCommand);
activator->sqrtCmd = sqrtCommand_create(context);
calculatorShell_createCommandService(pool, activator->sqrtCmd, &activator->sqrtCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->sqrtCmdSrv, NULL, &activator->sqrtCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->sqrtCmdSrv, NULL, &activator->sqrtCommand);
return status;
}
Modified: incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c Tue Dec 17 08:59:23 2013
@@ -117,7 +117,7 @@ celix_status_t discovery_create(apr_pool
(*discovery)->disclosedServicesMutex = NULL;
(*discovery)->frameworkUuid = NULL;
- bundleContext_getProperty(context, FRAMEWORK_UUID, &(*discovery)->frameworkUuid);
+ bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &(*discovery)->frameworkUuid);
CELIX_DO_IF(status, status = apr_thread_mutex_create(&(*discovery)->listenerReferencesMutex, APR_THREAD_MUTEX_DEFAULT, pool));
CELIX_DO_IF(status, status = apr_thread_mutex_create(&(*discovery)->discoveredServicesMutex, APR_THREAD_MUTEX_DEFAULT, pool));
@@ -325,7 +325,7 @@ celix_status_t discovery_endpointListene
endpoint_listener_pt listener = service;
char *scope = properties_get(serviceProperties,
- (char *) ENDPOINT_LISTENER_SCOPE);
+ (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
filter_pt filter = filter_create(scope, discovery->pool); //FIXME memory leak
bool matchResult = false;
filter_match(filter, endpoint->properties, &matchResult);
@@ -462,10 +462,10 @@ static void discovery_resolveAddCallback
properties_set(props, key, valueBuf);
}
- char *endpointFrameworkUuid = properties_get(props, (char *)ENDPOINT_FRAMEWORK_UUID);
+ char *endpointFrameworkUuid = properties_get(props, (char *)OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
if (endpointFrameworkUuid == NULL) {
- printf("DISCOVERY: Cannot process endpoint, no %s property\n", ENDPOINT_FRAMEWORK_UUID);
+ printf("DISCOVERY: Cannot process endpoint, no %s property\n", OSGI_RSA_ENDPOINT_FRAMEWORK_UUID);
} else if (strcmp(endpointFrameworkUuid, discovery->frameworkUuid) != 0) {
apr_pool_t *childPool = NULL;
apr_pool_create(&childPool, discovery->pool);
@@ -512,7 +512,7 @@ static celix_status_t discovery_informEn
properties_pt serviceProperties = NULL;
serviceRegistration_getProperties(registration, &serviceProperties);
char *scope = properties_get(serviceProperties,
- (char *) ENDPOINT_LISTENER_SCOPE);
+ (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
filter_pt filter = filter_create(scope, discovery->pool);
bool matchResult = false;
filter_match(filter, endpoint->properties, &matchResult);
Modified: incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c Tue Dec 17 08:59:23 2013
@@ -94,7 +94,7 @@ celix_status_t discoveryActivator_create
if (status == CELIX_SUCCESS) {
status = serviceTracker_create(activator->pool, activator->context,
- (char *) endpoint_listener_service, customizer, tracker);
+ (char *) OSGI_ENDPOINT_LISTENER_SERVICE, customizer, tracker);
serviceTracker_open(activator->endpointListenerTracker);
}
@@ -117,12 +117,12 @@ celix_status_t bundleActivator_start(voi
properties_pt props = properties_create();
properties_set(props, "DISCOVERY", "true");
char *uuid = NULL;
- bundleContext_getProperty(context, FRAMEWORK_UUID, &uuid);
- char *scope = apr_pstrcat(activator->pool, "(&(", OBJECTCLASS, "=*)(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, "))", NULL);
+ bundleContext_getProperty(context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ char *scope = apr_pstrcat(activator->pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=*)(", OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, "=", uuid, "))", NULL);
printf("DISCOVERY SCOPE IS: %s\n", scope);
- properties_set(props, (char *) ENDPOINT_LISTENER_SCOPE, scope);
+ properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
status = bundleContext_registerService(context,
- (char *) endpoint_listener_service, endpointListener, props,
+ (char *) OSGI_ENDPOINT_LISTENER_SERVICE, endpointListener, props,
&activator->endpointListenerService);
return status;
Modified: incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery.c Tue Dec 17 08:59:23 2013
@@ -178,7 +178,7 @@ celix_status_t discovery_addService(disc
serviceReference_getServiceRegistration(reference, ®istration);
properties_pt serviceProperties = NULL;
serviceRegistration_getProperties(registration, &serviceProperties);
- char *scope = properties_get(serviceProperties, (char *) ENDPOINT_LISTENER_SCOPE);
+ char *scope = properties_get(serviceProperties, (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
filter_pt filter = filter_create(scope, discovery->pool);
bool matchResult = false;
filter_match(filter, endpoint->properties, &matchResult);
Modified: incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c Tue Dec 17 08:59:23 2013
@@ -109,10 +109,10 @@ celix_status_t bundleActivator_start(voi
properties_pt props = properties_create();
properties_set(props, "DISCOVERY", "true");
char *uuid = NULL;
- bundleContext_getProperty(activator->context, FRAMEWORK_UUID, &uuid);
- char *scope = apr_pstrcat(activator->pool, "(&(", OBJECTCLASS, "=*)(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, "))", NULL);
- properties_set(props, (char *) ENDPOINT_LISTENER_SCOPE, scope);
- status = bundleContext_registerService(context, (char *) endpoint_listener_service, endpointListener, props, &activator->endpointListenerService);
+ bundleContext_getProperty(activator->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ char *scope = apr_pstrcat(activator->pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=*)(", OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, "=", uuid, "))", NULL);
+ properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
+ status = bundleContext_registerService(context, (char *) OSGI_ENDPOINT_LISTENER_SERVICE, endpointListener, props, &activator->endpointListenerService);
return status;
}
Modified: incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h (original)
+++ incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h Tue Dec 17 08:59:23 2013
@@ -43,9 +43,9 @@ struct endpoint_description {
typedef struct endpoint_description *endpoint_description_pt;
-static const char * const endpoint_listener_service = "endpoint_listener";
+static const char * const OSGI_ENDPOINT_LISTENER_SERVICE = "endpoint_listener";
-static const char * const ENDPOINT_LISTENER_SCOPE = "endpoint.listener.scope";
+static const char * const OSGI_ENDPOINT_LISTENER_SCOPE = "endpoint.listener.scope";
struct endpoint_listener {
void *handle;
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h Tue Dec 17 08:59:23 2013
@@ -27,7 +27,7 @@
#ifndef REMOTE_ENDPOINT_H_
#define REMOTE_ENDPOINT_H_
-#define REMOTE_ENDPOINT "remote_endpoint"
+#define OSGI_RSA_REMOTE_ENDPOINT "remote_endpoint"
typedef struct remote_endpoint *remote_endpoint_pt;
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h Tue Dec 17 08:59:23 2013
@@ -29,7 +29,7 @@
#include "endpoint_listener.h"
-#define REMOTE_PROXY "remote_proxy"
+#define OSGI_RSA_REMOTE_PROXY "remote_proxy"
typedef celix_status_t (*sendToHandle)(void *handler, endpoint_description_pt endpointDescription, char *methodSignature, char *request, char **reply, int* replyStatus);
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h Tue Dec 17 08:59:23 2013
@@ -30,7 +30,7 @@
#include "endpoint_listener.h"
#include "service_reference.h"
-#define REMOTE_SERVICE_ADMIN "remote_service_admin"
+#define OSGI_RSA_REMOTE_SERVICE_ADMIN "remote_service_admin"
typedef struct export_reference *export_reference_pt;
typedef struct export_registration *export_registration_pt;
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c Tue Dec 17 08:59:23 2013
@@ -87,13 +87,13 @@ celix_status_t exportRegistration_stopTr
if (registration->endpointTracker != NULL) {
status = serviceTracker_close(registration->endpointTracker);
if (status != CELIX_SUCCESS) {
- fw_log(FW_LOG_ERROR, "EXPORT_REGISTRATION: Could not close endpoint tracker");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "EXPORT_REGISTRATION: Could not close endpoint tracker");
}
}
if (registration->tracker != NULL) {
status = serviceTracker_close(registration->tracker);
if (status != CELIX_SUCCESS) {
- fw_log(FW_LOG_ERROR, "EXPORT_REGISTRATION: Could not close service tracker");
+ fw_log(OSGI_FRAMEWORK_LOG_ERROR, "EXPORT_REGISTRATION: Could not close service tracker");
}
}
@@ -109,7 +109,7 @@ celix_status_t exportRegistration_create
exportRegistration_endpointAdded, exportRegistration_endpointModified, exportRegistration_endpointRemoved, &customizer);
if (status == CELIX_SUCCESS) {
- status = serviceTracker_create(registration->pool, registration->context, REMOTE_ENDPOINT, customizer, tracker);
+ status = serviceTracker_create(registration->pool, registration->context, OSGI_RSA_REMOTE_ENDPOINT, customizer, tracker);
}
return status;
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c Tue Dec 17 08:59:23 2013
@@ -100,7 +100,7 @@ celix_status_t importRegistration_create
importRegistration_proxyAdded, importRegistration_proxyModified, importRegistration_proxyRemoved, &customizer);
if (status == CELIX_SUCCESS) {
- char *filter = apr_pstrcat(registration->pool, "(&(", OBJECTCLASS, "=", REMOTE_PROXY,
+ char *filter = apr_pstrcat(registration->pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=", OSGI_RSA_REMOTE_PROXY,
")(proxy.interface=", registration->endpointDescription->service, "))", NULL);
status = serviceTracker_createWithFilter(registration->pool, registration->context, filter, customizer, tracker);
}
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c Tue Dec 17 08:59:23 2013
@@ -96,7 +96,7 @@ celix_status_t bundleActivator_start(voi
remoteServiceAdmin->importRegistration_getException = importRegistration_getException;
remoteServiceAdmin->importRegistration_getImportReference = importRegistration_getImportReference;
- status = bundleContext_registerService(context, REMOTE_SERVICE_ADMIN, remoteServiceAdmin, NULL, &activator->registration);
+ status = bundleContext_registerService(context, OSGI_RSA_REMOTE_SERVICE_ADMIN, remoteServiceAdmin, NULL, &activator->registration);
}
}
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c Tue Dec 17 08:59:23 2013
@@ -216,7 +216,7 @@ celix_status_t remoteServiceAdmin_export
if (tmpPool == NULL) {
return CELIX_ENOMEM;
} else {
- char *filter = apr_pstrcat(admin->pool, "(", (char *)SERVICE_ID, "=", serviceId, ")", NULL); /*FIXME memory leak*/
+ char *filter = apr_pstrcat(admin->pool, "(", (char *)OSGI_FRAMEWORK_SERVICE_ID, "=", serviceId, ")", NULL); /*FIXME memory leak*/
bundleContext_getServiceReferences(admin->context, NULL, filter, &references);
apr_pool_destroy(tmpPool);
if (arrayList_size(references) >= 1) {
@@ -233,8 +233,8 @@ celix_status_t remoteServiceAdmin_export
serviceReference_getServiceRegistration(reference, ®istration);
properties_pt serviceProperties = NULL;
serviceRegistration_getProperties(registration, &serviceProperties);
- char *exports = properties_get(serviceProperties, (char *) SERVICE_EXPORTED_INTERFACES);
- char *provided = properties_get(serviceProperties, (char *) OBJECTCLASS);
+ char *exports = properties_get(serviceProperties, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES);
+ char *provided = properties_get(serviceProperties, (char *) OSGI_FRAMEWORK_OBJECTCLASS);
if (exports == NULL || provided == NULL) {
printf("RSA: No Services to export.\n");
@@ -316,13 +316,13 @@ celix_status_t remoteServiceAdmin_instal
properties_set(endpointProperties, key, value);
}
- char *serviceId = (char *) hashMap_remove(endpointProperties, (void *) SERVICE_ID);
+ char *serviceId = (char *) hashMap_remove(endpointProperties, (void *) OSGI_FRAMEWORK_SERVICE_ID);
char *uuid = NULL;
- bundleContext_getProperty(admin->context, FRAMEWORK_UUID, &uuid);
- properties_set(endpointProperties, (char *) OBJECTCLASS, interface);
- properties_set(endpointProperties, (char *) ENDPOINT_SERVICE_ID, serviceId);
+ bundleContext_getProperty(admin->context, OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ properties_set(endpointProperties, (char *) OSGI_FRAMEWORK_OBJECTCLASS, interface);
+ properties_set(endpointProperties, (char *) OSGI_RSA_ENDPOINT_SERVICE_ID, serviceId);
properties_set(endpointProperties, "service.imported", "true");
- properties_set(endpointProperties, (char *) ENDPOINT_FRAMEWORK_UUID, uuid);
+ properties_set(endpointProperties, (char *) OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, uuid);
// properties_set(endpointProperties, ".ars.path", buf);
// properties_set(endpointProperties, ".ars.port", admin->port);
@@ -388,11 +388,11 @@ celix_status_t remoteServiceAdmin_create
status = CELIX_ENOMEM;
} else {
char *uuid = NULL;
- status = bundleContext_getProperty(admin->context, (char *)FRAMEWORK_UUID, &uuid);
+ status = bundleContext_getProperty(admin->context, (char *)OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
if (status == CELIX_SUCCESS) {
(*description)->properties = endpointProperties;
(*description)->frameworkUUID = uuid;
- (*description)->serviceId = apr_atoi64(properties_get(serviceProperties, (char *) SERVICE_ID));
+ (*description)->serviceId = apr_atoi64(properties_get(serviceProperties, (char *) OSGI_FRAMEWORK_SERVICE_ID));
(*description)->id = apr_pstrdup(childPool, "TODO"); // does not work, txt record to big ?? --> apr_pstrcat(childPool, uuid, "-", (*description)->serviceId, NULL);
(*description)->service = interface;
}
Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c Tue Dec 17 08:59:23 2013
@@ -137,19 +137,19 @@ celix_status_t bundleActivator_start(voi
properties_pt props = properties_create();
char *uuid = NULL;
- bundleContext_getProperty(activator->context, (char *)FRAMEWORK_UUID, &uuid);
- char *scope = apr_pstrcat(pool, "(&(", OBJECTCLASS, "=*)(!(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);
+ bundleContext_getProperty(activator->context, (char *)OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ char *scope = apr_pstrcat(pool, "(&(", OSGI_FRAMEWORK_OBJECTCLASS, "=*)(!(", OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);
printf("TOPOLOGY_MANAGER: Endpoint listener Scope is %s\n", scope);
- properties_set(props, (char *) ENDPOINT_LISTENER_SCOPE, scope);
+ properties_set(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE, scope);
- bundleContext_registerService(context, (char *) endpoint_listener_service, endpointListener, props, &activator->endpointListenerService);
+ bundleContext_registerService(context, (char *) OSGI_ENDPOINT_LISTENER_SERVICE, endpointListener, props, &activator->endpointListenerService);
listener_hook_service_pt hook = apr_palloc(pool, sizeof(*hook));
hook->handle = activator->manager;
hook->added = topologyManager_listenerAdded;
hook->removed = topologyManager_listenerRemoved;
- bundleContext_registerService(context, (char *) listener_hook_service_name, hook, NULL, &activator->hook);
+ bundleContext_registerService(context, (char *) OSGI_FRAMEWORK_LISTENER_HOOK_SERVICE_NAME, hook, NULL, &activator->hook);
bundleContext_addServiceListener(context, activator->serviceListener, "(service.exported.interfaces=*)");
serviceTracker_open(activator->remoteServiceAdminTracker);
Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Tue Dec 17 08:59:23 2013
@@ -125,15 +125,15 @@ celix_status_t topologyManager_serviceCh
serviceReference_getServiceRegistration(event->reference, ®istration);
properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
- char *name = properties_get(props, (char *) OBJECTCLASS);
- char *export = properties_get(props, (char *) SERVICE_EXPORTED_INTERFACES);
- char *serviceId = properties_get(props, (char *)SERVICE_ID);
+ char *name = properties_get(props, (char *) OSGI_FRAMEWORK_OBJECTCLASS);
+ char *export = properties_get(props, (char *) OSGI_RSA_SERVICE_EXPORTED_INTERFACES);
+ char *serviceId = properties_get(props, (char *)OSGI_FRAMEWORK_SERVICE_ID);
- if (event->type == SERVICE_EVENT_REGISTERED) {
+ if (event->type == OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED) {
if (export != NULL) {
status = topologyManager_exportService(manager, event->reference, serviceId);
}
- } else if (event->type == SERVICE_EVENT_UNREGISTERING) {
+ } else if (event->type == OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING) {
//if (export != NULL) {
printf("TOPOLOGY_MANAGER: Service unregistering: %s\n", name);
status = topologyManager_removeService(manager, event->reference, serviceId);
@@ -212,7 +212,7 @@ celix_status_t topologyManager_notifyLis
celix_status_t status = CELIX_SUCCESS;
array_list_pt endpointListeners = NULL;
- status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
+ status = bundleContext_getServiceReferences(manager->context, OSGI_ENDPOINT_LISTENER_SERVICE, NULL, &endpointListeners);
if (status == CELIX_SUCCESS) {
if (endpointListeners != NULL) {
int eplIt;
@@ -222,7 +222,7 @@ celix_status_t topologyManager_notifyLis
serviceReference_getServiceRegistration(eplRef, ®istration);
properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
- char *scope = properties_get(props, (char *) ENDPOINT_LISTENER_SCOPE);
+ char *scope = properties_get(props, (char *) OSGI_ENDPOINT_LISTENER_SCOPE);
filter_pt filter = filter_create(scope, manager->pool);
endpoint_listener_pt epl = NULL;
status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
@@ -284,7 +284,7 @@ celix_status_t topologyManager_removeSer
serviceReference_getServiceRegistration(reference, ®istration);
properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
- char *name = properties_get(props, (char *) OBJECTCLASS);
+ char *name = properties_get(props, (char *) OSGI_FRAMEWORK_OBJECTCLASS);
printf("TOPOLOGY_MANAGER: Remove Service: %s.\n", name);
@@ -312,7 +312,7 @@ celix_status_t topologyManager_notifyLis
celix_status_t status = CELIX_SUCCESS;
array_list_pt endpointListeners = NULL;
- status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
+ status = bundleContext_getServiceReferences(manager->context, OSGI_ENDPOINT_LISTENER_SERVICE, NULL, &endpointListeners);
if (status == CELIX_SUCCESS) {
if (endpointListeners != NULL) {
int eplIt;
@@ -344,8 +344,8 @@ celix_status_t topologyManager_extendFil
apr_pool_create(&pool, manager->pool);
char *uuid = NULL;
- bundleContext_getProperty(manager->context, (char *)FRAMEWORK_UUID, &uuid);
- *updatedFilter = apr_pstrcat(pool, "(&", filter, "(!(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);
+ bundleContext_getProperty(manager->context, (char *)OSGI_FRAMEWORK_FRAMEWORK_UUID, &uuid);
+ *updatedFilter = apr_pstrcat(pool, "(&", filter, "(!(", OSGI_RSA_ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);
return status;
}
Modified: incubator/celix/trunk/remote_services/utils/public/include/remote_constants.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/utils/public/include/remote_constants.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/utils/public/include/remote_constants.h (original)
+++ incubator/celix/trunk/remote_services/utils/public/include/remote_constants.h Tue Dec 17 08:59:23 2013
@@ -27,10 +27,10 @@
#ifndef REMOTE_CONSTANTS_H_
#define REMOTE_CONSTANTS_H_
-static const char * const SERVICE_EXPORTED_INTERFACES = "service.exported.interfaces";
-static const char * const ENDPOINT_FRAMEWORK_UUID = "endpoint.framework.uuid";
-static const char * const ENDPOINT_SERVICE_ID = "endpoint.service.id";
+static const char * const OSGI_RSA_SERVICE_EXPORTED_INTERFACES = "service.exported.interfaces";
+static const char * const OSGI_RSA_ENDPOINT_FRAMEWORK_UUID = "endpoint.framework.uuid";
+static const char * const OSGI_RSA_ENDPOINT_SERVICE_ID = "endpoint.service.id";
-static const char * const SERVICE_LOCATION = "service.location";
+static const char * const OSGI_RSA_SERVICE_LOCATION = "service.location";
#endif /* REMOTE_CONSTANTS_H_ */
Modified: incubator/celix/trunk/remote_shell/private/src/shell_mediator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/shell_mediator.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/shell_mediator.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/shell_mediator.c Tue Dec 17 08:59:23 2013
@@ -75,7 +75,7 @@ celix_status_t shellMediator_create(apr_
status = apr_thread_mutex_create(&(*instance)->mutex, APR_THREAD_MUTEX_DEFAULT, pool);
status = CELIX_DO_IF(status, serviceTrackerCustomizer_create(pool, (*instance), shellMediator_addingService, shellMediator_addedService,
shellMediator_modifiedService, shellMediator_removedService, &customizer));
- status = CELIX_DO_IF(status, serviceTracker_create(pool, context, (char *)SHELL_SERVICE_NAME, customizer, &(*instance)->tracker));
+ status = CELIX_DO_IF(status, serviceTracker_create(pool, context, (char *)OSGI_SHELL_SERVICE_NAME, customizer, &(*instance)->tracker));
if (status == CELIX_SUCCESS) {
serviceTracker_open((*instance)->tracker);
}
Modified: incubator/celix/trunk/shell/private/src/help_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/help_command.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/help_command.c (original)
+++ incubator/celix/trunk/shell/private/src/help_command.c Tue Dec 17 08:59:23 2013
@@ -51,7 +51,7 @@ void helpCommand_destroy(command_pt comm
void helpCommand_execute(command_pt command, char * line, void (*out)(char *), void (*err)(char *)) {
service_reference_pt shellService = NULL;
- bundleContext_getServiceReference(command->bundleContext, (char *) SHELL_SERVICE_NAME, &shellService);
+ bundleContext_getServiceReference(command->bundleContext, (char *) OSGI_SHELL_SERVICE_NAME, &shellService);
if (shellService != NULL) {
shell_service_pt shell = NULL;
Modified: incubator/celix/trunk/shell/private/src/inspect_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/inspect_command.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/inspect_command.c (original)
+++ incubator/celix/trunk/shell/private/src/inspect_command.c Tue Dec 17 08:59:23 2013
@@ -169,7 +169,7 @@ celix_status_t inspectCommand_printExpor
serviceReference_getServiceRegistration(ref, ®);
serviceRegistration_getProperties(reg, &props);
- objectClass = properties_get(props, (char *) OBJECTCLASS);
+ objectClass = properties_get(props, (char *) OSGI_FRAMEWORK_OBJECTCLASS);
sprintf(line, "ObjectClass = %s\n", objectClass);
out(line);
if ((j + 1) < arrayList_size(refs)) {
Modified: incubator/celix/trunk/shell/private/src/log_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/log_command.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/log_command.c (original)
+++ incubator/celix/trunk/shell/private/src/log_command.c Tue Dec 17 08:59:23 2013
@@ -56,7 +56,7 @@ void logCommand_execute(command_pt comma
apr_pool_t *memory_pool = NULL;
apr_pool_t *bundle_memory_pool = NULL;
- bundleContext_getServiceReference(command->bundleContext, (char *) LOG_READER_SERVICE_NAME, &readerService);
+ bundleContext_getServiceReference(command->bundleContext, (char *) OSGI_LOGSERVICE_READER_SERVICE_NAME, &readerService);
if (readerService != NULL) {
char line[256];
linked_list_pt list = NULL;
@@ -105,16 +105,16 @@ void logCommand_execute(command_pt comma
celix_status_t logCommand_levelAsString(command_pt command, log_level_t level, char **string) {
switch (level) {
- case LOG_ERROR:
+ case OSGI_LOGSERVICE_ERROR:
*string = "ERROR";
break;
- case LOG_WARNING:
+ case OSGI_LOGSERVICE_WARNING:
*string = "WARNING";
break;
- case LOG_INFO:
+ case OSGI_LOGSERVICE_INFO:
*string = "INFO";
break;
- case LOG_DEBUG:
+ case OSGI_LOGSERVICE_DEBUG:
default:
*string = "DEBUG";
break;
Modified: incubator/celix/trunk/shell/private/src/ps_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/ps_command.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/ps_command.c (original)
+++ incubator/celix/trunk/shell/private/src/ps_command.c Tue Dec 17 08:59:23 2013
@@ -144,15 +144,15 @@ void psCommand_execute(command_pt comman
char * psCommand_stateString(bundle_state_e state) {
switch (state) {
- case BUNDLE_ACTIVE:
+ case OSGI_FRAMEWORK_BUNDLE_ACTIVE:
return "Active ";
- case BUNDLE_INSTALLED:
+ case OSGI_FRAMEWORK_BUNDLE_INSTALLED:
return "Installed ";
- case BUNDLE_RESOLVED:
+ case OSGI_FRAMEWORK_BUNDLE_RESOLVED:
return "Resolved ";
- case BUNDLE_STARTING:
+ case OSGI_FRAMEWORK_BUNDLE_STARTING:
return "Starting ";
- case BUNDLE_STOPPING:
+ case OSGI_FRAMEWORK_BUNDLE_STOPPING:
return "Stopping ";
default:
return "Unknown ";
Modified: incubator/celix/trunk/shell/private/src/shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/private/src/shell.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/private/src/shell.c (original)
+++ incubator/celix/trunk/shell/private/src/shell.c Tue Dec 17 08:59:23 2013
@@ -173,7 +173,7 @@ void shell_removeCommand(shell_pt shell,
void shell_serviceChanged(service_listener_pt listener, service_event_pt event) {
shell_pt shell = (shell_pt) listener->handle;
- if (event->type == SERVICE_EVENT_REGISTERED) {
+ if (event->type == OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED) {
shell_addCommand(shell, event->reference);
}
}
@@ -218,7 +218,7 @@ celix_status_t bundleActivator_start(voi
activator->shellService->getCommandReference = shell_getCommandReference;
activator->shellService->executeCommand = shell_executeCommand;
- status = bundleContext_registerService(context, (char *) SHELL_SERVICE_NAME, activator->shellService, NULL, &activator->registration);
+ status = bundleContext_registerService(context, (char *) OSGI_SHELL_SERVICE_NAME, activator->shellService, NULL, &activator->registration);
bundleContext_getMemoryPool(context, &pool);
if (status == CELIX_SUCCESS) {
@@ -232,39 +232,39 @@ celix_status_t bundleActivator_start(voi
if (status == CELIX_SUCCESS) {
activator->psCmd = psCommand_create(context);
shell_createCommandService(pool, activator->psCmd, &activator->psCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->psCmdSrv, NULL, &activator->psCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->psCmdSrv, NULL, &activator->psCommand);
activator->startCmd = startCommand_create(context);
shell_createCommandService(pool, activator->startCmd, &activator->startCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->startCmdSrv, NULL, &activator->startCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->startCmdSrv, NULL, &activator->startCommand);
activator->stopCmd = stopCommand_create(context);
shell_createCommandService(pool, activator->stopCmd, &activator->stopCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->stopCmdSrv, NULL, &activator->stopCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->stopCmdSrv, NULL, &activator->stopCommand);
activator->installCmd = installCommand_create(context);
shell_createCommandService(pool, activator->installCmd, &activator->installCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->installCmdSrv, NULL, &activator->installCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->installCmdSrv, NULL, &activator->installCommand);
activator->uninstallCmd = uninstallCommand_create(context);
shell_createCommandService(pool, activator->uninstallCmd, &activator->uninstallCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->uninstallCmdSrv, NULL, &activator->uninstallCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->uninstallCmdSrv, NULL, &activator->uninstallCommand);
activator->updateCmd = updateCommand_create(context);
shell_createCommandService(pool, activator->updateCmd, &activator->updateCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->updateCmdSrv, NULL, &activator->updateCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->updateCmdSrv, NULL, &activator->updateCommand);
activator->logCmd = logCommand_create(context);
shell_createCommandService(pool, activator->logCmd, &activator->logCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->logCmdSrv, NULL, &activator->logCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->logCmdSrv, NULL, &activator->logCommand);
activator->inspectCmd = inspectCommand_create(context);
shell_createCommandService(pool, activator->inspectCmd, &activator->inspectCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->inspectCmdSrv, NULL, &activator->inspectCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->inspectCmdSrv, NULL, &activator->inspectCommand);
activator->helpCmd = helpCommand_create(context);
shell_createCommandService(pool, activator->helpCmd, &activator->helpCmdSrv);
- bundleContext_registerService(context, (char *) COMMAND_SERVICE_NAME, activator->helpCmdSrv, NULL, &activator->helpCommand);
+ bundleContext_registerService(context, (char *) OSGI_SHELL_COMMAND_SERVICE_NAME, activator->helpCmdSrv, NULL, &activator->helpCommand);
}
}
Modified: incubator/celix/trunk/shell/public/include/command.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/public/include/command.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/public/include/command.h (original)
+++ incubator/celix/trunk/shell/public/include/command.h Tue Dec 17 08:59:23 2013
@@ -27,7 +27,7 @@
#ifndef COMMAND_H_
#define COMMAND_H_
-static const char * const COMMAND_SERVICE_NAME = "commandService";
+static const char * const OSGI_SHELL_COMMAND_SERVICE_NAME = "commandService";
typedef struct command * command_pt;
Modified: incubator/celix/trunk/shell/public/include/shell.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/public/include/shell.h?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell/public/include/shell.h (original)
+++ incubator/celix/trunk/shell/public/include/shell.h Tue Dec 17 08:59:23 2013
@@ -30,7 +30,7 @@
#include "array_list.h"
#include "service_reference.h"
-static const char * const SHELL_SERVICE_NAME = "shellService";
+static const char * const OSGI_SHELL_SERVICE_NAME = "shellService";
typedef struct shell * shell_pt;
Modified: incubator/celix/trunk/shell_tui/private/src/shell_tui.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/private/src/shell_tui.c?rev=1551490&r1=1551489&r2=1551490&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/private/src/shell_tui.c (original)
+++ incubator/celix/trunk/shell_tui/private/src/shell_tui.c Tue Dec 17 08:59:23 2013
@@ -78,7 +78,7 @@ static void *APR_THREAD_FUNC shellTui_ru
void shellTui_initializeService(shell_tui_activator_pt activator) {
if (activator->shell == NULL) {
- bundleContext_getServiceReference(activator->context, (char *) SHELL_SERVICE_NAME, &activator->reference);
+ bundleContext_getServiceReference(activator->context, (char *) OSGI_SHELL_SERVICE_NAME, &activator->reference);
if (activator->reference != NULL) {
void *shell_svc = NULL;
bundleContext_getService(activator->context, activator->reference, &shell_svc);
@@ -91,9 +91,9 @@ void shellTui_serviceChanged(service_lis
bool result = false;
shell_tui_activator_pt act = (shell_tui_activator_pt) listener->handle;
- if ((event->type == SERVICE_EVENT_REGISTERED) && (act->reference == NULL)) {
+ if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED) && (act->reference == NULL)) {
shellTui_initializeService(act);
- } else if ((event->type == SERVICE_EVENT_UNREGISTERING) && (act->reference == event->reference)) {
+ } else if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING) && (act->reference == event->reference)) {
bundleContext_ungetService(act->context, act->reference, &result);
act->reference = NULL;
act->shell = NULL;