You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2014/03/27 12:19:19 UTC
svn commit: r1582261 - in /ace/trunk: org.apache.ace.agent.controller.itest/
org.apache.ace.agent.itest/ org.apache.ace.consolelogger/
org.apache.ace.discovery/ org.apache.ace.identification/
org.apache.ace.nodelauncher/ org.apache.ace.obr/ org.apache....
Author: jawi
Date: Thu Mar 27 11:19:19 2014
New Revision: 1582261
URL: http://svn.apache.org/r1582261
Log:
Fixing minor Bnd warnings and wrong imports and exports.
Modified:
ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd
ace/trunk/org.apache.ace.agent.itest/bnd.bnd
ace/trunk/org.apache.ace.consolelogger/bnd.bnd
ace/trunk/org.apache.ace.discovery/property.bnd
ace/trunk/org.apache.ace.identification/property.bnd
ace/trunk/org.apache.ace.nodelauncher/amazon.bnd
ace/trunk/org.apache.ace.obr/storage.bnd
ace/trunk/org.apache.ace.repository/impl.bnd
Modified: ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd Thu Mar 27 11:19:19 2014
@@ -27,40 +27,7 @@ Private-Package: \
org.osgi.service.event,\
org.osgi.service.log,\
org.osgi.util.tracker,\
- aQute.bnd.annotation.component,\
- aQute.bnd.help,\
- aQute.bnd.service.action,\
- aQute.lib.deployer,\
- aQute.lib.osgi.eclipse,\
- aQute.libg.filelock,\
- aQute.bnd.build,\
- aQute.bnd.maven.support,\
- aQute.bnd.settings,\
- aQute.libg.command,\
- aQute.libg.tuple,\
- aQute.lib.osgi,\
- aQute.bnd.annotation,\
- aQute.bnd.annotation.metatype,\
- aQute.bnd.component,\
- aQute.bnd.make,\
- aQute.bnd.make.component,\
- aQute.bnd.make.metatype,\
- aQute.bnd.maven,\
- aQute.bnd.service,\
- aQute.lib.base64,\
- aQute.lib.collections,\
- aQute.lib.filter,\
- aQute.lib.hex,\
- aQute.lib.io,\
- aQute.lib.tag,\
- aQute.libg.cryptography,\
- aQute.libg.generics,\
- aQute.libg.header,\
- aQute.libg.qtokens,\
- aQute.libg.reporter,\
- aQute.libg.sed,\
- aQute.libg.tarjan,\
- aQute.libg.version
+ aQute.*
-runee: JavaSE-1.6
-runvm: -ea
-runfw: org.apache.felix.framework;version='[4,5)'
@@ -80,6 +47,8 @@ Private-Package: \
org.apache.felix.log.maxSize=1000
Import-Package: \
!org.osgi.service.component.annotations,\
+ !org.apache.tools.ant.*,\
+ !aQute.*,\
*
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Agent Custom Controller itest
Modified: ace/trunk/org.apache.ace.agent.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/bnd.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.itest/bnd.bnd Thu Mar 27 11:19:19 2014
@@ -14,41 +14,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;j
org.apache.felix.log,\
biz.aQute.bnd,\
osgi.cmpn
-Private-Package: aQute.bnd.annotation.component,\
- aQute.bnd.help,\
- aQute.bnd.service.action,\
- aQute.lib.deployer,\
- aQute.lib.osgi.eclipse,\
- aQute.libg.filelock,\
- aQute.bnd.build,\
- aQute.bnd.maven.support,\
- aQute.bnd.settings,\
- aQute.libg.command,\
- aQute.libg.tuple,\
+Private-Package: \
org.apache.ace.agent.itest,\
- aQute.lib.osgi,\
- aQute.bnd.annotation,\
- aQute.bnd.annotation.metatype,\
- aQute.bnd.component,\
- aQute.bnd.make,\
- aQute.bnd.make.component,\
- aQute.bnd.make.metatype,\
- aQute.bnd.maven,\
- aQute.bnd.service,\
- aQute.lib.base64,\
- aQute.lib.collections,\
- aQute.lib.filter,\
- aQute.lib.hex,\
- aQute.lib.io,\
- aQute.lib.tag,\
- aQute.libg.cryptography,\
- aQute.libg.generics,\
- aQute.libg.header,\
- aQute.libg.qtokens,\
- aQute.libg.reporter,\
- aQute.libg.sed,\
- aQute.libg.tarjan,\
- aQute.libg.version
+ aQute.*
-runee: JavaSE-1.6
-runvm: -ea
-runfw: org.apache.felix.framework;version='[4,5)'
@@ -69,6 +37,8 @@ Private-Package: aQute.bnd.annotation.co
org.osgi.framework.bootdelegation="com.yourkit.*,com.sun.*,sun.*,apple.*,com.apple.*"
Import-Package: org.apache.ace.agent,\
!org.osgi.service.component.annotations,\
+ !org.apache.tools.ant.*,\
+ !aQute.*,\
*
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Agent itest
Modified: ace/trunk/org.apache.ace.consolelogger/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.consolelogger/bnd.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.consolelogger/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.consolelogger/bnd.bnd Thu Mar 27 11:19:19 2014
@@ -4,6 +4,6 @@
org.apache.felix.dependencymanager
Private-Package: org.apache.ace.consolelogger
Bundle-Activator: org.apache.ace.consolelogger.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE ConsoleLogger
Bundle-Description: Registers a component that writes log message to the console
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.discovery/property.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/property.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/property.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/property.bnd Thu Mar 27 11:19:19 2014
@@ -1,5 +1,4 @@
-Private-Package: org.apache.ace.discovery.property,\
- org.apache.ace.discovery.property.constants
+Private-Package: org.apache.ace.discovery.property
Bundle-Activator: org.apache.ace.discovery.property.Activator
Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Discovery Property
Modified: ace/trunk/org.apache.ace.identification/property.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/property.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/property.bnd (original)
+++ ace/trunk/org.apache.ace.identification/property.bnd Thu Mar 27 11:19:19 2014
@@ -1,5 +1,4 @@
-Private-Package: org.apache.ace.identification.property,\
- org.apache.ace.identification.property.constants
+Private-Package: org.apache.ace.identification.property
Bundle-Activator: org.apache.ace.identification.property.Activator
Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Identification Property
Modified: ace/trunk/org.apache.ace.nodelauncher/amazon.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/amazon.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/amazon.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/amazon.bnd Thu Mar 27 11:19:19 2014
@@ -1,21 +1,21 @@
-Private-Package: org.apache.ace.nodelauncher.amazon.impl,\
- META-INF.services,\
- META-INF.maven.*,\
- functions,\
- org.jclouds.*,\
- com.google.*,\
- net.schmizz.*,\
- org.nnsoft.*,\
- org.aopalliance.*,\
- net.oauth.*,\
- org.apache.commons.io.*,\
- javax.inject,\
- com.jcraft.*,\
- javax.annotation.*,\
- javax.ws.*,\
- org.slf4j.*,\
- org.bouncycastle.*,\
- com.sun.jersey.*
+Private-Package: \
+ org.apache.ace.nodelauncher.amazon.impl,\
+ META-INF.services;-split-package:=merge-first,\
+ META-INF.maven.*;-split-package:=merge-first,\
+ functions;-split-package:=merge-first,\
+ org.jclouds.*;-split-package:=merge-first,\
+ com.google.*;-split-package:=merge-first,\
+ net.schmizz.*;-split-package:=merge-first,\
+ org.nnsoft.*;-split-package:=merge-first,\
+ org.aopalliance.*;-split-package:=merge-first,\
+ net.oauth.*;-split-package:=merge-first,\
+ org.apache.commons.io.*;-split-package:=merge-first,\
+ javax.inject;-split-package:=merge-first,\
+ javax.annotation.*;-split-package:=merge-first,\
+ javax.ws.*;-split-package:=merge-first,\
+ org.slf4j.*;-split-package:=merge-first,\
+ org.bouncycastle.*;-split-package:=merge-first,\
+ com.sun.jersey.*;-split-package:=merge-first
Bundle-Activator: org.apache.ace.nodelauncher.amazon.impl.Activator
Import-Package: \
!com.google.*,\
Modified: ace/trunk/org.apache.ace.obr/storage.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/storage.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/storage.bnd (original)
+++ ace/trunk/org.apache.ace.obr/storage.bnd Thu Mar 27 11:19:19 2014
@@ -1,5 +1,4 @@
Private-Package: org.apache.ace.obr.storage.file,\
- org.apache.ace.obr.storage.file.constants,\
org.apache.ace.obr.metadata.util
Bundle-Activator: org.apache.ace.obr.storage.file.Activator
Export-Package: org.apache.ace.obr.storage
Modified: ace/trunk/org.apache.ace.repository/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/impl.bnd?rev=1582261&r1=1582260&r2=1582261&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/impl.bnd (original)
+++ ace/trunk/org.apache.ace.repository/impl.bnd Thu Mar 27 11:19:19 2014
@@ -1,5 +1,4 @@
-Private-Package: org.apache.ace.repository.impl,\
- org.apache.ace.repository.impl.constants
+Private-Package: org.apache.ace.repository.impl
Bundle-Activator: org.apache.ace.repository.impl.Activator
Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Repository Service