incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1548315 - in /incubator/celix/trunk/remote_services: ./ remote_service_admin/ remote_service_admin/private/include/ remote_service_admin/private/src/ remote_service_admin/public/include/ remote_service_admin_http/ remote_service_admin_http...
Date Thu, 05 Dec 2013 22:03:24 GMT
Author: abroekhuis
Date: Thu Dec  5 22:03:24 2013
New Revision: 1548315

URL: http://svn.apache.org/r1548315
Log:
CELIX-99: Moved HTTP RSA implementation to a more appropriate directory. Moved all common
(public/private) headers to a common directory that can be reused.

Added:
    incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/civetweb.h
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/include/civetweb.h
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/remote_service_admin_http_impl.h
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/civetweb.c
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/civetweb.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/md5.inl
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/md5.inl
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
    incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
      - copied, changed from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
Removed:
    incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin/private/include/civetweb.h
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/civetweb.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/md5.inl
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
    incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
Modified:
    incubator/celix/trunk/remote_services/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
    incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h

Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1548315&r1=1548314&r2=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Thu Dec  5 22:03:24 2013
@@ -30,7 +30,7 @@ if (REMOTE_SERVICE_ADMIN)
     endif(UNIX AND NOT WIN32)
 
     add_subdirectory(topology_manager)
-    add_subdirectory(remote_service_admin)
+    add_subdirectory(remote_service_admin_http)
     add_subdirectory(discovery_slp)
     add_subdirectory(discovery_bonjour)
     

Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h?rev=1548315&r1=1548314&r2=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
Thu Dec  5 22:03:24 2013
@@ -19,7 +19,7 @@
 /*
  * remote_service_admin_impl.h
  *
- *  \date       Sep 30, 2011
+ *  \date       Dec 5, 2013
  *  \author    	<a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
  *  \copyright	Apache License, Version 2.0
  */
@@ -28,7 +28,6 @@
 #define REMOTE_SERVICE_ADMIN_IMPL_H_
 
 #include "remote_service_admin.h"
-#include "civetweb.h"
 
 #define BUNDLE_STORE_PROPERTY_NAME "ENDPOINTS"
 #define DEFAULT_BUNDLE_STORE "endpoints"
@@ -43,31 +42,16 @@ struct import_reference {
 	service_reference_pt reference;
 };
 
-struct remote_service_admin {
-	apr_pool_t *pool;
-	bundle_context_pt context;
-
-	hash_map_pt exportedServices;
-	hash_map_pt importedServices;
-
-	char *port;
-
-	struct mg_context *ctx;
-};
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt
*admin);
 
 celix_status_t remoteServiceAdmin_send(remote_service_admin_pt rsa, endpoint_description_pt
endpointDescription, char *methodSignature, char *request, char **reply, int* replyStatus);
 
-celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt
*admin);
-celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin);
-
 celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, char *serviceId,
properties_pt properties, array_list_pt *registrations);
 celix_status_t remoteServiceAdmin_removeExportedService(export_registration_pt registration);
-
 celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt
*services);
 celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt
*services);
 celix_status_t remoteServiceAdmin_importService(remote_service_admin_pt admin, endpoint_description_pt
endpoint, import_registration_pt *registration);
 
-
 celix_status_t exportReference_getExportedEndpoint(export_reference_pt reference, endpoint_description_pt
*endpoint);
 celix_status_t exportReference_getExportedService(export_reference_pt reference);
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h?rev=1548315&r1=1548314&r2=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
Thu Dec  5 22:03:24 2013
@@ -31,6 +31,7 @@
 
 struct remote_endpoint {
 	void *service;
+	apr_pool_t* pool;
 };
 
 #endif /* REMOTE_ENDPOINT_IMPL_H_ */

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt (from
r1548308, incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt&p1=incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt Thu Dec
 5 22:03:24 2013
@@ -23,6 +23,7 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
+include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
 
 SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin")
@@ -34,11 +35,6 @@ bundle(remote_service_admin SOURCES 
 	private/src/import_registration_impl
 	private/src/remote_service_admin_activator
 	private/src/civetweb.c
-
-    private/include/export_registration_impl.h
-    private/include/import_registration_impl.h
-    private/include/civetweb.h
-    private/include/remote_service_admin_impl.h
 )
     
 install_bundle(remote_service_admin

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/civetweb.h
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/include/civetweb.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/civetweb.h?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/civetweb.h&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/include/civetweb.h&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
    (empty)

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/remote_service_admin_http_impl.h
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/remote_service_admin_http_impl.h?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/remote_service_admin_http_impl.h&p1=incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/remote_service_admin_http_impl.h
Thu Dec  5 22:03:24 2013
@@ -17,20 +17,31 @@
  *under the License.
  */
 /*
- * remote_endpoint_impl.h
+ * remote_service_admin_http_impl.h
  *
- *  \date       Oct 11, 2011
+ *  \date       Sep 30, 2011
  *  \author    	<a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
  *  \copyright	Apache License, Version 2.0
  */
 
-#ifndef REMOTE_ENDPOINT_IMPL_H_
-#define REMOTE_ENDPOINT_IMPL_H_
+#ifndef REMOTE_SERVICE_ADMIN_HTTP_IMPL_H_
+#define REMOTE_SERVICE_ADMIN_HTTP_IMPL_H_
 
-#include "remote_endpoint.h"
+#include "remote_service_admin_impl.h"
+#include "civetweb.h"
 
-struct remote_endpoint {
-	void *service;
+struct remote_service_admin {
+	apr_pool_t *pool;
+	bundle_context_pt context;
+
+	hash_map_pt exportedServices;
+	hash_map_pt importedServices;
+
+	char *port;
+
+	struct mg_context *ctx;
 };
 
-#endif /* REMOTE_ENDPOINT_IMPL_H_ */
+celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin);
+
+#endif /* REMOTE_SERVICE_ADMIN_HTTP_IMPL_H_ */

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/civetweb.c
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/civetweb.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/civetweb.c?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/civetweb.c&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/civetweb.c&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
    (empty)

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/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?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/export_registration_impl.c&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
    (empty)

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/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?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/import_registration_impl.c&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
    (empty)

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/md5.inl
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/private/src/md5.inl)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/md5.inl?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/md5.inl&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/md5.inl&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
    (empty)

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/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?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
Thu Dec  5 22:03:24 2013
@@ -28,7 +28,7 @@
 #include "bundle_activator.h"
 #include "service_registration.h"
 
-#include "remote_service_admin_impl.h"
+#include "remote_service_admin_http_impl.h"
 #include "export_registration_impl.h"
 #include "import_registration_impl.h"
 

Copied: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
(from r1548308, incubator/celix/trunk/remote_services/remote_service_admin/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?p2=incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c&p1=incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c&r1=1548308&r2=1548315&rev=1548315&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
Thu Dec  5 22:03:24 2013
@@ -31,7 +31,7 @@
 
 #include <curl/curl.h>
 
-#include "remote_service_admin_impl.h"
+#include "remote_service_admin_http_impl.h"
 #include "export_registration_impl.h"
 #include "import_registration_impl.h"
 #include "remote_constants.h"



Mime
View raw message