Author: dkulp
Date: Mon Oct 29 16:45:38 2012
New Revision: 1403414
URL: http://svn.apache.org/viewvc?rev=1403414&view=rev
Log:
[ARIES-947] Warning cleanups for jmx
Patch from Jean-Baptiste Onofré applied
Modified:
aries/trunk/jmx/jmx-api/pom.xml
aries/trunk/jmx/jmx-blueprint-api/pom.xml
aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
aries/trunk/jmx/jmx-bundle/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
aries/trunk/jmx/jmx-whiteboard/pom.xml
Modified: aries/trunk/jmx/jmx-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Mon Oct 29 16:45:38 2012
@@ -32,14 +32,14 @@
This bundle contains the JMX 1.0.0 API
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.osgi.jmx;uses:="javax.management.openmbean",
org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management.openmbean",
@@ -48,6 +48,9 @@
org.osgi.jmx.service.provisioning;uses:="javax.management.openmbean",
org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,javax.management.openmbean"
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ javax.management.openmbean
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
</properties>
Modified: aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-api/pom.xml Mon Oct 29 16:45:38 2012
@@ -32,17 +32,20 @@
This bundle contains the JMX Blueprint API
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
org.apache.aries.jmx.blueprint
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ javax.management.openmbean
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
</properties>
Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Mon Oct 29 16:45:38 2012
@@ -32,11 +32,11 @@
This bundle contains the standalone implementation of the along with
the API.
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-bundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-bundle</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-bundle</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-bundle</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle</url>
+ </scm>
<properties>
<aries.osgi.activator>
@@ -47,10 +47,16 @@
org.apache.aries.jmx.blueprint;
org.apache.aries.jmx.blueprint.codec
</aries.osgi.export.pkg>
- <aries.osgi.import>
- !org.apache.aries.jmx*,
- *
- </aries.osgi.import>
+ <aries.osgi.import.pkg>
+ javax.management,
+ javax.management.openmbean,
+ org.apache.aries.util,
+ org.osgi.framework,
+ org.osgi.service.blueprint.container,
+ org.osgi.service.blueprint.reflect,
+ org.osgi.util.tracker,
+ org.slf4j;resolution:=optional
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.jmx.blueprint.impl*
</aries.osgi.private.pkg>
Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Mon Oct 29 16:45:38 2012
@@ -32,11 +32,12 @@
This bundle contains the standalone implementation of the along with
the API.
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-bundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-bundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-bundle</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-bundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.Activator
@@ -52,9 +53,6 @@
org.apache.aries.jmx.codec
</aries.osgi.export>
<aries.osgi.import>
- !org.apache.aries.jmx*,
- !org.osgi.service.framework,
- !org.eclipse*,
org.osgi.framework;version="[1.5.0,2.0)",
org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Mon Oct 29 16:45:38 2012
@@ -33,18 +33,17 @@
of the JMX Control specification
</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core</url>
+ </scm>
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.Activator
</aries.osgi.activator>
<aries.osgi.import>
- !org.apache.aries.jmx*,
org.osgi.framework;version="[1.5.0,2.0)",
org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
Modified:
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
Mon Oct 29 16:45:38 2012
@@ -103,7 +103,7 @@ public class ProvisioningServiceMBeanTes
provZip.deleteOnExit();
- mbean.addInformationFromZip(provZip.toURL().toExternalForm());
+ mbean.addInformationFromZip(provZip.toURI().toURL().toExternalForm());
//check the info has been added
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1403414&r1=1403413&r2=1403414&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Mon Oct 29 16:45:38 2012
@@ -66,8 +66,13 @@
<aries.osgi.activator>
org.apache.aries.jmx.whiteboard.Activator
</aries.osgi.activator>
- <aries.osgi.export.pkg>
- </aries.osgi.export.pkg>
+ <aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ javax.management,
+ org.osgi.framework,
+ org.osgi.util.tracker,
+ org.slf4j;resolution:=optional
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.jmx.whiteboard,
org.apache.aries.jmx.util.shared
