Skip to content

Commit

Permalink
[KARAF-3584] Generate metadata for activator / capabilities and requi…
Browse files Browse the repository at this point in the history 
…rements directly
  • Loading branch information
@gnodet
gnodet committed Mar 4, 2015
1 parent 759d29c commit dfceded
Show file tree
Hide file tree
Showing 27 changed files with 18 additions and 206 deletions.
9 changes: 0 additions & 9 deletions bundle/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,9 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Embed-Dependency>
org.apache.karaf.jaas.modules;inline="org/apache/karaf/jaas/modules/JaasHelper*.class"
</Embed-Dependency>
<Bundle-Activator>
org.apache.karaf.bundle.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>org.apache.karaf.bundle.command.*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.config.core.impl.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>org.apache.karaf.config.command.*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions deployer/blueprint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.deployer.blueprint.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions deployer/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.deployer.features.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions deployer/kar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,6 @@
org.apache.karaf.deployer.kar.osgi,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.deployer.kar.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions deployer/spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.deployer.spring.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
10 changes: 0 additions & 10 deletions deployer/wrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.deployer.wrap.osgi.Activator
</Bundle-Activator>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
</plugin>
Expand Down
6 changes: 0 additions & 6 deletions diagnostic/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.diagnostic.internal.Activator
</Bundle-Activator>
Expand Down
3 changes: 0 additions & 3 deletions features/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@
<Embed-Dependency>
org.apache.karaf.util;inline="org/apache/karaf/util/XmlUtils*.class"
</Embed-Dependency>
<Bundle-Activator>
org.apache.karaf.features.internal.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest,
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.http.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions instance/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,6 @@
!org.apache.karaf.instance.core.internal,
*
</Import-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Private-Package>
org.apache.karaf.jpm,
org.apache.karaf.jpm.impl,
Expand All @@ -206,9 +200,6 @@
org.apache.karaf.util.locks,
org.apache.karaf.util.tracker
</Private-Package>
<Bundle-Activator>
org.apache.karaf.instance.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>org.apache.karaf.instance.command.*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
3 changes: 0 additions & 3 deletions jaas/modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@
org.apache.http*,
org.apache.commons.codec*
</Private-Package>
<Bundle-Activator>
org.apache.karaf.jaas.modules.impl.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions jdbc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.jdbc.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions jndi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,7 @@
org.apache.karaf.jndi.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Karaf-Commands>*</Karaf-Commands>
<Bundle-Activator>
org.apache.karaf.jndi.internal.osgi.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions kar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
<Bundle-Activator>
org.apache.karaf.kar.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>org.apache.karaf.kar.command.*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions log/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,6 @@
org.apache.karaf.log.core.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.log.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.log.command*
</Karaf-Commands>
Expand Down
9 changes: 0 additions & 9 deletions management/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,6 @@
org.apache.karaf.util.jaas,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.management.internal.Activator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions obr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,6 @@
org.apache.karaf.obr.core.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.obr.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.packages.core.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.packages.command
</Karaf-Commands>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2167,9 +2167,8 @@
<nsh_interface>org.apache.aries.blueprint.NamespaceHandler</nsh_interface>
<nsh_namespace>osgi.service.blueprint.namespace</nsh_namespace>
<_removeheaders>Private-Package,Include-Resource,Embed-Dependency,Created-By,Bnd-LastModified,Built-By,Tool</_removeheaders>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
<Bundle-DocURL>http://karaf.apache.org/</Bundle-DocURL>
<Provide-Capability>${capabilities}</Provide-Capability>
<Require-Capability>${requirements}</Require-Capability>
</instructions>
</configuration>
<executions>
Expand Down
9 changes: 0 additions & 9 deletions profile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.properties,
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.profile.impl.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.profile.command.*
</Karaf-Commands>
Expand Down
11 changes: 3 additions & 8 deletions scheduler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-Activator>org.apache.karaf.scheduler.core.Activator</Bundle-Activator>
<Karaf-Commands>org.apache.karaf.scheduler.command</Karaf-Commands>
<Export-Package>
org.apache.karaf.scheduler;version=${project.version};-noimport:=true
</Export-Package>
Expand All @@ -85,12 +83,9 @@
org.quartz.simpl.*,
org.quartz.utils.*,
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Karaf-Commands>
org.apache.karaf.scheduler.command
</Karaf-Commands>
</instructions>
</configuration>
</plugin>
Expand Down
7 changes: 0 additions & 7 deletions shell/ssh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@
org.apache.karaf.util.jaas,
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>org.apache.karaf.shell.ssh.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Expand Down
9 changes: 0 additions & 9 deletions system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
<Provide-Capability>
${capabilities}
</Provide-Capability>
<Require-Capability>
${requirements}
</Require-Capability>
<Bundle-Activator>
org.apache.karaf.system.internal.osgi.Activator
</Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
Expand Down
Loading

0 comments on commit dfceded

Please sign in to comment.