Add changes for wso2/api-manager#2943

YasasRangika · Jul 3, 2024 · 338f446 · 338f446
1 parent 5f0284b
commit 338f446
Show file tree

Hide file tree

Showing 28 changed files with 117 additions and 1 deletion.
diff --git a/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml b/components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml
@@ -80,6 +80,12 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.ntask.core.service.TaskService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.TenantRegistryLoader,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.core/pom.xml
@@ -124,6 +124,12 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore,
+                            osgi.service;objectClass=org.wso2.carbon.identity.authentication.AuthenticationService,
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml
@@ -89,6 +89,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml
@@ -110,6 +110,12 @@
 			    org.osgi.framework,*;resolution:=optional
 			</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.base.api.ServerConfigurationService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService,
+                            osgi.service;objectClass=org.osgi.service.http.HttpService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml
@@ -120,6 +120,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml b/components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml
@@ -87,6 +87,9 @@
                         </Export-Package>
                         <Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml b/components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml
@@ -95,6 +95,9 @@
 		        	org.osgi.framework,*;resolution:=optional
 			</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/.../event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml b/.../event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.rdbms/pom.xml
@@ -92,6 +92,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.ndatasource.core.DataSourceService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...ts/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml b/...ts/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.sms/pom.xml
@@ -110,6 +110,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...nts/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml b/...nts/event-publisher/event-output-adapters/org.wso2.carbon.event.output.adapter.ui/pom.xml
@@ -112,6 +112,10 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.ui.UIOutputAuthorizationService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml
@@ -99,6 +99,11 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.securevault.SecretCallbackHandlerService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.admin/pom.xml
@@ -88,6 +88,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml
@@ -110,6 +110,14 @@
                         <Axis2RequiredServices>
                             org.wso2.carbon.event.publisher.core.EventPublisherService
                         </Axis2RequiredServices>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                            osgi.service;objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml b/components/event-publisher/org.wso2.carbon.event.publisher.template.deployer/pom.xml
@@ -91,6 +91,10 @@
                               *;resolution:=optional,
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>

diff --git a/.../event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml b/.../event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.filetail/pom.xml
@@ -87,6 +87,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...ents/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml b/...ents/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.http/pom.xml
@@ -90,6 +90,10 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+                            osgi.service;objectClass=org.osgi.service.http.HttpService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...nts/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml b/...nts/event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.kafka/pom.xml
@@ -94,6 +94,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml b/...event-receiver/event-input-adapters/org.wso2.carbon.event.input.adapter.wso2event/pom.xml
@@ -102,6 +102,9 @@
                             *;resolution:=optional,
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeSubscriberService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml
@@ -74,6 +74,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.admin/pom.xml
@@ -88,6 +88,10 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml
@@ -125,6 +125,15 @@
                         <Axis2RequiredServices>
                             org.wso2.carbon.event.receiver.core.EventReceiverService
                         </Axis2RequiredServices>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory,
+                            osgi.service;objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService,
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml b/components/event-receiver/org.wso2.carbon.event.receiver.template.deployer/pom.xml
@@ -90,6 +90,10 @@
                               *;resolution:=optional,
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>

diff --git a/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.admin/pom.xml
@@ -84,6 +84,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.core/pom.xml
@@ -98,6 +98,10 @@
                         </Import-Package>
                         <Axis2Deployer>EventStreamDeployer</Axis2Deployer>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamListener
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml b/components/event-stream/org.wso2.carbon.event.stream.template.deployer/pom.xml
@@ -85,8 +85,11 @@
                               org.wso2.carbon.event.template.manager.core,
                               *;resolution:=optional,
                           </Import-Package>
-
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>

diff --git a/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml b/components/jaggeryapp-template-deployer/org.wso2.carbon.jaggeryapp.template.deployer/pom.xml
@@ -102,6 +102,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml b/components/template-manager/org.wso2.carbon.event.template.manager.admin/pom.xml
@@ -95,6 +95,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.event.template.manager.core.TemplateManagerService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml b/components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml
@@ -97,6 +97,11 @@
                               *;resolution:=optional
                           </Import-Package>
                           <DynamicImport-Package>*</DynamicImport-Package>
+                          <Provide-Capability>
+                              osgi.service;objectClass=org.wso2.carbon.event.template.manager.core.TemplateDeployer,
+                              osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                              osgi.service;objectClass=org.wso2.carbon.event.stream.core.EventStreamService
+                          </Provide-Capability>
                       </instructions>
                   </configuration>
               </plugin>