[ https://issues.apache.org/jira/browse/OAK-6772?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17825651#comment-17825651 ]
Manfred Baedke edited comment on OAK-6772 at 3/21/24 10:54 AM: --------------------------------------------------------------- [https://github.com/jsedding/osgi-ds-metatype-diff] gives: {code:java} org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService (String) + description = (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider (String) + description = (String) Attribute Definitions solr.zk.host - description = Description for solr.zk.host (String) solr.socket.timeout - description = Description for solr.socket.timeout (String) solr.conf.dir - description = Description for solr.conf.dir (String) solr.collection - description = Description for solr.collection (String) solr.connection.timeout - description = Description for solr.connection.timeout (String) solr.replication.factor - description = Description for solr.replication.factor (String) name + id = name (String) + name = Name (String) + type = 1 (Integer) + cardinality = 0 (Integer) + defaultValue = [remote] (String[]) + optionLabels = [] (String[]) + optionValues = [] (String[]) solr.http.url - description = Description for solr.http.url (String) solr.shards.no - description = Description for solr.shards.no (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService (String) + description = (String) Attribute Definitions server.type - description = Description for server.type (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrIndexEditorProviderService Declarative Services References solrServerProvider - bind = bindSolrServerProvider (String) - unbind = unbindSolrServerProvider (String) + field = solrServerProvider (String) + field-option = replace (String) oakSolrConfigurationProvider - bind = bindOakSolrConfigurationProvider (String) - unbind = unbindOakSolrConfigurationProvider (String) + field = oakSolrConfigurationProvider (String) + field-option = replace (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService Declarative Services Properties - property.mappings = [] (String[]) - type.mappings = [] (String[]) MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService (String) + description = (String) Attribute Definitions used.properties - description = Description for used.properties (String) path.parent.field - description = Description for path.parent.field (String) property.restrictions - description = Description for property.restrictions (String) collapsed.path.field - description = Description for collapsed.path.field (String) path.restrictions - description = Description for path.restrictions (String) path.exact.field - description = Description for path.exact.field (String) rows - description = Description for rows (String) collapse.jcrcontent.nodes - description = Description for collapse.jcrcontent.nodes (String) collapse.jcrcontent.parents - description = Description for collapse.jcrcontent.parents (String) path.desc.field - description = Description for path.desc.field (String) path.child.field - description = Description for path.child.field (String) catch.all.field - description = Description for catch.all.field (String) ignored.properties - description = Description for ignored.properties (String) commit.policy - description = Description for commit.policy (String) primarytypes.restrictions - description = Description for primarytypes.restrictions (String) path.depth.field - description = Description for path.depth.field (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService Declarative Services References solrServerProvider - bind = bindSolrServerProvider (String) - unbind = unbindSolrServerProvider (String) + field = solrServerProvider (String) + field-option = replace (String) nodeAggregator - bind = bindNodeAggregator (String) - unbind = unbindNodeAggregator (String) + field = nodeAggregator (String) + field-option = replace (String) oakSolrConfigurationProvider - bind = bindOakSolrConfigurationProvider (String) - unbind = unbindOakSolrConfigurationProvider (String) + field = oakSolrConfigurationProvider (String) + field-option = replace (String) MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService (String) + description = (String) {code} which is fine. The output does not depend on whether we compare solr-core or solr-osgi. The two removed properties property.mappings and type.mappings of OakSolrConfigurationProviderService are due to to the requirement of [OSGi R7] that "For component property type methods with a value of an empty array, a property element must not be generated", for whatever reason. The properties are still present in the metatype information. was (Author: baedke): [https://github.com/jsedding/osgi-ds-metatype-diff] gives: {code:java} MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.NodeStateSolrServersObserverService (String) + description = (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.RemoteSolrServerConfigurationProvider (String) + description = (String) Attribute Definitions solr.zk.host - description = Description for solr.zk.host (String) solr.socket.timeout - description = Description for solr.socket.timeout (String) solr.conf.dir - description = Description for solr.conf.dir (String) solr.collection - description = Description for solr.collection (String) solr.connection.timeout - description = Description for solr.connection.timeout (String) solr.replication.factor - description = Description for solr.replication.factor (String) solr.http.url - description = Description for solr.http.url (String) solr.shards.no - description = Description for solr.shards.no (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrServerProviderService (String) + description = (String) Attribute Definitions server.type - name = Property server.type (String) + name = server type (String) - description = Description for server.type (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrIndexEditorProviderService Declarative Services References solrServerProvider - bind = bindSolrServerProvider (String) - unbind = unbindSolrServerProvider (String) + field = solrServerProvider (String) + field-option = replace (String) oakSolrConfigurationProvider - bind = bindOakSolrConfigurationProvider (String) - unbind = unbindOakSolrConfigurationProvider (String) + field = oakSolrConfigurationProvider (String) + field-option = replace (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService Declarative Services Properties - property.mappings = [] (String[]) - type.mappings = [] (String[]) MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.OakSolrConfigurationProviderService (String) + description = (String) Attribute Definitions used.properties - description = Description for used.properties (String) path.parent.field - description = Description for path.parent.field (String) property.restrictions - description = Description for property.restrictions (String) collapsed.path.field - description = Description for collapsed.path.field (String) path.restrictions - description = Description for path.restrictions (String) path.exact.field - description = Description for path.exact.field (String) rows - description = Description for rows (String) collapse.jcrcontent.nodes - description = Description for collapse.jcrcontent.nodes (String) collapse.jcrcontent.parents - description = Description for collapse.jcrcontent.parents (String) path.desc.field - description = Description for path.desc.field (String) path.child.field - description = Description for path.child.field (String) catch.all.field - description = Description for catch.all.field (String) ignored.properties - description = Description for ignored.properties (String) commit.policy - name = Property commit.policy (String) + name = commit policy (String) - description = Description for commit.policy (String) primarytypes.restrictions - description = Description for primarytypes.restrictions (String) path.depth.field - description = Description for path.depth.field (String) org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService Declarative Services References solrServerProvider - bind = bindSolrServerProvider (String) - unbind = unbindSolrServerProvider (String) + field = solrServerProvider (String) + field-option = replace (String) nodeAggregator - bind = bindNodeAggregator (String) - unbind = unbindNodeAggregator (String) + field = nodeAggregator (String) + field-option = replace (String) oakSolrConfigurationProvider - bind = bindOakSolrConfigurationProvider (String) - unbind = unbindOakSolrConfigurationProvider (String) + field = oakSolrConfigurationProvider (String) + field-option = replace (String) MetaType Attributes - namespace = http://www.osgi.org/xmlns/metatype/v1.0.0 (String) + namespace = http://www.osgi.org/xmlns/metatype/v1.2.0 (String) ObjectClassDefinitions org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService - description = Description for org.apache.jackrabbit.oak.plugins.index.solr.osgi.SolrQueryIndexProviderService (String) + description = (String) {code} which is fine. The output does not depend on whether we compare solr-core or solr-osgi. The two removed properties property.mappings and type.mappings of OakSolrConfigurationProviderService are due to to the requirement of [OSGi R7] that "For component property type methods with a value of an empty array, a property element must not be generated", for whatever reason. The properties are still present in the metatype information. > Convert oak-solr-core to OSGi R7 annotations > -------------------------------------------- > > Key: OAK-6772 > URL: https://issues.apache.org/jira/browse/OAK-6772 > Project: Jackrabbit Oak > Issue Type: Technical task > Components: solr > Reporter: Robert Munteanu > Assignee: Manfred Baedke > Priority: Major > -- This message was sent by Atlassian Jira (v8.20.10#820010)