Author: jbonofre
Date: Wed Mar 14 07:12:53 2012
New Revision: 1300470
URL: http://svn.apache.org/viewvc?rev=1300470&view=rev
Log:
[KARAF-916] Use Aries JMX API and JMX Core bundles instead of Aries JMX
"gather" bundle
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Wed Mar 14
07:12:53 2012
@@ -300,7 +300,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
Wed Mar 14 07:12:53 2012
@@ -290,7 +290,8 @@
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.api</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.core</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
</includes>
</dependencySet>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
Wed Mar 14 07:12:53 2012
@@ -280,7 +280,8 @@
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.api</include>
+
<include>org.apache.aries.jmx:org.apache.aries.jmx.core</include>
<include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
</includes>
</dependencySet>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
Wed Mar 14 07:12:53 2012
@@ -57,7 +57,8 @@ org/apache/karaf/diagnostic/org.apache.k
org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.management/${project.version}/org.apache.karaf.diagnostic.management-${project.version}.jar=30
org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
Wed Mar 14 07:12:53 2012
@@ -52,5 +52,6 @@ org/apache/karaf/features/org.apache.kar
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Wed Mar 14 07:12:53 2012
@@ -42,7 +42,8 @@
<bundle
start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.management/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
<bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
@@ -259,7 +260,8 @@
<feature name="management" version="${project.version}">
<bundle
start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
<bundle
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/${project.version}</bundle>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1300470&r1=1300469&r2=1300470&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Wed Mar 14 07:12:53 2012
@@ -897,7 +897,12 @@
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${aries.jmx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
<version>${aries.jmx.version}</version>
</dependency>
<dependency>
