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/11 11:50:55 UTC
svn commit: r1324677 - in /karaf/trunk:
assemblies/features/standard/src/main/feature/ kar/ kar/command/ kar/core/
kar/core/src/main/java/org/apache/karaf/kar/
kar/core/src/main/java/org/apache/karaf/kar/internal/
kar/core/src/main/resources/OSGI-INF/b...
Author: cschneider
Date: Wed Apr 11 09:50:54 2012
New Revision: 1324677
URL: http://svn.apache.org/viewvc?rev=1324677&view=rev
Log:
KARAF-1302 Use aries jmx for kar module
Added:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java
- copied, changed from r1324616, karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java
- copied, changed from r1324616, karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/internal/KarServiceMBeanImpl.java
Removed:
karaf/trunk/kar/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/kar/command/pom.xml
karaf/trunk/kar/core/pom.xml
karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
karaf/trunk/kar/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=1324677&r1=1324676&r2=1324677&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed Apr 11 09:50:54 2012
@@ -137,7 +137,6 @@
<feature name="kar" description="Provide KAR (KARaf archive) support" version="${project.version}" resolver="(obr)">
<bundle start-level="30">mvn:org.apache.karaf.kar/org.apache.karaf.kar.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.kar/org.apache.karaf.kar.command/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.kar/org.apache.karaf.kar.management/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
</feature>
Modified: karaf/trunk/kar/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/command/pom.xml?rev=1324677&r1=1324676&r2=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/command/pom.xml (original)
+++ karaf/trunk/kar/command/pom.xml Wed Apr 11 09:50:54 2012
@@ -46,6 +46,10 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -70,13 +74,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>
- org.apache.karaf.kar;version=${project.version},
- org.apache.karaf.shell.commands;version=${project.version},
- org.apache.karaf.shell.console*;version=${project.version},
- org.osgi.service.blueprint
- </Import-Package>
- <Private-Package>!*</Private-Package>
+ <Export-Package>!*</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/trunk/kar/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/pom.xml?rev=1324677&r1=1324676&r2=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/core/pom.xml (original)
+++ karaf/trunk/kar/core/pom.xml Wed Apr 11 09:50:54 2012
@@ -73,17 +73,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.kar;version=${project.version}
+ org.apache.karaf.kar
</Export-Package>
- <Import-Package>
- !org.apache.karaf.kar,
- javax.xml.parsers,
- org.apache.karaf.features;version=${project.version},
- org.slf4j;resolution:=optional,
- org.w3c.dom,
- org.xml.sax,
- org.osgi.service.blueprint
- </Import-Package>
<Private-Package>
org.apache.karaf.kar.internal
</Private-Package>
Copied: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java (from r1324616, karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java?p2=karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java&p1=karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java&r1=1324616&r2=1324677&rev=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/KarServiceMBean.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/KarsMBean.java Wed Apr 11 09:50:54 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.kar.management;
+package org.apache.karaf.kar;
import java.util.List;
-public interface KarServiceMBean {
+public interface KarsMBean {
/**
* List the installed KAR files.
Copied: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java (from r1324616, karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/internal/KarServiceMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java?p2=karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java&p1=karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/internal/KarServiceMBeanImpl.java&r1=1324616&r2=1324677&rev=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/management/src/main/java/org/apache/karaf/kar/management/internal/KarServiceMBeanImpl.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/Kars.java Wed Apr 11 09:50:54 2012
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.kar.management.internal;
+package org.apache.karaf.kar.internal;
import org.apache.karaf.kar.KarService;
-import org.apache.karaf.kar.management.KarServiceMBean;
+import org.apache.karaf.kar.KarsMBean;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import java.net.URI;
import java.util.List;
-public class KarServiceMBeanImpl extends StandardMBean implements KarServiceMBean {
+public class Kars extends StandardMBean implements KarsMBean {
private KarService karService;
- public KarServiceMBeanImpl() throws NotCompliantMBeanException {
- super(KarServiceMBean.class);
+ public Kars() throws NotCompliantMBeanException {
+ super(KarsMBean.class);
}
public List<String> getKars() throws Exception {
Modified: karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml?rev=1324677&r1=1324676&r2=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml (original)
+++ karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml Wed Apr 11 09:50:54 2012
@@ -31,5 +31,15 @@
</bean>
<service ref="karService" interface="org.apache.karaf.kar.KarService"/>
+
+ <bean id="mbeanImpl" class="org.apache.karaf.kar.internal.Kars">
+ <property name="karService" ref="karService"/>
+ </bean>
+
+ <service ref="mbeanImpl" interface="org.apache.karaf.kar.KarsMBean">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=kar,name=$[karaf.name]"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file
Modified: karaf/trunk/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/pom.xml?rev=1324677&r1=1324676&r2=1324677&view=diff
==============================================================================
--- karaf/trunk/kar/pom.xml (original)
+++ karaf/trunk/kar/pom.xml Wed Apr 11 09:50:54 2012
@@ -36,7 +36,6 @@
<modules>
<module>core</module>
<module>command</module>
- <module>management</module>
</modules>
</project>
\ No newline at end of file