Author: dkulp
Date: Mon Oct 29 19:48:30 2012
New Revision: 1403469
URL: http://svn.apache.org/viewvc?rev=1403469&view=rev
Log:
[ARIES-947] Warning cleanups for spi-fly
Patch from Jean-Baptiste Onofré applied
Modified:
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/
(props changed)
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/
(props changed)
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Mon Oct 29 19:48:30 2012
@@ -24,6 +24,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
<version>1.0.0</version>
+
<relativePath>../../parent/default-parent/java6-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -106,8 +107,7 @@ JRE through META-INF/services resources)
*
</Import-Package>
<Export-Package>
- org.apache.aries.spifly;version=${project.version},
-
org.apache.aries.spifly.api;version=${project.version}
+ org.apache.aries.spifly*;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.aries.spifly.dynamic
Modified: aries/trunk/spi-fly/spi-fly-examples/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/pom.xml Mon Oct 29 19:48:30 2012
@@ -26,6 +26,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
<version>1.0.0</version>
+
<relativePath>../../parent/default-parent/java6-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly.examples</groupId>
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
(original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client1-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -62,6 +62,10 @@
</dependency>
</dependencies>
+ <properties>
+ <aries.osgi.export.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
(original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -50,6 +50,10 @@
</dependency>
</dependencies>
+ <properties>
+ <aries.osgi.export.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
(original)
+++
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -50,6 +50,11 @@
</dependency>
</dependencies>
+ <properties>
+ <aries.osgi.export.pkg />
+ <aries.osgi.private.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
(original)
+++
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -44,6 +44,10 @@
</dependency>
</dependencies>
+ <properties>
+ <aries.osgi.export.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Propchange:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 29 19:48:30 2012
@@ -1 +1,8 @@
+*.iml
target
+.settings
+.classpath
+.project
+velocity.log
+.externalToolBuilders
+
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
(original)
+++
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-client-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -43,6 +43,10 @@
</dependency>
</dependencies>
+ <properties>
+ <aries.osgi.export.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -55,7 +59,7 @@
</Import-Package>
<Export-Package/>
<Private-Package>
-org.apache.aries.spifly.example.resource.client
+ org.apache.aries.spifly.example.resource.client
</Private-Package>
<Bundle-Activator>org.apache.aries.spifly.example.resource.client.Activator</Bundle-Activator>
<SPI-Consumer>org.apache.aries.spifly.example.resource.client.Foo#doit()</SPI-Consumer>
Propchange:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 29 19:48:30 2012
@@ -1 +1,8 @@
+*.iml
target
+.settings
+.classpath
+.project
+velocity.log
+.externalToolBuilders
+
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml
(original)
+++
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-resource-provider-bundle/pom.xml
Mon Oct 29 19:48:30 2012
@@ -35,6 +35,12 @@
A Bundle providing a resource that another bundle attempts to obtain
via the TCCL
</description>
+ <properties>
+ <aries.osgi.export.pkg />
+ <aries.osgi.private.pkg />
+ <aries.osgi.import.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Modified:
aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml
(original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-spi-bundle/pom.xml Mon
Oct 29 19:48:30 2012
@@ -35,6 +35,10 @@
This is the API implemented by example SPI providers and used by the
example SPI client
</description>
+ <properties>
+ <aries.osgi.private.pkg />
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml?rev=1403469&r1=1403468&r2=1403469&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Mon Oct 29 19:48:30 2012
@@ -24,6 +24,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
<version>1.0.0</version>
+
<relativePath>../../parent/default-parent/java6-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -68,8 +69,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.aries.spifly;version=${project.version},
-
org.apache.aries.spifly.api;version=${project.version}
+ org.apache.aries.spifly*;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.aries.spifly.staticbundle
