Merge pull request apache#671 from apache/feature/509-remove-deprecat…

…ed-wire-code
xuzhenbao · Oct 16, 2023 · e0af0e6 · e0af0e6
2 parents d7a4067 + 085b4ff
commit e0af0e6
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 494 deletions.
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
@@ -27,7 +27,6 @@ if (FRAMEWORK)
             src/bundle_context.c src/bundle_revision.c
             src/framework.c src/manifest.c
             src/manifest_parser.c src/module.c
-            src/requirement.c src/capability.c src/wire.c
             src/service_reference.c src/service_registration.c
             src/service_registry.c src/service_tracker.c src/service_tracker_customizer.c
             src/celix_log.c src/celix_launcher.c

diff --git a/libs/framework/include_deprecated/bundle.h b/libs/framework/include_deprecated/bundle.h
@@ -26,7 +26,6 @@
 #include "celix_bundle_state.h"
 #include "bundle_archive.h"
 #include "framework.h"
-#include "wire.h"
 #include "module.h"
 #include "service_reference.h"
 #include "celix_log.h"

diff --git a/libs/framework/include_deprecated/capability.h b/libs/framework/include_deprecated/capability.h
diff --git a/libs/framework/include_deprecated/module.h b/libs/framework/include_deprecated/module.h
@@ -53,8 +53,6 @@ CELIX_FRAMEWORK_DEPRECATED_EXPORT unsigned int module_hash(void *module);
 
 CELIX_FRAMEWORK_DEPRECATED_EXPORT int module_equals(void *module, void *compare);
 
-CELIX_FRAMEWORK_DEPRECATED_EXPORT wire_pt module_getWire(module_pt module, const char *serviceName);
-
 CELIX_FRAMEWORK_DEPRECATED_EXPORT version_pt module_getVersion(module_pt module);
 
 CELIX_FRAMEWORK_DEPRECATED_EXPORT celix_status_t module_getSymbolicName(module_pt module, const char **symbolicName);

diff --git a/libs/framework/include_deprecated/requirement.h b/libs/framework/include_deprecated/requirement.h
diff --git a/libs/framework/include_deprecated/wire.h b/libs/framework/include_deprecated/wire.h
diff --git a/libs/framework/src/capability.c b/libs/framework/src/capability.c
diff --git a/libs/framework/src/capability_private.h b/libs/framework/src/capability_private.h
diff --git a/libs/framework/src/framework_private.h b/libs/framework/src/framework_private.h
@@ -25,7 +25,6 @@
 #include "celix_framework.h"
 #include "framework.h"
 #include "manifest.h"
-#include "wire.h"
 #include "hash_map.h"
 #include "array_list.h"
 #include "celix_errno.h"

diff --git a/libs/framework/src/manifest_parser.c b/libs/framework/src/manifest_parser.c
@@ -27,15 +27,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
 #include "celix_utils.h"
 #include "celix_constants.h"
 #include "manifest_parser.h"
-#include "capability.h"
-#include "requirement.h"
-#include "hash_map.h"
 #include "celix_errno.h"
-#include "linked_list_iterator.h"
 #include "celix_log.h"
 
 struct manifestParser {

diff --git a/libs/framework/src/module.c b/libs/framework/src/module.c
@@ -139,10 +139,6 @@ void module_destroy(module_pt module) {
 	free(module);
 }
 
-wire_pt module_getWire(module_pt module, const char * serviceName) {
-	return NULL;
-}
-
 version_pt module_getVersion(module_pt module) {
 	return module->version;
 }