Author: cschneider
Date: Tue Apr 3 20:46:57 2012
New Revision: 1309140
URL: http://svn.apache.org/viewvc?rev=1309140&view=rev
Log:
KARAF-963 Services modules refactored
Added:
karaf/trunk/service/ (with props)
karaf/trunk/service/command/
- copied from r1308983, karaf/trunk/shell/services/
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/
- copied from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java
- copied, changed from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
- copied, changed from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java
- copied, changed from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java
- copied, changed from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/Wait.java
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/
- copied from r1308983,
karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/
karaf/trunk/service/core/
- copied from r1308983, karaf/trunk/management/mbeans/services/
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/
- copied from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java
- copied, changed from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/
- copied from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java
- copied, changed from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1308983,
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml
karaf/trunk/service/pom.xml
Removed:
karaf/trunk/management/mbeans/services/
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ListServices.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ObjectClassCompleter.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/ObjectClassMatcher.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/Wait.java
karaf/trunk/service/command/src/main/java/org/apache/karaf/shell/
karaf/trunk/service/command/src/test/java/org/apache/karaf/shell/
karaf/trunk/service/core/src/main/java/org/apache/karaf/management/
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/ServicesMBean.java
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/ServicesMBeanImpl.java
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/internal/
karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/services-management.xml
karaf/trunk/shell/services/
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/management/mbeans/pom.xml
karaf/trunk/pom.xml
karaf/trunk/service/command/pom.xml
karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java
karaf/trunk/service/core/pom.xml
karaf/trunk/shell/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1309140&r1=1309139&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Apr 3 20:46:57 2012
@@ -152,10 +152,6 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.services</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.system</groupId>
<artifactId>org.apache.karaf.system.core</artifactId>
</dependency>
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=1309140&r1=1309139&r2=1309140&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 3 20:46:57 2012
@@ -37,6 +37,8 @@
<bundle
start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.dev/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.dev/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.karaf.service/org.apache.karaf.service.core/${project.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.karaf.service/org.apache.karaf.service.command/${project.version}</bundle>
</feature>
<feature name="aries-annotation" description="Aries Annotations"
version="${project.version}">
@@ -177,7 +179,6 @@
<feature name="management" description="Provide a JMX MBeanServer and a
set of MBeans in Karaf" 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.karaf.system/org.apache.karaf.system.management/${project.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.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>
Modified: karaf/trunk/management/mbeans/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/pom.xml?rev=1309140&r1=1309139&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/pom.xml (original)
+++ karaf/trunk/management/mbeans/pom.xml Tue Apr 3 20:46:57 2012
@@ -34,7 +34,6 @@
<name>Apache Karaf :: Management :: MBeans</name>
<modules>
- <module>services</module>
<module>dev</module>
<module>log</module>
<module>obr</module>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1309140&r1=1309139&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Apr 3 20:46:57 2012
@@ -44,7 +44,8 @@
<module>config</module>
<module>instance</module>
<module>package</module>
- <module>http</module>
+ <module>http</module>
+ <module>service</module>
<module>deployer</module>
<module>shell</module>
<module>jaas</module>
@@ -373,6 +374,17 @@
</dependency>
<dependency>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>org.apache.karaf.service.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>org.apache.karaf.service.command</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.config</groupId>
<artifactId>org.apache.karaf.config.core</artifactId>
<version>${project.version}</version>
@@ -577,11 +589,6 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.services</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.log</artifactId>
<version>${project.version}</version>
</dependency>
Propchange: karaf/trunk/service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 3 20:46:57 2012
@@ -0,0 +1,3 @@
+target
+.project
+.settings
Modified: karaf/trunk/service/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Tue Apr 3 20:46:57 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>shell</artifactId>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>service</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.shell.services</artifactId>
+ <artifactId>org.apache.karaf.service.command</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: Services Commands</name>
- <description>This bundle provides shell commands to manipulate OSGi
services.</description>
+ <name>Apache Karaf :: Service :: Command</name>
+ <description>Provides shell commands to manipulate OSGi
services</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
Copied:
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java
(from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java?p2=karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java&p1=karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
(original)
+++
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ListServices.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import java.util.ArrayList;
import java.util.Collections;
Copied:
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
(from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java?p2=karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java&p1=karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassCompleter.java
(original)
+++
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassCompleter.java
Tue Apr 3 20:46:57 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import java.util.List;
import java.util.Map;
Copied:
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java
(from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java?p2=karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java&p1=karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ObjectClassMatcher.java
(original)
+++
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/ObjectClassMatcher.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
public class ObjectClassMatcher {
private ObjectClassMatcher() {
Copied:
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java
(from r1308983,
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/Wait.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java?p2=karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java&p1=karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/Wait.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/Wait.java
(original)
+++
karaf/trunk/service/command/src/main/java/org/apache/karaf/service/command/Wait.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import java.util.concurrent.TimeoutException;
Modified:
karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
---
karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml
(original)
+++
karaf/trunk/service/command/src/main/resources/OSGI-INF/blueprint/shell-services.xml
Tue Apr 3 20:46:57 2012
@@ -22,18 +22,18 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0";>
<command>
- <action class="org.apache.karaf.shell.services.ListServices"/>
+ <action class="org.apache.karaf.service.command.ListServices"/>
<completers>
<ref component-id="objectClassCompleter" />
<null/>
</completers>
</command>
<command>
- <action class="org.apache.karaf.shell.services.Wait"/>
+ <action class="org.apache.karaf.service.command.Wait"/>
</command>
</command-bundle>
- <bean id="objectClassCompleter"
class="org.apache.karaf.shell.services.ObjectClassCompleter">
+ <bean id="objectClassCompleter"
class="org.apache.karaf.service.command.ObjectClassCompleter">
<property name="context" ref="blueprintBundleContext"/>
</bean>
</blueprint>
\ No newline at end of file
Modified:
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
---
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java
(original)
+++
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServiceNamesTest.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import org.junit.Test;
public class ListServiceNamesTest {
Modified:
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
---
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java
(original)
+++
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ListServicesTest.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import org.junit.Test;
Modified:
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
---
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java
(original)
+++
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/ObjectClassMatcherTest.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import junit.framework.Assert;
Modified:
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
---
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java
(original)
+++
karaf/trunk/service/command/src/test/java/org/apache/karaf/service/command/TestBundleFactory.java
Tue Apr 3 20:46:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.shell.services;
+package org.apache.karaf.service.command;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
Modified: karaf/trunk/service/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/core/pom.xml?rev=1309140&r1=1308983&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/service/core/pom.xml (original)
+++ karaf/trunk/service/core/pom.xml Tue Apr 3 20:46:57 2012
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.management.mbeans</groupId>
- <artifactId>mbeans</artifactId>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>service</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.management.mbeans.services</artifactId>
+ <artifactId>org.apache.karaf.service.core</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Management :: MBeans :: Services</name>
- <description>The Services MBean bundle provides a JMX MBean to manipulate
the OSGi services.</description>
+ <name>Apache Karaf :: Service :: Core</name>
+ <description>Provices core services for OSGi services.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources/</appendedResourcesDirectory>
@@ -68,21 +68,10 @@
<configuration>
<instructions>
<Export-Package>
-
org.apache.karaf.management.mbeans.services;version=${project.version}
+ org.apache.karaf.service.core
</Export-Package>
- <Import-Package>
- !org.apache.karaf.management.mbeans.services,
- 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.services.internal,
- !*
+ org.apache.karaf.service.core.internal
</Private-Package>
</instructions>
</configuration>
Copied:
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java
(from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java?p2=karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java&p1=karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/ServicesMBean.java
(original)
+++
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/ServicesMBean.java
Tue Apr 3 20:46:57 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.services;
+package org.apache.karaf.service.core;
import javax.management.openmbean.TabularData;
Copied:
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java
(from r1308983,
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java?p2=karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java&p1=karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
(original)
+++
karaf/trunk/service/core/src/main/java/org/apache/karaf/service/core/internal/Services.java
Tue Apr 3 20:46:57 2012
@@ -14,27 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.management.mbeans.services.internal;
+package org.apache.karaf.service.core.internal;
-import org.apache.karaf.management.mbeans.services.ServicesMBean;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
+import java.util.ArrayList;
+import java.util.List;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
-import javax.management.openmbean.*;
-import java.util.ArrayList;
-import java.util.List;
+import javax.management.openmbean.ArrayType;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenType;
+import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
+import javax.management.openmbean.TabularType;
+
+import org.apache.karaf.service.core.ServicesMBean;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
/**
* Implementation of the Services MBean.
*/
-public class ServicesMBeanImpl extends StandardMBean implements ServicesMBean {
+public class Services extends StandardMBean implements ServicesMBean {
private BundleContext bundleContext;
- public ServicesMBeanImpl() throws NotCompliantMBeanException {
+ public Services() throws NotCompliantMBeanException {
super(ServicesMBean.class);
}
@@ -56,7 +65,7 @@ public class ServicesMBeanImpl extends S
new String[]{"Interfaces class name of the service",
"Properties of the service"},
new OpenType[]{new ArrayType(1, SimpleType.STRING), new
ArrayType(1, SimpleType.STRING)});
TabularType tableType = new TabularType("Services", "Table of OSGi
Services", serviceType,
- new String[]{"Interfaces"});
+ new String[]{"Interfaces", "Properties"});
TabularData table = new TabularDataSupport(tableType);
Bundle[] bundles;
Copied:
karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(from r1308983,
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml&r1=1308983&r2=1309140&rev=1309140&view=diff
==============================================================================
---
karaf/trunk/management/mbeans/services/src/main/resources/OSGI-INF/blueprint/services-management.xml
(original)
+++
karaf/trunk/service/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Tue Apr 3 20:46:57 2012
@@ -12,25 +12,17 @@
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";>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
- <!-- Reference to the MBean Server -->
- <reference id="mbeanServer" interface="javax.management.MBeanServer">
- <reference-listener ref="mbeanRegistrer"
bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
- </reference>
-
- <!-- Services MBean -->
- <bean id="servicesMBean"
class="org.apache.karaf.management.mbeans.services.internal.ServicesMBeanImpl">
+ <bean id="servicesMBean"
class="org.apache.karaf.service.core.internal.Services">
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <!-- MBean Registrer -->
- <bean id="mbeanRegistrer"
class="org.apache.karaf.management.MBeanRegistrer">
- <property name="mbeans">
- <map>
- <entry
value="org.apache.karaf:type=service,name=${karaf.name}"
key-ref="servicesMBean"/>
- </map>
- </property>
- </bean>
+ <service ref="servicesMBean" auto-export="interfaces">
+ <service-properties>
+ <entry key="jmx.objectname"
value="org.apache.karaf:type=service,name=${karaf.name}"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file
Added: karaf/trunk/service/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/service/pom.xml?rev=1309140&view=auto
==============================================================================
--- karaf/trunk/service/pom.xml (added)
+++ karaf/trunk/service/pom.xml Tue Apr 3 20:46:57 2012
@@ -0,0 +1,41 @@
+<?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.service</groupId>
+ <artifactId>service</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Service</name>
+
+ <modules>
+ <module>core</module>
+ <module>command</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: karaf/trunk/shell/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=1309140&r1=1309139&r2=1309140&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Tue Apr 3 20:46:57 2012
@@ -39,7 +39,6 @@
<module>dev</module>
<module>log</module>
<module>obr</module>
- <module>services</module>
<module>ssh</module>
</modules>
