celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1333314 - in /incubator/celix/trunk: ./ deployment_admin/private/src/ examples/hello_world/META-INF/ examples/osgi-in-action/chapter04-paint-example/circle/ examples/osgi-in-action/chapter04-paint-example/paint/ examples/osgi-in-action/cha...
Date Thu, 03 May 2012 06:02:57 GMT
Author: abroekhuis
Date: Thu May  3 06:02:57 2012
New Revision: 1333314

URL: http://svn.apache.org/viewvc?rev=1333314&view=rev
Log:
Small updates to CMake files and some reformating of Manifest files.

Modified:
    incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
    incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
    incubator/celix/trunk/shell/META-INF/MANIFEST.MF
    incubator/celix/trunk/target.cmake

Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Thu May  3 06:02:57
2012
@@ -26,8 +26,8 @@
 
 #include "resource_processor.h"
 
-#define IDENTIFICATION_ID "deployment_admin.identification"
-#define DISCOVERY_URL "deployment_admin.url"
+#define IDENTIFICATION_ID "deployment_admin_identification"
+#define DISCOVERY_URL "deployment_admin_url"
 // "http://localhost:8080/deployment/"
 
 #define VERSIONS "/versions"
@@ -64,13 +64,13 @@ celix_status_t deploymentAdmin_create(ap
 		(*admin)->pollUrl = NULL;
         bundleContext_getProperty(context, IDENTIFICATION_ID, &(*admin)->targetIdentification);
 		if ((*admin)->targetIdentification == NULL ) {
-			printf("Target name must be set using \"deployment_admin.identification\"\n");
+			printf("Target name must be set using \"deployment_admin_identification\"\n");
 			status = CELIX_ILLEGAL_ARGUMENT;
 		} else {
 			char *url = NULL;
 			bundleContext_getProperty(context, DISCOVERY_URL, &url);
 			if (url == NULL) {
-				printf("URL must be set using \"deployment_admin.url\"\n");
+				printf("URL must be set using \"deployment_admin_url\"\n");
 				status = CELIX_ILLEGAL_ARGUMENT;
 			} else {
 				(*admin)->pollUrl = apr_pstrcat(subpool, url, (*admin)->targetIdentification, VERSIONS,
NULL);
@@ -151,7 +151,7 @@ static void *APR_THREAD_FUNC deploymentA
 
 					deployment_package_t target = hashMap_get(admin->packages, name);
 					if (target == NULL) {
-	//					target = empty package
+//						target = empty package
 					}
 
 					deploymentAdmin_stopDeploymentPackageBundles(admin, target);
@@ -242,7 +242,6 @@ celix_status_t deploymentAdmin_download(
 	curl = curl_easy_init();
 	if (curl) {
 		tmpnam(*inputFile);
-		printf("Temp file: %s\n", *inputFile);
 		FILE *fp = fopen(*inputFile, "wb+");
 		curl_easy_setopt(curl, CURLOPT_URL, url);
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, deploymentAdmin_writeData);
@@ -348,10 +347,10 @@ celix_status_t deploymentAdmin_updateDep
 		BUNDLE updateBundle = NULL;
 		deploymentPackage_getBundle(source, info->symbolicName, &updateBundle);
 		if (updateBundle != NULL) {
-			printf("Update bundle from: %s\n", bundlePath);
+			//printf("Update bundle from: %s\n", bundlePath);
 			bundle_update(updateBundle, bundlePath);
 		} else {
-			printf("Install bundle from: %s\n", bundlePath);
+			//printf("Install bundle from: %s\n", bundlePath);
 			bundleContext_installBundle2(admin->context, bsn, bundlePath, &updateBundle);
 		}
 	}
@@ -419,8 +418,6 @@ celix_status_t deploymentAdmin_processDe
 		ARRAY_LIST services = NULL;
 		char *filter = NULL;
 
-		printf("Process resource: %s with %s\n", info->path, info->resourceProcessor);
-
 		apr_pool_create(&tmpPool, admin->pool);
 		filter = apr_pstrcat(tmpPool, "(", SERVICE_PID, "=", info->resourceProcessor, ")", NULL);
 
@@ -474,7 +471,6 @@ celix_status_t deploymentAdmin_dropDeplo
 				ARRAY_LIST services = NULL;
 				char *filter = NULL;
 
-				printf("Drop resource: %s with %s\n", info->path, info->resourceProcessor);
 
 				apr_pool_create(&tmpPool, admin->pool);
 				filter = apr_pstrcat(tmpPool, "(", SERVICE_PID, "=", info->resourceProcessor, ")",
NULL);

Modified: incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF (original)
+++ incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF Thu May  3 06:02:57 2012
@@ -2,3 +2,23 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: hello_world
 Bundle-Version: 1.0.0
 library: hello_world
+Import-Service: o2_alarm_service,
+ o2_communication_service,
+ o2_configuration_service,
+ o2_control_service,
+ o2_health_service,
+ o2_latency_service,
+ o2_logging_service,
+ o2_notification_service,
+ o2_recording_service,
+ o2_parameter_service
+Export-Service: o2_alarm_service,
+ o2_communication_service,
+ o2_configuration_service,
+ o2_control_service,
+ o2_health_service,
+ o2_latency_service,
+ o2_logging_service,
+ o2_notification_service,
+ o2_recording_service,
+ o2_parameter_service

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
Thu May  3 06:02:57 2012
@@ -14,9 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-cmake_minimum_required(VERSION 2.8)
 INCLUDE(FindPkgConfig)
-cmake_policy(SET CMP0014 NEW)
 pkg_search_module (GLIB  REQUIRED glib-2.0)
 pkg_search_module (GTHR  REQUIRED gthread-2.0)
 pkg_search_module (GTK   REQUIRED gtk+-2.0)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
Thu May  3 06:02:57 2012
@@ -14,9 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-cmake_minimum_required(VERSION 2.8)
 INCLUDE(FindPkgConfig)
-cmake_policy(SET CMP0014 NEW)
 pkg_search_module (GLIB  REQUIRED glib-2.0)
 pkg_search_module (GTHR  REQUIRED gthread-2.0)
 pkg_search_module (GTK   REQUIRED gtk+-2.0)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
Thu May  3 06:02:57 2012
@@ -14,9 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-cmake_minimum_required(VERSION 2.8)
 INCLUDE(FindPkgConfig)
-cmake_policy(SET CMP0014 NEW)
 pkg_search_module (GLIB  REQUIRED glib-2.0)
 pkg_search_module (GTHR  REQUIRED gthread-2.0)
 pkg_search_module (GTK   REQUIRED gtk+-2.0)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
(original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
Thu May  3 06:02:57 2012
@@ -14,9 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-cmake_minimum_required(VERSION 2.8)
 INCLUDE(FindPkgConfig)
-cmake_policy(SET CMP0014 NEW)
 pkg_search_module (GLIB  REQUIRED glib-2.0)
 pkg_search_module (GTHR  REQUIRED gthread-2.0)
 pkg_search_module (GTK   REQUIRED gtk+-2.0)

Modified: incubator/celix/trunk/shell/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/META-INF/MANIFEST.MF?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/shell/META-INF/MANIFEST.MF (original)
+++ incubator/celix/trunk/shell/META-INF/MANIFEST.MF Thu May  3 06:02:57 2012
@@ -1,5 +1,9 @@
 Bundle-SymbolicName: shell
 Bundle-Version: 1.0.0
 library: shell
+Import-Service: 
+ shellService,
+ commandService,
+ log_reader_service,
+ log_service
 Export-Service: shellService,commandService
-Import-Service: shellService,commandService,log_reader_service,log_service

Modified: incubator/celix/trunk/target.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/target.cmake?rev=1333314&r1=1333313&r2=1333314&view=diff
==============================================================================
--- incubator/celix/trunk/target.cmake (original)
+++ incubator/celix/trunk/target.cmake Thu May  3 06:02:57 2012
@@ -19,6 +19,6 @@
 #deploy("shell test" BUNDLES shell)
 deploy("hello_world" BUNDLES shell shell_tui hello_world log_service)
 #deploy("deployer" BUNDLES shell shell_tui deployer)
-deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service)
-deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service)
+deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
+deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service log_writer)
 #deploy("echo" BUNDLES echo_server echo_client shell shell_tui)



Mime
View raw message