You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/04/10 23:52:39 UTC
svn commit: r1312014 - in /karaf/trunk: ./
assemblies/features/standard/src/main/feature/ features/ features/core/
features/core/src/main/java/org/apache/karaf/features/management/
features/core/src/main/java/org/apache/karaf/features/management/codec/...
Author: cschneider
Date: Tue Apr 10 21:52:38 2012
New Revision: 1312014
URL: http://svn.apache.org/viewvc?rev=1312014&view=rev
Log:
KARAF-1302 Use aries jmx for features module
Added:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/FeaturesServiceMBean.java
- copied unchanged from r1311978, karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/FeaturesServiceMBean.java
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/codec/
- copied from r1311978, karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/codec/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/
- copied from r1311978, karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java
- copied, changed from r1311978, karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1311978, karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
Removed:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
karaf/trunk/features/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/pom.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1312014&r1=1312013&r2=1312014&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Apr 10 21:52:38 2012
@@ -22,7 +22,6 @@
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
<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.instance/org.apache.karaf.instance.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.instance/org.apache.karaf.instance.command/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.instance/org.apache.karaf.instance.management/${project.version}</bundle>
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1312014&r1=1312013&r2=1312014&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Apr 10 21:52:38 2012
@@ -52,6 +52,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -65,13 +66,6 @@
<scope>provided</scope>
</dependency>
- <!-- I think this is here only to get better attributes on the felix gogo/shell imports which appear to be unnecessary anyway ??? -->
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
@@ -82,7 +76,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <!-- uncomment for more complete test log output -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
@@ -112,18 +105,15 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.karaf.features;version=${project.version}</Export-Package>
- <Import-Package>
- !org.apache.karaf.features,
- org.apache.aries.blueprint,
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
- org.osgi.service.event*;resolution:=optional,
- *
- </Import-Package>
+ <Export-Package>
+ org.apache.karaf.features,
+ org.apache.karaf.features.management,
+ org.apache.karaf.features.management.codec
+ </Export-Package>
<Private-Package>
org.apache.karaf.features.internal,
org.apache.karaf.features.internal.model,
+ org.apache.karaf.features.management.internal,
org.apache.felix.utils.version,
org.apache.felix.utils.manifest
</Private-Package>
Copied: karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java (from r1311978, karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java?p2=karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java&p1=karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java&r1=1311978&r2=1312014&rev=1312014&view=diff
==============================================================================
--- karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java (original)
+++ karaf/trunk/features/core/src/main/java/org/apache/karaf/features/management/internal/FeaturesService.java Tue Apr 10 21:52:38 2012
@@ -31,7 +31,6 @@ import javax.management.openmbean.Tabula
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeatureEvent;
import org.apache.karaf.features.FeaturesListener;
-import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Repository;
import org.apache.karaf.features.RepositoryEvent;
import org.apache.karaf.features.management.FeaturesServiceMBean;
@@ -45,7 +44,7 @@ import org.osgi.framework.ServiceRegistr
/**
* Implementation of {@link FeaturesServiceMBean}.
*/
-public class FeaturesServiceMBeanImpl extends StandardEmitterMBean implements
+public class FeaturesService extends StandardEmitterMBean implements
MBeanRegistration, FeaturesServiceMBean {
private ServiceRegistration registration;
@@ -58,9 +57,9 @@ public class FeaturesServiceMBeanImpl ex
private MBeanServer server;
- private FeaturesService featuresService;
+ private org.apache.karaf.features.FeaturesService featuresService;
- public FeaturesServiceMBeanImpl() throws NotCompliantMBeanException {
+ public FeaturesService() throws NotCompliantMBeanException {
super(FeaturesServiceMBean.class);
}
@@ -155,7 +154,7 @@ public class FeaturesServiceMBeanImpl ex
this.bundleContext = bundleContext;
}
- public void setFeaturesService(FeaturesService featuresService) {
+ public void setFeaturesService(org.apache.karaf.features.FeaturesService featuresService) {
this.featuresService = featuresService;
}
Copied: karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (from r1311978, karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml&r1=1311978&r2=1312014&rev=1312014&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml (original)
+++ karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 10 21:52:38 2012
@@ -58,5 +58,15 @@
bind-method="registerRegionsPersistence"
unbind-method="unregisterRegionsPersistence" />
</reference>
+
+ <bean id="featuresServiceMBean" class="org.apache.karaf.features.management.internal.FeaturesService">
+ <property name="bundleContext" ref="blueprintBundleContext" />
+ <property name="featuresService" ref="featuresService" />
+ </bean>
+ <service ref="featuresServiceMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=feature,name=$(karaf.name)"/>
+ </service-properties>
+ </service>
</blueprint>
Modified: karaf/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/pom.xml?rev=1312014&r1=1312013&r2=1312014&view=diff
==============================================================================
--- karaf/trunk/features/pom.xml (original)
+++ karaf/trunk/features/pom.xml Tue Apr 10 21:52:38 2012
@@ -36,7 +36,6 @@
<modules>
<module>core</module>
<module>command</module>
- <module>management</module>
<module>obr</module>
</modules>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1312014&r1=1312013&r2=1312014&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Apr 10 21:52:38 2012
@@ -467,12 +467,12 @@
<artifactId>demos</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.command</artifactId>
@@ -480,11 +480,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.management</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.obr</artifactId>
<version>${project.version}</version>
</dependency>