Author: dkulp
Date: Mon Oct 29 16:42:58 2012
New Revision: 1403411
URL: http://svn.apache.org/viewvc?rev=1403411&view=rev
Log:
[ARIES-947] Warning cleanups for blueprint
Patch from Jean-Baptiste Onofré applied
Modified:
aries/trunk/blueprint/blueprint-annotation-api/pom.xml
aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
aries/trunk/blueprint/blueprint-api/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-sample/pom.xml
aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
Modified: aries/trunk/blueprint/blueprint-annotation-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-api/pom.xml Mon Oct 29 16:42:58
2012
@@ -15,7 +15,9 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
@@ -43,6 +45,9 @@
<aries.osgi.export.pkg>
org.apache.aries.blueprint.annotation.*
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.osgi.framework
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
</properties>
Modified:
aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
Mon Oct 29 16:42:58 2012
@@ -146,7 +146,7 @@ public class BlueprintAnnotationScannerI
e.printStackTrace();
}
try {
- return file.toURL();
+ return file.toURI().toURL();
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: aries/trunk/blueprint/blueprint-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-api/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-api/pom.xml Mon Oct 29 16:42:58 2012
@@ -46,6 +46,9 @@
!org.osgi.service.blueprint,
org.osgi.service.blueprint.*
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.osgi.framework
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
</properties>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Mon Oct 29 16:42:58 2012
@@ -51,7 +51,6 @@
-->
<aries.osgi.import>
!org.apache.aries.blueprint*,
- !org.osgi.service.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
org.osgi.service.event*;resolution:=optional,
@@ -64,9 +63,9 @@
</aries.osgi.import>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
-
=org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable,org.apache.aries.blueprint.compendium.cm";version="1.0.1",
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
+
org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable,org.apache.aries.blueprint.compendium.cm";version="1.0.1";-split-package:=merge-first,
+ org.osgi.service.blueprint.container;-split-package:=merge-first,
+ org.osgi.service.blueprint.reflect;-split-package:=merge-first,
!org.apache.aries.blueprint.annotation*,
org.apache.aries.blueprint,
org.apache.aries.blueprint.services,
@@ -84,11 +83,10 @@
org.apache.aries.blueprint.namespace,
org.apache.aries.blueprint.proxy,
org.apache.aries.blueprint.utils.*,
- org.apache.aries.blueprint.container,
org.apache.aries.blueprint.di,
org.apache.aries.blueprint.reflect,
org.apache.aries.blueprint.compendium.cm,
- OSGI-INF*
+ OSGI-INF*;-split-package:=merge-first
</aries.osgi.private.pkg>
<aries.osgi.export.service>
org.apache.aries.blueprint.ParserService
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Mon Oct 29 16:42:58 2012
@@ -56,7 +56,6 @@
org.osgi.service.blueprint;version=1.0.0
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.osgi.service.blueprint,
!org.apache.aries.blueprint*,
org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
Modified: aries/trunk/blueprint/blueprint-sample/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample/pom.xml Mon Oct 29 16:42:58 2012
@@ -45,6 +45,11 @@
<aries.osgi.activator>
org.apache.aries.blueprint.sample.Activator
</aries.osgi.activator>
+ <aries.osgi.import.pkg>
+ org.osgi.framework,
+ org.osgi.service.blueprint,
+ org.osgi.service.blueprint.container
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
</properties>
Modified: aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml?rev=1403411&r1=1403410&r2=1403411&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml Mon Oct 29
16:42:58 2012
@@ -39,6 +39,10 @@
<aries.osgi.activator>
org.apache.aries.blueprint.testquiescebundle.Activator
</aries.osgi.activator>
+ <aries.osgi.import.pkg>
+ org.osgi.framework,
+ org.osgi.service.blueprint
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
<aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
