svn commit: r1324788 - in /karaf/trunk: ./ assemblies/features/standard/src/main/feature/ wrapper/ wrapper/core/ wrapper/core/src/main/java/org/apache/karaf/wrapper/management/ wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/ wr...

[cs...@apache.org]

Author: cschneider
Date: Wed Apr 11 14:41:24 2012
New Revision: 1324788

URL: http://svn.apache.org/viewvc?rev=1324788&view=rev
Log:
KARAF-1302 Use aries jmx for wrapper module

Added:
    karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/
    karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java
      - copied unchanged from r1324616, karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/WrapperMBean.java
    karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/
      - copied from r1324616, karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/internal/
    karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java
      - copied, changed from r1324616, karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
Removed:
    karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java
    karaf/trunk/wrapper/management/
Modified:
    karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
    karaf/trunk/pom.xml
    karaf/trunk/wrapper/core/pom.xml
    karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml
    karaf/trunk/wrapper/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=1324788&r1=1324787&r2=1324788&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 14:41:24 2012
@@ -52,7 +52,6 @@
     <feature name="wrapper" description="Provide OS integration" version="${project.version}">
         <bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${project.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.commands/${project.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.management/${project.version}</bundle>
     </feature>
 
     <feature name="obr" description="Provide OSGi Bundle Repository (OBR) support" version="${project.version}">

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1324788&r1=1324787&r2=1324788&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Apr 11 14:41:24 2012
@@ -516,11 +516,6 @@
                 <artifactId>org.apache.karaf.system.core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.system</groupId>
-                <artifactId>org.apache.karaf.system.management</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.karaf.web</groupId>
@@ -543,11 +538,6 @@
                 <artifactId>org.apache.karaf.wrapper.core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.wrapper</groupId>
-                <artifactId>org.apache.karaf.wrapper.management</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.karaf.region</groupId>
@@ -645,11 +635,6 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.karaf.scr</groupId>
-                <artifactId>org.apache.karaf.scr.management</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.karaf.demos</groupId>
                 <artifactId>web</artifactId>
                 <version>${project.version}</version>

Modified: karaf/trunk/wrapper/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/pom.xml?rev=1324788&r1=1324787&r2=1324788&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/pom.xml (original)
+++ karaf/trunk/wrapper/core/pom.xml Wed Apr 11 14:41:24 2012
@@ -99,16 +99,14 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.karaf.wrapper;version=${project.version}
+                            org.apache.karaf.wrapper,
+                            org.apache.karaf.wrapper.management
                         </Export-Package>
-                        <Import-Package>
-                            !org.apache.karaf.wrapper*,
-                            !org.apache.karaf.main,
-                            !org.tanukisoftware.wrapper,
-                            *
-                        </Import-Package>
                         <Private-Package>
-                            org.apache.karaf.wrapper.internal
+                            org.apache.karaf.wrapper.internal,
+                            org.apache.karaf.wrapper.management.internal,
+                            org.tanukisoftware.wrapper*,
+                            org.apache.karaf.main*
                         </Private-Package>
                     </instructions>
                 </configuration>

Copied: karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java (from r1324616, karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java?p2=karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java&p1=karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java&r1=1324616&r2=1324788&rev=1324788&view=diff
==============================================================================
--- karaf/trunk/wrapper/management/src/main/java/org/apache/karaf/wrapper/management/internal/WrapperMBeanImpl.java (original)
+++ karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/management/internal/Wrapper.java Wed Apr 11 14:41:24 2012
@@ -26,11 +26,11 @@ import java.io.File;
 /**
  * Implementation of the wrapper MBean.
  */
-public class WrapperMBeanImpl extends StandardMBean implements WrapperMBean {
+public class Wrapper extends StandardMBean implements WrapperMBean {
 
     private WrapperService wrapperService;
 
-    public WrapperMBeanImpl() throws NotCompliantMBeanException {
+    public Wrapper() throws NotCompliantMBeanException {
         super(WrapperMBean.class);
     }
 

Modified: karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml?rev=1324788&r1=1324787&r2=1324788&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml (original)
+++ karaf/trunk/wrapper/core/src/main/resources/OSGI-INF/blueprint/wrapper-core.xml Wed Apr 11 14:41:24 2012
@@ -17,10 +17,23 @@
     limitations under the License.
 
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+    xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
-    <bean id="wrapper" class="org.apache.karaf.wrapper.internal.WrapperServiceImpl"/>
+    <ext:property-placeholder />
 
-    <service ref="wrapper" interface="org.apache.karaf.wrapper.WrapperService"/>
+    <bean id="wrapperService" class="org.apache.karaf.wrapper.internal.WrapperServiceImpl"/>
 
+    <service ref="wrapperService" interface="org.apache.karaf.wrapper.WrapperService"/>
+
+    <bean id="wrapperMBean" class="org.apache.karaf.wrapper.management.internal.Wrapper">
+        <property name="wrapperService" ref="wrapperService" />
+    </bean>
+
+    <service ref="wrapperMBean" interface="org.apache.karaf.wrapper.management.WrapperMBean">
+        <service-properties>
+            <entry key="jmx.objectname" value="org.apache.karaf:type=wrapper,name=${karaf.name}"/>
+        </service-properties>
+    </service>
 </blueprint>
\ No newline at end of file

Modified: karaf/trunk/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/pom.xml?rev=1324788&r1=1324787&r2=1324788&view=diff
==============================================================================
--- karaf/trunk/wrapper/pom.xml (original)
+++ karaf/trunk/wrapper/pom.xml Wed Apr 11 14:41:24 2012
@@ -36,7 +36,6 @@
     <modules>
         <module>core</module>
         <module>commands</module>
-        <module>management</module>
     </modules>
 
 </project>
\ No newline at end of file