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 14:38:17 UTC
svn commit: r1324739 - in /karaf/trunk:
assemblies/features/standard/src/main/feature/ web/ web/core/
web/core/src/main/java/org/apache/karaf/web/management/
web/core/src/main/java/org/apache/karaf/web/management/internal/
web/core/src/main/resources/O...
Author: cschneider
Date: Wed Apr 11 12:38:16 2012
New Revision: 1324739
URL: http://svn.apache.org/viewvc?rev=1324739&view=rev
Log:
KARAF-1302 Use aries jmx for web module
Added:
karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/
karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/WebMBean.java
- copied unchanged from r1324616, karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/WebMBean.java
karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/
- copied from r1324616, karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/
karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/Web.java
- copied, changed from r1324616, karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
Removed:
karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
karaf/trunk/web/management/
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/web/core/pom.xml
karaf/trunk/web/core/src/main/resources/OSGI-INF/blueprint/web-core.xml
karaf/trunk/web/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=1324739&r1=1324738&r2=1324739&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 12:38:16 2012
@@ -131,7 +131,6 @@
<bundle start-level="30">mvn:biz.aQute/bndlib/${bndlib.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.commands/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.management/${project.version}</bundle>
</feature>
<feature name="kar" description="Provide KAR (KARaf archive) support" version="${project.version}" resolver="(obr)">
Modified: karaf/trunk/web/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/pom.xml?rev=1324739&r1=1324738&r2=1324739&view=diff
==============================================================================
--- karaf/trunk/web/core/pom.xml (original)
+++ karaf/trunk/web/core/pom.xml Wed Apr 11 12:38:16 2012
@@ -80,16 +80,12 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.karaf.web;version=${project.version}
+ org.apache.karaf.web,
+ org.apache.karaf.web.management
</Export-Package>
- <Import-Package>
- !org.apache.karaf.web*,
- org.ops4j.pax.web*,
- org.slf4j,
- *
- </Import-Package>
<Private-Package>
- org.apache.karaf.web.internal
+ org.apache.karaf.web.internal,
+ org.apache.karaf.web.management.internal
</Private-Package>
</instructions>
</configuration>
Copied: karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/Web.java (from r1324616, karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/Web.java?p2=karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/Web.java&p1=karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java&r1=1324616&r2=1324739&rev=1324739&view=diff
==============================================================================
--- karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java (original)
+++ karaf/trunk/web/core/src/main/java/org/apache/karaf/web/management/internal/Web.java Wed Apr 11 12:38:16 2012
@@ -28,11 +28,11 @@ import java.util.List;
/**
* Implementation of the web MBean.
*/
-public class WebMBeanImpl extends StandardMBean implements WebMBean {
+public class Web extends StandardMBean implements WebMBean {
private WebContainerService webContainerService;
- public WebMBeanImpl() throws NotCompliantMBeanException {
+ public Web() throws NotCompliantMBeanException {
super(WebMBean.class);
}
@@ -49,7 +49,7 @@ public class WebMBeanImpl extends Standa
"Start level of the bundle",
"Web context path",
"Name of the bundle"},
- new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+ new OpenType[]{SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING, SimpleType.STRING});
TabularType tableType = new TabularType("Web Bundles", "Table of web bundles", webType,
new String[]{"ID"});
TabularData table = new TabularDataSupport(tableType);
Modified: karaf/trunk/web/core/src/main/resources/OSGI-INF/blueprint/web-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/core/src/main/resources/OSGI-INF/blueprint/web-core.xml?rev=1324739&r1=1324738&r2=1324739&view=diff
==============================================================================
--- karaf/trunk/web/core/src/main/resources/OSGI-INF/blueprint/web-core.xml (original)
+++ karaf/trunk/web/core/src/main/resources/OSGI-INF/blueprint/web-core.xml Wed Apr 11 12:38:16 2012
@@ -17,7 +17,11 @@
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">
+
+ <ext:property-placeholder />
<reference id="warManager" interface="org.ops4j.pax.web.service.spi.WarManager" />
@@ -34,4 +38,13 @@
<service ref="webContainerService" interface="org.apache.karaf.web.WebContainerService"/>
-</blueprint>
\ No newline at end of file
+ <bean id="webMBean" class="org.apache.karaf.web.management.internal.Web">
+ <property name="webContainerService" ref="webContainerService"/>
+ </bean>
+
+ <service ref="webMBean" interface="org.apache.karaf.web.management.WebMBean">
+ <service-properties>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=web,name=${karaf.name}"/>
+ </service-properties>
+ </service>
+</blueprint>
Modified: karaf/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/pom.xml?rev=1324739&r1=1324738&r2=1324739&view=diff
==============================================================================
--- karaf/trunk/web/pom.xml (original)
+++ karaf/trunk/web/pom.xml Wed Apr 11 12:38:16 2012
@@ -36,7 +36,6 @@
<modules>
<module>core</module>
<module>commands</module>
- <module>management</module>
</modules>
</project>
\ No newline at end of file