svn commit: r1654883 - in /celix/trunk/remote_services/remote_service_admin_shm/private: include/remote_service_admin_shm_impl.h src/remote_service_admin_activator.c src/remote_service_admin_impl.c
Author: bpetri
Date: Mon Jan 26 20:17:59 2015
New Revision: 1654883
URL: http://svn.apache.org/r1654883
Log:
CELIX-119: Remove apr from RSA_SHM
Modified:
celix/trunk/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_impl.c
Modified:
celix/trunk/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h?rev=1654883r1=1654882r2=1654883view=diff
==
---
celix/trunk/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
(original)
+++
celix/trunk/remote_services/remote_service_admin_shm/private/include/remote_service_admin_shm_impl.h
Mon Jan 26 20:17:59 2015
@@ -28,6 +28,7 @@
#define REMOTE_SERVICE_ADMIN_SHM_IMPL_H_
#include remote_service_admin_impl.h
+#include log_helper.h
#define RSA_SHM_MEMSIZE 1310720
#define RSA_SHM_PATH_PROPERTYNAME shmPath
@@ -43,42 +44,44 @@
/** Define P_tmpdir if not defined (this is normally a POSIX symbol) */
#ifndef P_tmpdir
- #define P_tmpdir /tmp
+#define P_tmpdir /tmp
#endif
union semun {
- int val;/* Value for SETVAL */
- struct semid_ds *buf;/* Buffer for IPC_STAT, IPC_SET */
- unsigned short *array; /* Array for GETALL, SETALL */
- struct seminfo *__buf; /* Buffer for IPC_INFO */
+int val; /* Value for SETVAL */
+struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */
+unsigned short *array; /* Array for GETALL, SETALL */
+struct seminfo *__buf; /* Buffer for IPC_INFO */
};
-struct recv_shm_thread
-{
- remote_service_admin_pt admin;
- endpoint_description_pt endpointDescription;
+struct recv_shm_thread {
+remote_service_admin_pt admin;
+endpoint_description_pt endpointDescription;
};
-struct ipc_segment
-{
- int semId;
- int shmId;
- void *shmBaseAdress;
+struct ipc_segment {
+int semId;
+int shmId;
+void *shmBaseAdress;
};
struct remote_service_admin {
- apr_pool_t *pool;
- bundle_context_pt context;
+bundle_context_pt context;
+log_helper_pt loghelper;
- hash_map_pt exportedServices;
- hash_map_pt importedServices;
- hash_map_pt exportedIpcSegment;
- hash_map_pt importedIpcSegment;
+celix_thread_mutex_t exportedServicesLock;
+hash_map_pt exportedServices;
- hash_map_pt pollThread;
- hash_map_pt pollThreadRunning;
+celix_thread_mutex_t importedServicesLock;
+hash_map_pt importedServices;
- struct mg_context *ctx;
+hash_map_pt exportedIpcSegment;
+hash_map_pt importedIpcSegment;
+
+hash_map_pt pollThread;
+hash_map_pt pollThreadRunning;
+
+struct mg_context *ctx;
};
typedef struct recv_shm_thread *recv_shm_thread_pt;
@@ -86,5 +89,4 @@ typedef struct ipc_segment *ipc_segment_
celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin);
-
#endif /* REMOTE_SERVICE_ADMIN_SHM_IMPL_H_ */
Modified:
celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c?rev=1654883r1=1654882r2=1654883view=diff
==
---
celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
(original)
+++
celix/trunk/remote_services/remote_service_admin_shm/private/src/remote_service_admin_activator.c
Mon Jan 26 20:17:59 2015
@@ -33,100 +33,89 @@
#include import_registration_impl.h
struct activator {
- apr_pool_t *pool;
- remote_service_admin_pt admin;
- service_registration_pt registration;
+remote_service_admin_pt admin;
+remote_service_admin_service_pt adminService;
+service_registration_pt registration;
};
celix_status_t bundleActivator_create(bundle_context_pt context, void
**userData) {
- celix_status_t status = CELIX_SUCCESS;
- apr_pool_t *parentPool = NULL;
- apr_pool_t *pool = NULL;
- struct activator *activator;
-
- status = bundleContext_getMemoryPool(context, parentPool);
- if (status == CELIX_SUCCESS) {
- if (apr_pool_create(pool, parentPool) != APR_SUCCESS) {
- status = CELIX_BUNDLE_EXCEPTION;
- } else {
- activator = apr_palloc(pool, sizeof(*activator));
- if (!activator) {
- status = CELIX_ENOMEM;
- } else {
-
svn commit: r1654884 - in /celix/trunk/remote_services: remote_service_admin/private/src/import_registration_impl.c remote_service_admin_http/private/src/remote_service_admin_impl.c
Author: bpetri
Date: Mon Jan 26 20:19:27 2015
New Revision: 1654884
URL: http://svn.apache.org/r1654884
Log:
Add null check for destroyed registrationfactory
Modified:
celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
Modified:
celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c?rev=1654884r1=1654883r2=1654884view=diff
==
---
celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
(original)
+++
celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
Mon Jan 26 20:19:27 2015
@@ -98,6 +98,8 @@ celix_status_t importRegistrationFactory
serviceTracker_destroy((*registration_factory)-proxyFactoryTracker);
free(*registration_factory);
+
+ *registration_factory = NULL;
}
Modified:
celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1654884r1=1654883r2=1654884view=diff
==
---
celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
(original)
+++
celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
Mon Jan 26 20:19:27 2015
@@ -223,23 +223,24 @@ celix_status_t remoteServiceAdmin_stop(r
import_registration_factory_pt importFactory =
hashMapEntry_getValue(entry);
-int i;
-for (i = 0; i arrayList_size(importFactory-registrations); i++)
-{
-import_registration_pt importRegistration =
arrayList_get(importFactory-registrations, i);
-
- if (importFactory-trackedFactory != NULL)
- {
-
importFactory-trackedFactory-unregisterProxyService(importFactory-trackedFactory-factory,
importRegistration-endpointDescription);
- }
-}
-
-serviceTracker_close(importFactory-proxyFactoryTracker);
-importRegistrationFactory_close(importFactory);
-
-hashMapIterator_remove(iter);
- importRegistrationFactory_destroy(importFactory);
-
+if (importFactory != NULL) {
+int i;
+for (i = 0; i arrayList_size(importFactory-registrations); i++)
+{
+import_registration_pt importRegistration =
arrayList_get(importFactory-registrations, i);
+
+if (importFactory-trackedFactory != NULL)
+{
+
importFactory-trackedFactory-unregisterProxyService(importFactory-trackedFactory-factory,
importRegistration-endpointDescription);
+}
+}
+
+serviceTracker_close(importFactory-proxyFactoryTracker);
+importRegistrationFactory_close(importFactory);
+
+hashMapIterator_remove(iter);
+importRegistrationFactory_destroy(importFactory);
+}
}
hashMapIterator_destroy(iter);
celixThreadMutex_unlock(admin-importedServicesLock);
svn commit: r1654892 - /celix/site/trunk/content/documentation.mdtext
Author: pnoltes Date: Mon Jan 26 20:37:52 2015 New Revision: 1654892 URL: http://svn.apache.org/r1654892 Log: CELIX-144: remove a white space from the md text Modified: celix/site/trunk/content/documentation.mdtext Modified: celix/site/trunk/content/documentation.mdtext URL: http://svn.apache.org/viewvc/celix/site/trunk/content/documentation.mdtext?rev=1654892r1=1654891r2=1654892view=diff == --- celix/site/trunk/content/documentation.mdtext (original) +++ celix/site/trunk/content/documentation.mdtext Mon Jan 26 20:37:52 2015 @@ -2,7 +2,7 @@ Title: Documentation Currently the documentation for Celix contains information about building and running Celix, as well as some examples. -- [Getting Started] (/celix/documentation/getting_started.html) +- [Getting Started](/celix/documentation/getting_started.html) - [Building and Running Celix](/celix/documentation/buildingandrunning.html) - [Design](/celix/documentation/design.html) - [Mapping](/celix/documentation/mapping.html)
svn commit: r1654895 - /celix/site/trunk/content/documentation/getting_started.mdtext
Author: pnoltes
Date: Mon Jan 26 21:03:55 2015
New Revision: 1654895
URL: http://svn.apache.org/r1654895
Log:
CELIX-144: removed tab from image markdown text, see if that works
Modified:
celix/site/trunk/content/documentation/getting_started.mdtext
Modified: celix/site/trunk/content/documentation/getting_started.mdtext
URL:
http://svn.apache.org/viewvc/celix/site/trunk/content/documentation/getting_started.mdtext?rev=1654895r1=1654894r2=1654895view=diff
==
--- celix/site/trunk/content/documentation/getting_started.mdtext (original)
+++ celix/site/trunk/content/documentation/getting_started.mdtext Mon Jan 26
21:03:55 2015
@@ -234,15 +234,15 @@ To get started change directory to the b
Startup the Eclipse EDI and a chose the `${WS}`
- 
+
Import the project with existing project.
- 
+
To build the project, use Project-Build All. To run or debug from Eclipse
navigate to the myproject deploy directory and right click on the
'myproject.launch' file. And select Run As or Debug As to run or debug the
bundle.
- 
+
svn commit: r937788 - in /websites/staging/celix/trunk/content: ./ asf/ celix/ community/ community/boardreports/ community/contributing/ documentation/ examples/ subprojects/ support/
Author: buildbot Date: Mon Jan 26 21:11:10 2015 New Revision: 937788 Log: Staging update by buildbot for celix Modified: websites/staging/celix/trunk/content/ (props changed) websites/staging/celix/trunk/content/asf/asf.html websites/staging/celix/trunk/content/asf/links.html websites/staging/celix/trunk/content/background-links.html websites/staging/celix/trunk/content/background.html websites/staging/celix/trunk/content/celix-links.html websites/staging/celix/trunk/content/celix.html websites/staging/celix/trunk/content/celix/index.html websites/staging/celix/trunk/content/community/boardreports/boardreports.html websites/staging/celix/trunk/content/community/boardreports/reports.html websites/staging/celix/trunk/content/community/community.html websites/staging/celix/trunk/content/community/contributing/contributing.html websites/staging/celix/trunk/content/community/contributing/links.html websites/staging/celix/trunk/content/community/links.html websites/staging/celix/trunk/content/documentation.html websites/staging/celix/trunk/content/documentation/buildingandrunning-links.html websites/staging/celix/trunk/content/documentation/buildingandrunning.html websites/staging/celix/trunk/content/documentation/design.html websites/staging/celix/trunk/content/documentation/examples.html websites/staging/celix/trunk/content/documentation/getting_started.html websites/staging/celix/trunk/content/documentation/mapping.html websites/staging/celix/trunk/content/documentation/memorypools.html websites/staging/celix/trunk/content/documentation/releasing-links.html websites/staging/celix/trunk/content/documentation/releasing.html websites/staging/celix/trunk/content/download-links.html websites/staging/celix/trunk/content/download.html websites/staging/celix/trunk/content/examples/helloworld-links.html websites/staging/celix/trunk/content/examples/helloworld.html websites/staging/celix/trunk/content/index.html websites/staging/celix/trunk/content/links.html websites/staging/celix/trunk/content/subprojects.html websites/staging/celix/trunk/content/subprojects/dependencymanager.html websites/staging/celix/trunk/content/subprojects/deviceaccess.html websites/staging/celix/trunk/content/subprojects/examples.html websites/staging/celix/trunk/content/subprojects/framework.html websites/staging/celix/trunk/content/subprojects/hessian.html websites/staging/celix/trunk/content/subprojects/launcher.html websites/staging/celix/trunk/content/subprojects/logservice.html websites/staging/celix/trunk/content/subprojects/logwriter.html websites/staging/celix/trunk/content/subprojects/remoteserviceadmin.html websites/staging/celix/trunk/content/subprojects/shell.html websites/staging/celix/trunk/content/subprojects/shelltui.html websites/staging/celix/trunk/content/subprojects/utils.html websites/staging/celix/trunk/content/support/issuetracking.html websites/staging/celix/trunk/content/support/links.html websites/staging/celix/trunk/content/support/mailinglist.html websites/staging/celix/trunk/content/support/support.html Propchange: websites/staging/celix/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jan 26 21:11:10 2015 @@ -1 +1 @@ -1654896 +1654897 Modified: websites/staging/celix/trunk/content/asf/asf.html == --- websites/staging/celix/trunk/content/asf/asf.html (original) +++ websites/staging/celix/trunk/content/asf/asf.html Mon Jan 26 21:11:10 2015 @@ -88,7 +88,6 @@ lia href=/documentation/releasing.htmlHow To Release/a/li lia href=/documentation/design.htmlDesign/a/li lia href=/documentation/mapping.htmlMapping/a/li -lia href=/documentation/memorypools.htmlMemory Pools/a/li lia href=/documentation/examples.htmlExamples/aul lia href=/examples/helloworld.htmlHello World Example/a/li /ul Modified: websites/staging/celix/trunk/content/asf/links.html == --- websites/staging/celix/trunk/content/asf/links.html (original) +++ websites/staging/celix/trunk/content/asf/links.html Mon Jan 26 21:11:10 2015 @@ -88,7 +88,6 @@ lia href=/documentation/releasing.htmlHow To Release/a/li lia href=/documentation/design.htmlDesign/a/li lia href=/documentation/mapping.htmlMapping/a/li -lia href=/documentation/memorypools.htmlMemory Pools/a/li lia href=/documentation/examples.htmlExamples/aul lia href=/examples/helloworld.htmlHello World Example/a/li /ul Modified: websites/staging/celix/trunk/content/background-links.html == --- websites/staging/celix/trunk/content/background-links.html (original) +++
svn commit: r1654897 - /celix/site/trunk/templates/sidenav.mdtext
Author: pnoltes Date: Mon Jan 26 21:11:03 2015 New Revision: 1654897 URL: http://svn.apache.org/r1654897 Log: CELIX-144: removed mem pool page form sidenav Modified: celix/site/trunk/templates/sidenav.mdtext Modified: celix/site/trunk/templates/sidenav.mdtext URL: http://svn.apache.org/viewvc/celix/site/trunk/templates/sidenav.mdtext?rev=1654897r1=1654896r2=1654897view=diff == --- celix/site/trunk/templates/sidenav.mdtext (original) +++ celix/site/trunk/templates/sidenav.mdtext Mon Jan 26 21:11:03 2015 @@ -21,7 +21,6 @@ - [How To Release](/documentation/releasing.html) - [Design](/documentation/design.html) - [Mapping](/documentation/mapping.html) -- [Memory Pools](/documentation/memorypools.html) - [Examples](/documentation/examples.html) - [Hello World Example](/examples/helloworld.html) - [Download](/download.cgi)
svn commit: r937784 - in /websites/staging/celix/trunk/content: ./ documentation/getting_started.html
Author: buildbot
Date: Mon Jan 26 21:04:00 2015
New Revision: 937784
Log:
Staging update by buildbot for celix
Modified:
websites/staging/celix/trunk/content/ (props changed)
websites/staging/celix/trunk/content/documentation/getting_started.html
Propchange: websites/staging/celix/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 26 21:04:00 2015
@@ -1 +1 @@
-1654893
+1654895
Modified:
websites/staging/celix/trunk/content/documentation/getting_started.html
==
--- websites/staging/celix/trunk/content/documentation/getting_started.html
(original)
+++ websites/staging/celix/trunk/content/documentation/getting_started.html Mon
Jan 26 21:04:00 2015
@@ -362,18 +362,11 @@ cmake -G quot;Eclipse CDT4 - Unix Makef
pStartup the Eclipse EDI and a chose the code${WS}/code/p
-div class=codehiliteprespan class=sx/span
-/pre/div
-
-
+pimg alt=select workspace src=/documentation/getting_started_img1.png
//p
pImport the project with existing project. /p
-div class=codehiliteprespan class=sx/span
-/pre/div
-
-
+pimg alt=import project src=/documentation/getting_started_img2.png
//p
pTo build the project, use Project-gt;Build All. To run or debug from
Eclipse navigate to the myproject deploy directory and right click on the
'myproject.launch' file. And select Run As or Debug As to run or debug the
bundle./p
-div class=codehiliteprespan class=sx/span
-/pre/div
+pimg alt=run project src=/documentation/getting_started_img3.png / /p
/div
div id=homeright
svn commit: r937785 - /websites/production/celix/content/
Author: pnoltes Date: Mon Jan 26 21:04:36 2015 New Revision: 937785 Log: CELIX-144: added getting started page Added: websites/production/celix/content/ - copied from r937784, websites/staging/celix/trunk/content/
[jira] [Commented] (CELIX-205) RSA Discovery (Configured) bundle gets stuck
[ https://issues.apache.org/jira/browse/CELIX-205?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14293048#comment-14293048 ] Alexander Broekhuis commented on CELIX-205: --- Looking at this issue, I couldn't find any obvious cause at the moment. But there are several solutions that can be tried: 1) I've updated the civetweb source to the latest version, that seems to help 2) The discovery poller thread uses libcurl, libcurl is known to have problems with multiple threads and DNS request. They provide a threaded solution which needs to be enabled specifically. Basically when a DNS request fails, an alarm is sent, but without threading support this might be to the incorrect thread. (see http://curl.haxx.se/libcurl/c/CURLOPT_NOSIGNAL.html and http://daniel.haxx.se/blog/2011/04/25/libcurls-name-resolving) At this point I suspect that a combination of those 2 items are the problem. Could you try with the current Trunk and make sure libcurl supports threading for the DNS lookup? RSA Discovery (Configured) bundle gets stuck Key: CELIX-205 URL: https://issues.apache.org/jira/browse/CELIX-205 Project: Celix Issue Type: Bug Components: Remote Service Admin Environment: REV 1652984 Reporter: Daniel Parker Assignee: Alexander Broekhuis Priority: Blocker Under certain situations, the apache_celix_rsa_discovery_configured bundle will get stuck somehow and attempts to connect to it to get the list of registered endpoints will time out. When this happens, the bundle cannot be stopped from the shell (and the apache_celix_rs_topology_manager and apache_celix_remote_service_admin_http bundles have similar problems) This is difficult to reproduce. Sometimes the bundle runs fine for a short time after the program is started and then it breaks (perhaps after endpoints or proxies are accessed). Other times the bundle works fine and doesn't get stuck at all. The issue will only happen if there is actually a remote that is being connected to. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Assigned] (CELIX-205) RSA Discovery (Configured) bundle gets stuck
[ https://issues.apache.org/jira/browse/CELIX-205?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alexander Broekhuis reassigned CELIX-205: - Assignee: Alexander Broekhuis RSA Discovery (Configured) bundle gets stuck Key: CELIX-205 URL: https://issues.apache.org/jira/browse/CELIX-205 Project: Celix Issue Type: Bug Components: Remote Service Admin Environment: REV 1652984 Reporter: Daniel Parker Assignee: Alexander Broekhuis Priority: Blocker Under certain situations, the apache_celix_rsa_discovery_configured bundle will get stuck somehow and attempts to connect to it to get the list of registered endpoints will time out. When this happens, the bundle cannot be stopped from the shell (and the apache_celix_rs_topology_manager and apache_celix_remote_service_admin_http bundles have similar problems) This is difficult to reproduce. Sometimes the bundle runs fine for a short time after the program is started and then it breaks (perhaps after endpoints or proxies are accessed). Other times the bundle works fine and doesn't get stuck at all. The issue will only happen if there is actually a remote that is being connected to. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
svn commit: r1654979 [1/2] - in /celix/trunk/remote_services: discovery/private/src/endpoint_discovery_poller.c utils/private/include/civetweb.h utils/private/src/civetweb.c
Author: abroekhuis
Date: Tue Jan 27 06:28:23 2015
New Revision: 1654979
URL: http://svn.apache.org/r1654979
Log:
CELIX-205: Updated civetweb source files to latest version.
Modified:
celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c
celix/trunk/remote_services/utils/private/include/civetweb.h
celix/trunk/remote_services/utils/private/src/civetweb.c
Modified:
celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c?rev=1654979r1=1654978r2=1654979view=diff
==
---
celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c
(original)
+++
celix/trunk/remote_services/discovery/private/src/endpoint_discovery_poller.c
Tue Jan 27 06:28:23 2015
@@ -240,28 +240,31 @@ static void *endpointDiscoveryPoller_pol
status = endpointDiscoveryPoller_getEndpoints(poller,
url, updatedEndpoints);
if (status != CELIX_SUCCESS) {
+ status =
celixThreadMutex_unlock(poller-pollerLock);
continue;
}
- for (int i = arrayList_size(currentEndpoints); i 0 ;
i--) {
- endpoint_description_pt endpoint =
arrayList_get(currentEndpoints, i-1);
- if (!arrayList_contains(updatedEndpoints,
endpoint)) {
- status =
discovery_removeDiscoveredEndpoint(poller-discovery, endpoint);
- arrayList_remove(currentEndpoints, i-1);
- endpointDescription_destroy(endpoint);
+ if (updatedEndpoints) {
+ for (int i = arrayList_size(currentEndpoints);
i 0 ; i--) {
+ endpoint_description_pt endpoint =
arrayList_get(currentEndpoints, i-1);
+ if
(!arrayList_contains(updatedEndpoints, endpoint)) {
+ status =
discovery_removeDiscoveredEndpoint(poller-discovery, endpoint);
+
arrayList_remove(currentEndpoints, i-1);
+
endpointDescription_destroy(endpoint);
+ }
}
- }
- for (int i = arrayList_size(updatedEndpoints); i 0 ;
i--) {
- endpoint_description_pt endpoint =
arrayList_remove(updatedEndpoints, 0);
+ for (int i = arrayList_size(updatedEndpoints);
i 0 ; i--) {
+ endpoint_description_pt endpoint =
arrayList_remove(updatedEndpoints, 0);
- if (!arrayList_contains(currentEndpoints,
endpoint)) {
- arrayList_add(currentEndpoints,
endpoint);
- status =
discovery_addDiscoveredEndpoint(poller-discovery, endpoint);
- }
- else {
- endpointDescription_destroy(endpoint);
+ if
(!arrayList_contains(currentEndpoints, endpoint)) {
+ arrayList_add(currentEndpoints,
endpoint);
+ status =
discovery_addDiscoveredEndpoint(poller-discovery, endpoint);
+ }
+ else {
+
endpointDescription_destroy(endpoint);
+ }
}
}
Modified: celix/trunk/remote_services/utils/private/include/civetweb.h
URL:
http://svn.apache.org/viewvc/celix/trunk/remote_services/utils/private/include/civetweb.h?rev=1654979r1=1654978r2=1654979view=diff
==
--- celix/trunk/remote_services/utils/private/include/civetweb.h (original)
+++ celix/trunk/remote_services/utils/private/include/civetweb.h Tue Jan 27
06:28:23 2015
@@ -1,273 +1,389 @@
-// Copyright (c) 2004-2012 Sergey Lyubka
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the Software), to
deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the
svn commit: r1654896 - /celix/site/trunk/templates/sidenav.mdtext
Author: pnoltes Date: Mon Jan 26 21:07:02 2015 New Revision: 1654896 URL: http://svn.apache.org/r1654896 Log: CELIX-144: update the sidenav for the getting started page Modified: celix/site/trunk/templates/sidenav.mdtext Modified: celix/site/trunk/templates/sidenav.mdtext URL: http://svn.apache.org/viewvc/celix/site/trunk/templates/sidenav.mdtext?rev=1654896r1=1654895r2=1654896view=diff == --- celix/site/trunk/templates/sidenav.mdtext (original) +++ celix/site/trunk/templates/sidenav.mdtext Mon Jan 26 21:07:02 2015 @@ -16,6 +16,7 @@ - [Shell TUI](/subprojects/shelltui.html) - [Utils](/subprojects/utils.html) - [Documentation](/documentation.html) +- [Getting Started](/documentation/getting_started.html) - [Building and Running](/documentation/buildingandrunning.html) - [How To Release](/documentation/releasing.html) - [Design](/documentation/design.html)
