Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: celix-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1551510 - in /incubator/celix/trunk/remote_services:
 CMakeLists.txt deploy.cmake remote_service_admin/CMakeLists.txt
 remote_service_admin_http/CMakeLists.txt
Date: Tue, 17 Dec 2013 11:10:51 -0000
To: celix-commits@incubator.apache.org
From: abroekhuis@apache.org
Message-Id: <20131217111051.3B7F4238890D@eris.apache.org>

Author: abroekhuis
Date: Tue Dec 17 11:10:50 2013
New Revision: 1551510

URL: http://svn.apache.org/r1551510
Log:
CELIX-88: Added installation for RSA files not part of a bundle using the new Component installation support.

Added:
    incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
Modified:
    incubator/celix/trunk/remote_services/CMakeLists.txt
    incubator/celix/trunk/remote_services/deploy.cmake
    incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt

Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1551510&r1=1551509&r2=1551510&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Tue Dec 17 11:10:50 2013
@@ -30,6 +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/deploy.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/deploy.cmake?rev=1551510&r1=1551509&r2=1551510&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/deploy.cmake (original)
+++ incubator/celix/trunk/remote_services/deploy.cmake Tue Dec 17 11:10:50 2013
@@ -16,13 +16,13 @@
 # under the License.
 is_enabled(REMOTE_SERVICE_ADMIN)
 if (REMOTE_SERVICE_ADMIN)
-	deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin calculator shell shell_tui log_service log_writer 
+	deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin_http calculator shell shell_tui log_service log_writer 
 	                            ENDPOINTS org.example.api.Calculator_endpoint)
-	deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin shell shell_tui log_service log_writer calculator_shell discovery_bonjour
+	deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_bonjour
 	                                   ENDPOINTS org.example.api.Calculator_proxy)
 	
-	deploy("remote-services" BUNDLES discovery_slp topology_manager remote_service_admin calculator org.example.api.Calculator_endpoint shell shell_tui log_service log_writer)
-	deploy("remote-services-client" BUNDLES topology_manager remote_service_admin org.example.api.Calculator_proxy shell shell_tui log_service log_writer calculator_shell discovery_slp)
+	deploy("remote-services" BUNDLES discovery_slp topology_manager remote_service_admin_http calculator org.example.api.Calculator_endpoint shell shell_tui log_service log_writer)
+	deploy("remote-services-client" BUNDLES topology_manager remote_service_admin_http org.example.api.Calculator_proxy shell shell_tui log_service log_writer calculator_shell discovery_slp)
 	
 	#TODO for remote-service-client the discovery should be added as last. If this is not done, 
 	#discovery will discover services before the topology manager is registered as 

Added: incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt?rev=1551510&view=auto
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (added)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt Tue Dec 17 11:10:50 2013
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+CELIX_ADD_COMPONENT(remote_service_admin
+    DISPLAY_NAME remote_service_admin
+    DESCRIPTION Public files needed for RSA implementations
+    GROUP bundles
+)
+install (FILES 
+        public/include/remote_endpoint_impl.h
+        public/include/remote_endpoint.h
+        public/include/remote_proxy.h
+        public/include/remote_service_admin.h
+    DESTINATION 
+        include/celix/remote_service_admin 
+    COMPONENT 
+        remote_service_admin
+)
+install (FILES 
+        ${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include/endpoint_listener.h
+    DESTINATION 
+        include/celix/endpoint_listener 
+    COMPONENT 
+        remote_service_admin
+)

Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt?rev=1551510&r1=1551509&r2=1551510&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt Tue Dec 17 11:10:50 2013
@@ -26,10 +26,10 @@ include_directories("${PROJECT_SOURCE_DI
 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")
-SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin")
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http")
+SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP")
 
-bundle(remote_service_admin SOURCES 
+bundle(remote_service_admin_http SOURCES 
 	private/src/remote_service_admin_impl
 	private/src/export_registration_impl
 	private/src/import_registration_impl
@@ -37,12 +37,4 @@ bundle(remote_service_admin SOURCES 
 	private/src/civetweb.c
 )
     
-install_bundle(remote_service_admin
-	HEADERS
-	    public/include/remote_endpoint_impl.h
-		public/include/remote_endpoint.h
-		public/include/remote_proxy.h
-		public/include/remote_service_admin.h
-)
-
-target_link_libraries(remote_service_admin celix_framework ${APRUTIL_LIBRARY} ${CURL_LIBRARIES})
+target_link_libraries(remote_service_admin_http celix_framework ${APRUTIL_LIBRARY} ${CURL_LIBRARIES})