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/03/19 12:13:03 UTC
svn commit: r1302375 [2/2] - in /karaf/trunk: ./
assemblies/features/framework/ assemblies/features/spring/src/main/feature/
assemblies/features/standard/src/main/feature/ bundle/ bundle/command/
bundle/command/src/main/java/org/apache/karaf/bundle/ bu...
Added: karaf/trunk/bundle/core/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/core/src/main/resources/OSGI-INF/bundle.info?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/core/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/bundle/core/src/main/resources/OSGI-INF/bundle.info Mon Mar 19 11:13:00 2012
@@ -0,0 +1,15 @@
+h1. Synopsis
+
+${project.name}
+
+${project.description}
+
+Maven URL:
+ [mvn:${project.groupId}/${project.artifactId}/${project.version}]
+
+h1. Description
+
+Services for handling bundles
+
+h1. See also
+
Propchange: karaf/trunk/bundle/management/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 19 11:13:00 2012
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Modified: karaf/trunk/bundle/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/pom.xml?rev=1302375&r1=1301510&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/bundle/management/pom.xml (original)
+++ karaf/trunk/bundle/management/pom.xml Mon Mar 19 11:13:00 2012
@@ -22,25 +22,25 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.management.mbeans</groupId>
- <artifactId>mbeans</artifactId>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>bundle</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.management.mbeans.bundles</artifactId>
+ <artifactId>org.apache.karaf.bundle.management</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Management :: MBeans :: Bundles</name>
- <description>The Bundles MBean bundle provides a JMX MBean to manipulate OSGi bundles.</description>
+ <name>Apache Karaf :: Bundle :: Management</name>
+ <description>Provides a JMX MBean to manipulate OSGi bundles</description>
<properties>
- <appendedResourcesDirectory>${basedir}/../../../etc/appended-resources/</appendedResourcesDirectory>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources/</appendedResourcesDirectory>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -68,20 +68,10 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.management.mbeans.bundles;version=${project.version}
+ org.apache.karaf.bundle.management;version=${project.version}
</Export-Package>
- <Import-Package>
- !org.apache.karaf.management.mbeans.bundles.internal,
- javax.management,
- javax.management.loading,
- org.apache.aries.blueprint,
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
- org.apache.karaf.management;version=${project.version},
- *
- </Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.bundles.internal,
+ org.apache.karaf.bundle.management.internal,
!*
</Private-Package>
</instructions>
Modified: karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java?rev=1302375&r1=1301510&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java (original)
+++ karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/BundlesMBean.java Mon Mar 19 11:13:00 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.bundles;
+package org.apache.karaf.bundle.management;
import javax.management.openmbean.TabularData;
Modified: karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java?rev=1302375&r1=1301510&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java (original)
+++ karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesMBeanImpl.java Mon Mar 19 11:13:00 2012
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.bundles.internal;
+package org.apache.karaf.bundle.management.internal;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
+
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import javax.management.openmbean.CompositeData;
@@ -30,7 +31,7 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import org.apache.karaf.management.mbeans.bundles.BundlesMBean;
+import org.apache.karaf.bundle.management.BundlesMBean;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.startlevel.BundleStartLevel;
Modified: karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesSelector.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesSelector.java?rev=1302375&r1=1301510&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesSelector.java (original)
+++ karaf/trunk/bundle/management/src/main/java/org/apache/karaf/bundle/management/internal/BundlesSelector.java Mon Mar 19 11:13:00 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.bundles.internal;
+package org.apache.karaf.bundle.management.internal;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml?rev=1302375&r1=1301510&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml (original)
+++ karaf/trunk/bundle/management/src/main/resources/OSGI-INF/blueprint/bundles-management.xml Mon Mar 19 11:13:00 2012
@@ -20,7 +20,7 @@
</reference>
<!-- Bundles MBean -->
- <bean id="bundlesMBean" class="org.apache.karaf.management.mbeans.bundles.internal.BundlesMBeanImpl">
+ <bean id="bundlesMBean" class="org.apache.karaf.bundle.management.internal.BundlesMBeanImpl">
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
Added: karaf/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/pom.xml?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/pom.xml (added)
+++ karaf/trunk/bundle/pom.xml Mon Mar 19 11:13:00 2012
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>bundle</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Bundle</name>
+
+ <modules>
+ <module>core</module>
+ <module>command</module>
+ <module>management</module>
+ <module>springstate</module>
+ </modules>
+
+</project>
Propchange: karaf/trunk/bundle/springstate/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 19 11:13:00 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: karaf/trunk/bundle/springstate/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/pom.xml?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/springstate/pom.xml (added)
+++ karaf/trunk/bundle/springstate/pom.xml Mon Mar 19 11:13:00 2012
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>bundle</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.karaf.bundle.springstate</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Bundle :: SpringStateService</name>
+ <description>Provide State Support for Spring DM bundles</description>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>org.apache.karaf.bundle.core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.info</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ </Export-Package>
+ <Import-Package>
+ !org.apache.karaf.bundle.springstate,
+ org.apache.felix.service.command;status=provisional,
+ *</Import-Package>
+ <Private-Package>
+ org.apache.karaf.bundle.springstateservice
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringApplicationListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringApplicationListener.java?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringApplicationListener.java (added)
+++ karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringApplicationListener.java Mon Mar 19 11:13:00 2012
@@ -0,0 +1,75 @@
+package org.apache.karaf.bundle.springstate;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.karaf.bundle.core.BundleStateService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
+import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
+import org.springframework.osgi.context.event.OsgiBundleContextFailedEvent;
+import org.springframework.osgi.context.event.OsgiBundleContextRefreshedEvent;
+import org.springframework.osgi.extender.event.BootstrappingDependencyEvent;
+import org.springframework.osgi.service.importer.event.OsgiServiceDependencyEvent;
+import org.springframework.osgi.service.importer.event.OsgiServiceDependencyWaitStartingEvent;
+
+public class SpringApplicationListener implements OsgiBundleApplicationContextListener,
+ BundleListener, BundleStateService {
+
+ public static enum SpringState {
+ Unknown,
+ Waiting,
+ Started,
+ Failed,
+ }
+
+ private static final Logger LOG = LoggerFactory.getLogger(SpringApplicationListener.class);
+
+ private final Map<Long, SpringApplicationListener.SpringState> states;
+
+ public SpringApplicationListener(BundleContext bundleContext) {
+ this.states = new ConcurrentHashMap<Long, SpringApplicationListener.SpringState>();
+ }
+
+ public String getName() {
+ return "Spring";
+ }
+
+ public String getState(Bundle bundle) {
+ SpringState state = states.get(bundle.getBundleId());
+ if (state == null || bundle.getState() != Bundle.ACTIVE || state == SpringState.Unknown) {
+ return null;
+ }
+ return state.toString();
+ }
+
+ public void onOsgiApplicationEvent(OsgiBundleApplicationContextEvent event) {
+ SpringState state = null;
+ if (event instanceof BootstrappingDependencyEvent) {
+ OsgiServiceDependencyEvent de = ((BootstrappingDependencyEvent) event).getDependencyEvent();
+ if (de instanceof OsgiServiceDependencyWaitStartingEvent) {
+ state = SpringState.Waiting;
+ }
+ } else if (event instanceof OsgiBundleContextFailedEvent) {
+ state = SpringState.Failed;
+ } else if (event instanceof OsgiBundleContextRefreshedEvent) {
+ state = SpringState.Started;
+ }
+ if (state != null) {
+ LOG.debug("Spring app state changed to " + state + " for bundle " + event.getBundle().getBundleId());
+ states.put(event.getBundle().getBundleId(), state);
+ }
+ }
+
+ public void bundleChanged(BundleEvent event) {
+ if (event.getType() == BundleEvent.UNINSTALLED) {
+ states.remove(event.getBundle().getBundleId());
+ }
+ }
+
+}
\ No newline at end of file
Added: karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringStateListenerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringStateListenerFactory.java?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringStateListenerFactory.java (added)
+++ karaf/trunk/bundle/springstate/src/main/java/org/apache/karaf/bundle/springstate/SpringStateListenerFactory.java Mon Mar 19 11:13:00 2012
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.bundle.springstate;
+
+
+import org.apache.karaf.bundle.core.BundleStateService;
+import org.osgi.framework.BundleContext;
+
+
+public class SpringStateListenerFactory {
+
+ private BundleContext bundleContext;
+ private BundleStateService listener;
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void init() {
+ getListener();
+ }
+
+ public void destroy() throws Exception {
+ if (listener instanceof Destroyable) {
+ ((Destroyable) listener).destroy();
+ }
+ }
+
+ public synchronized BundleStateService getListener() {
+ if (listener == null) {
+ listener = createListener();
+ }
+ return listener;
+ }
+
+ private BundleStateService createListener() {
+ try {
+ // Use dynamic class loading to make sure we actually try to reload the class for
+ // dynamic imports to kick in if possible
+ Class<?> cl = getClass().getClassLoader().loadClass("org.apache.karaf.shell.bundles.SpringStateListenerFactory$SpringApplicationListener");
+ return (BundleStateService) cl.getConstructor(BundleContext.class).newInstance(bundleContext);
+// return new SpringApplicationListener(bundleContext);
+ } catch (Throwable t) {
+ return null;
+ }
+ }
+
+ public static interface Destroyable {
+
+ public void destroy() throws Exception;
+
+ }
+
+}
Added: karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml (added)
+++ karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/blueprint/shell-bundles.xml Mon Mar 19 11:13:00 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <bean id="springStateService" class="org.apache.karaf.bundle.springstate.SpringApplicationListener">
+ <argument ref="blueprintBundleContext"/>
+ </bean>
+
+ <service ref="springStateService">
+ <interfaces>
+ <value>org.apache.karaf.bundle.core.BundleStateService</value>
+ <value>org.springframework.osgi.context.event.OsgiBundleApplicationContextListener</value>
+ <value>org.osgi.framework.BundleListener</value>
+ </interfaces>
+ </service>
+
+</blueprint>
Added: karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/bundle.info?rev=1302375&view=auto
==============================================================================
--- karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/bundle.info (added)
+++ karaf/trunk/bundle/springstate/src/main/resources/OSGI-INF/bundle.info Mon Mar 19 11:13:00 2012
@@ -0,0 +1,15 @@
+h1. Synopsis
+
+${project.name}
+
+${project.description}
+
+Maven URL:
+ [mvn:${project.groupId}/${project.artifactId}/${project.version}]
+
+h1. Description
+
+State Service for Spring DM bundles
+
+h1. See also
+
Modified: karaf/trunk/management/mbeans/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/pom.xml?rev=1302375&r1=1302374&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/pom.xml (original)
+++ karaf/trunk/management/mbeans/pom.xml Mon Mar 19 11:13:00 2012
@@ -34,7 +34,6 @@
<name>Apache Karaf :: Management :: MBeans</name>
<modules>
- <module>bundles</module>
<module>services</module>
<module>packages</module>
<module>dev</module>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1302375&r1=1302374&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Mar 19 11:13:00 2012
@@ -40,6 +40,7 @@
<module>features</module>
<module>kar</module>
<module>region</module>
+ <module>bundle</module>
<module>config</module>
<module>instance</module>
<module>deployer</module>
@@ -337,6 +338,22 @@
</dependency>
<dependency>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>org.apache.karaf.bundle.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>org.apache.karaf.bundle.command</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>org.apache.karaf.bundle.management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.config</groupId>
<artifactId>org.apache.karaf.config.core</artifactId>
<version>${project.version}</version>
@@ -396,11 +413,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.management.mbeans</groupId>
- <artifactId>org.apache.karaf.management.mbeans.bundles</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.management.mbeans</groupId>
<artifactId>org.apache.karaf.management.mbeans.dev</artifactId>
<version>${project.version}</version>
</dependency>
@@ -548,11 +560,7 @@
<artifactId>org.apache.karaf.shell.obr</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.bundles</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.services</artifactId>
Modified: karaf/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=1302375&r1=1302374&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Mon Mar 19 11:13:00 2012
@@ -36,7 +36,6 @@
<modules>
<module>commands</module>
<module>console</module>
- <module>bundles</module>
<module>dev</module>
<module>http</module>
<module>log</module>
Modified: karaf/trunk/shell/services/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/services/pom.xml?rev=1302375&r1=1302374&r2=1302375&view=diff
==============================================================================
--- karaf/trunk/shell/services/pom.xml (original)
+++ karaf/trunk/shell/services/pom.xml Mon Mar 19 11:13:00 2012
@@ -44,8 +44,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.bundles</artifactId>
+ <groupId>org.apache.karaf.bundle</groupId>
+ <artifactId>org.apache.karaf.bundle.command</artifactId>
<scope>provided</scope>
</dependency>
<dependency>