[jbossws-commits] JBossWS SVN: r11012 - in stack/cxf/trunk/modules: testsuite/cxf-tests/scripts and 5 other directories.

Author: jim.ma Date: 2009-10-26 04:59:56 -0400 (Mon, 26 Oct 2009) New Revision: 11012 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorld.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/WEB-INF/web.xml Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: [JBWS-2805]:Add a testcase to demonstarte cxf jmx management integration Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-10-26 08:45:36 UTC (rev 11011) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-10-26 08:59:56 UTC (rev 11012) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.net.URL; import javax.management.ObjectName; @@ -37,6 +38,8 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.management.InstrumentationManager; +import org.apache.cxf.management.counters.CounterRepository; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.servlet.CXFServlet; import org.apache.cxf.transport.servlet.ServletController; @@ -53,6 +56,7 @@ import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer; +import org.jbossws.wsf.stack.cxf.management.InstrumentationManagerExtImpl; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; @@ -67,6 +71,7 @@ public class CXFServletExt extends CXFServlet { public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; + public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management"; private static Logger log = Logger.getLogger(CXFServletExt.class); @@ -79,7 +84,7 @@ { super.init(servletConfig); } - + @Override public ServletController createServletController(ServletConfig servletConfig) { @@ -96,6 +101,12 @@ ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT"); Bus bus = getBus(); + + //register the InstrumentManagementImpl + if (svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT) != null && "true".equalsIgnoreCase((String)svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT))) { + registerInstrumentManger(bus); + } + //Install our SoapTransportFactory to allow for proper soap address rewrite DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class); SoapTransportFactory factory = new SoapTransportFactoryExt(); @@ -105,11 +116,11 @@ //Init the Endpoint initEndpoint(servletConfig); - + //Load additional configurations loadAdditionalConfigExt(appCtx, servletConfig); } - + private void initEndpoint(ServletConfig servletConfig) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); @@ -118,17 +129,17 @@ ServletContext context = servletConfig.getServletContext(); String contextPath = context.getContextPath(); endpoint = initServiceEndpoint(contextPath); - + context.setAttribute(ServletController.class.getName(), getController()); } - + private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException { //Add extension to configure server beans according to JBossWS customizations JBossWSCXFConfigurer jbosswsConfigurer = new JBossWSCXFConfigurer(bus.getExtension(Configurer.class)); jbosswsConfigurer.setBindingCustomization(endpoint.getAttachment(BindingCustomization.class)); bus.setExtension(jbosswsConfigurer, Configurer.class); - + //Load configuration String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); if (location != null) @@ -151,7 +162,7 @@ childCtx.refresh(); } } - + @Override protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException { @@ -211,4 +222,29 @@ return endpoint; } + + private void registerInstrumentManger(Bus bus) throws ServletException + { + InstrumentationManagerExtImpl instrumentationManagerImpl = new InstrumentationManagerExtImpl(); + instrumentationManagerImpl.setBus(bus); + instrumentationManagerImpl.setEnabled(true); + instrumentationManagerImpl.initMBeanServer(); + instrumentationManagerImpl.register(); + bus.setExtension(instrumentationManagerImpl, InstrumentationManager.class); + + //attach couterRepository + CounterRepository couterRepository = new CounterRepository(); + couterRepository.setBus(bus); + + try + { + Method method = CounterRepository.class.getDeclaredMethod("registerInterceptorsToBus", new Class[] {}); + method.setAccessible(true); + method.invoke(couterRepository, new Object[] {}); + } + catch (Exception e) + { + throw new ServletException(e); + } + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-10-26 08:45:36 UTC (rev 11011) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-10-26 08:59:56 UTC (rev 11012) @@ -8,103 +8,95 @@ <project> - <description>JBossWS test archive builder</description> + <description>JBossWS test archive builder</description> - <!-- ============================================================================== --> - <!-- Building --> - <!-- --> - <!-- Where to create your tests --> - <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> - <!-- --> - <!-- ============================================================================== --> + <!-- ============================================================================== --> + <!-- Building --> + <!-- --> + <!-- Where to create your tests --> + <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> + <!-- --> + <!-- ============================================================================== --> - <target name="build-jars-jaxws" description="Build the deployments."> + <target name="build-jars-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/test-libs"/> + <mkdir dir="${tests.output.dir}/test-libs" /> - <!-- jaxws-aegis --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-aegis.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQueryImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <war - warfile="${tests.output.dir}/test-libs/jaxws-aegis-annotation.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/> - </classes> - </war> + <!-- jaxws-aegis --> + <war warfile="${tests.output.dir}/test-libs/jaxws-aegis.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQueryImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/"> + <include name="jbossws-cxf.xml" /> + </webinf> + </war> - <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-aegis-annotation.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class" /> + </classes> + </war> - <!-- jaxws-cxf-interop-wstrust10-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - - <!-- jaxws-cxf-jaxbintros --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jaxbintros/META-INF"> - <include name="**/*" /> - </metainf> - </jar> + <!-- jaxws-cxf-descriptor --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml" /> + </webinf> + </war> - <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> + <!-- jaxws-cxf-interop-wstrust10-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <include name="**/*" /> + </metainf> + </jar> - <!-- jaxws-cxf-wsrm-basic-rpc --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> + <!-- jaxws-cxf-management --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/management/HelloWorld.class"/> + </classes> + </war> + + <!-- jaxws-cxf-wsrm-basic-doc --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <include name="jbossws-cxf.xml" /> + </webinf> + </war> - <!-- jaxws-cxf-wsrm-basic-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/"> - <include name="cxf.xml" /> - </metainf> - </jar> - <!-- Please add alphabetically --> + <!-- jaxws-cxf-wsrm-basic-rpc --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml" /> + </webinf> + </war> - </target> + <!-- jaxws-cxf-wsrm-basic-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/"> + <include name="cxf.xml" /> + </metainf> + </jar> + <!-- Please add alphabetically --> + </target> + </project> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2009-10-26 08:59:56 UTC (rev 11012) @@ -0,0 +1,29 @@ +package org.jboss.test.ws.jaxws.cxf.management; + +import java.util.Set; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.InitialContext; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class CXFManagementTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(CXFManagementTestCase.class, "jaxws-cxf-management.war"); + } + + public void testJMXBean() throws Exception { + InitialContext context = new InitialContext(); + MBeanServerConnection server = (MBeanServerConnection)context.lookup("jmx/invoker/RMIAdaptor"); + ObjectName name = new ObjectName("org.apache.cxf:*"); + Set cxfBeans = server.queryMBeans(name, null); + assertTrue(cxfBeans.size() > 0); + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorld.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorld.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorld.java 2009-10-26 08:59:56 UTC (rev 11012) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.management; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/management") +public interface HelloWorld +{ + String echo(String input); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.java 2009-10-26 08:59:56 UTC (rev 11012) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.management; + +import javax.jws.WebService; + +@WebService +( + serviceName = "HelloWorldService", + endpointInterface = "org.jboss.test.ws.jaxws.cxf.management.HelloWorld", + targetNamespace = "http://org.jboss.ws/jaxws/cxf/management" +) +public class HelloWorldImpl implements HelloWorld +{ + public String echo(String input) + { + return input; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/management/WEB-INF/web.xml 2009-10-26 08:59:56 UTC (rev 11012) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + <context-param> + <param-name>enable.cxf.management</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>HelloWorldService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.management.HelloWorldImpl</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>HelloWorldService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +