You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/22 15:16:21 UTC
svn commit: r1544548 - in /karaf/trunk/http/core/src:
main/java/org/apache/karaf/http/core/
main/java/org/apache/karaf/http/core/internal/
main/resources/OSGI-INF/blueprint/
test/java/org/apache/karaf/http/core/internal/
Author: jbonofre
Date: Fri Nov 22 14:16:20 2013
New Revision: 1544548
URL: http://svn.apache.org/r1544548
Log:
[KARAF-2264] Rename Http to HttpMBeanImpl and raise MBeanException
Added:
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java
- copied, changed from r1544546, karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpMBeanImplTest.java
- copied, changed from r1544546, karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java
Removed:
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java
karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java
Modified:
karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java
karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java?rev=1544548&r1=1544547&r2=1544548&view=diff
==============================================================================
--- karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java (original)
+++ karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/HttpMBean.java Fri Nov 22 14:16:20 2013
@@ -16,6 +16,7 @@
*/
package org.apache.karaf.http.core;
+import javax.management.MBeanException;
import javax.management.openmbean.TabularData;
/**
@@ -29,6 +30,6 @@ public interface HttpMBean {
* @return a tabular view of the servlets information.
* @throws Exception
*/
- TabularData getServlets();
+ TabularData getServlets() throws MBeanException;
}
Copied: karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java (from r1544546, karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java?p2=karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java&p1=karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java&r1=1544546&r2=1544548&rev=1544548&view=diff
==============================================================================
--- karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/Http.java (original)
+++ karaf/trunk/http/core/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java Fri Nov 22 14:16:20 2013
@@ -19,6 +19,7 @@ package org.apache.karaf.http.core.inter
import java.util.Arrays;
import java.util.List;
+import javax.management.MBeanException;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import javax.management.openmbean.CompositeData;
@@ -37,15 +38,15 @@ import org.apache.karaf.http.core.Servle
/**
* Implementation of the HTTP MBean.
*/
-public class Http extends StandardMBean implements HttpMBean {
+public class HttpMBeanImpl extends StandardMBean implements HttpMBean {
private ServletService servletService;
- public Http(ServletService servletService) throws NotCompliantMBeanException {
+ public HttpMBeanImpl(ServletService servletService) throws NotCompliantMBeanException {
super(HttpMBean.class);
this.servletService = servletService;
}
- public TabularData getServlets() {
+ public TabularData getServlets() throws MBeanException {
try {
CompositeType servletType = new CompositeType("Servlet", "HTTP Servlet",
new String[]{"Bundle-ID", "Servlet", "Servlet Name", "State", "Alias", "URL"},
@@ -64,7 +65,7 @@ public class Http extends StandardMBean
}
return table;
} catch (Exception e) {
- throw new RuntimeException(e.getMessage(), e);
+ throw new MBeanException(null, e.getMessage());
}
}
Modified: karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1544548&r1=1544547&r2=1544548&view=diff
==============================================================================
--- karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/http/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Fri Nov 22 14:16:20 2013
@@ -27,7 +27,7 @@
<service interface="org.apache.karaf.http.core.ServletService" ref="servletService"/>
- <bean id="httpMBean" class="org.apache.karaf.http.core.internal.Http">
+ <bean id="httpMBean" class="org.apache.karaf.http.core.internal.HttpMBeanImpl">
<argument ref="servletService"/>
</bean>
Copied: karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpMBeanImplTest.java (from r1544546, karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpMBeanImplTest.java?p2=karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpMBeanImplTest.java&p1=karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java&r1=1544546&r2=1544548&rev=1544548&view=diff
==============================================================================
--- karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpTest.java (original)
+++ karaf/trunk/http/core/src/test/java/org/apache/karaf/http/core/internal/HttpMBeanImplTest.java Fri Nov 22 14:16:20 2013
@@ -24,11 +24,11 @@ import javax.management.openmbean.Tabula
import org.junit.Test;
-public class HttpTest {
+public class HttpMBeanImplTest {
@Test
public void testRegisterMBean() throws Exception {
- Http httpMBean = new Http(new ServletServiceImpl(new ServletEventHandler()));
+ HttpMBeanImpl httpMBean = new HttpMBeanImpl(new ServletServiceImpl(new ServletEventHandler()));
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
mbeanServer.registerMBean(httpMBean, new ObjectName("org.apache.karaf:type=http,name=root"));