JBossWS SVN: r11014 - in spi: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-27 02:34:49 -0400 (Tue, 27 Oct 2009)
New Revision: 11014
Added:
spi/tags/jbossws-spi-1.2.1.GA/
Removed:
spi/branches/jbossws-spi-1.2.1/
Log:
[JBWS-2794] tagging SPI
Copied: spi/tags/jbossws-spi-1.2.1.GA (from rev 11013, spi/branches/jbossws-spi-1.2.1)
14 years, 11 months
JBossWS SVN: r11012 - in stack/cxf/trunk/modules: testsuite/cxf-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
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#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
+ <!-- ============================================================================== -->
+ <!-- Building -->
+ <!-- -->
+ <!-- Where to create your tests -->
+ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#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>
+
14 years, 12 months
JBossWS SVN: r11011 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-26 04:45:36 -0400 (Mon, 26 Oct 2009)
New Revision: 11011
Modified:
stack/native/trunk/pom.xml
Log:
Testing svn commit while moving to new snapshots
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-10-24 06:36:28 UTC (rev 11010)
+++ stack/native/trunk/pom.xml 2009-10-26 08:45:36 UTC (rev 11011)
@@ -47,9 +47,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.1-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.1-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.2.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.2.1-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.2.1-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.2.1-SNAPSHOT</jbossws.jboss510.version>
14 years, 12 months
JBossWS SVN: r11010 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-24 02:36:28 -0400 (Sat, 24 Oct 2009)
New Revision: 11010
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
Log:
[JBAS-7384] enabling test
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-24 06:35:43 UTC (rev 11009)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-24 06:36:28 UTC (rev 11010)
@@ -7,9 +7,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBAS-7384] EndpointTestCase fails because of beanvalidation deployer
-org/jboss/test/ws/jaxws/endpoint/*TestCase.*
-
# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
org/jboss/test/ws/jaxws/jbws2718/**
14 years, 12 months
JBossWS SVN: r11009 - stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-24 02:35:43 -0400 (Sat, 24 Oct 2009)
New Revision: 11009
Modified:
stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/test-excludes-jboss520.txt
Log:
[JBAS-7384] enabling test
Modified: stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/test-excludes-jboss520.txt 2009-10-23 16:55:15 UTC (rev 11008)
+++ stack/native/branches/jbossws-native-3.2.1.GA/modules/testsuite/test-excludes-jboss520.txt 2009-10-24 06:35:43 UTC (rev 11009)
@@ -7,6 +7,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBAS-7384] EndpointTestCase fails because of beanvalidation deployer
-org/jboss/test/ws/jaxws/endpoint/*TestCase.*
-
14 years, 12 months
JBossWS SVN: r11008 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02: modules/core and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-23 12:55:15 -0400 (Fri, 23 Oct 2009)
New Revision: 11008
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml
Log:
Applied patches for patch-02
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/pom.xml 2009-10-23 16:55:15 UTC (rev 11008)
@@ -47,13 +47,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ <version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-10-23 16:53:59 UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2009-10-23 16:55:15 UTC (rev 11008)
@@ -24,6 +24,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import javax.xml.ws.handler.MessageContext;
@@ -127,7 +128,7 @@
{
super.setOperationMetaData(opMetaData);
- // [JBWS-2031] Implement standard message context properties
+ // [JBWS-2013] Implement standard message context properties
if (opMetaData != null)
{
EndpointMetaData epMetaData = opMetaData.getEndpointMetaData();
@@ -138,14 +139,11 @@
{
try
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, wsdlURL.openStream()); // [JBWS-2325] ensure file descriptors are closed
- InputSource inputSource = new InputSource(new ByteArrayInputStream(baos.toByteArray()));
- put(MessageContext.WSDL_DESCRIPTION, inputSource);
+ put(MessageContext.WSDL_DESCRIPTION, wsdlURL.toURI());
}
- catch (IOException ex)
+ catch (URISyntaxException e)
{
- throw new WSException("Cannot open: " + wsdlURL);
+ log.warn("Cannot get the wsdl url", e);
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23 16:53:59 UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2009-10-23 16:55:15 UTC (rev 11008)
@@ -92,6 +92,7 @@
try
{
cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.DECRYPT_MODE, null);
key = cipher.loadEncryptedKey(element);
}
catch (XMLSecurityException e)
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/modules/jaxws/pom.xml 2009-10-23 16:55:15 UTC (rev 11008)
@@ -24,6 +24,11 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml 2009-10-23 16:53:59 UTC (rev 11007)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02/pom.xml 2009-10-23 16:55:15 UTC (rev 11008)
@@ -56,25 +56,25 @@
<jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
+ <codehaus.jettison.version>1.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <javassist.version>3.6.0.GA</javassist.version>
- <jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.9</jaxb.impl.version>
+ <javassist.version>3.9.0.GA</javassist.version>
+ <jaxb.api.version>2.1.9.patch01</jaxb.api.version>
+ <jaxb.impl.version>2.1.9.patch01</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
- <jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version>
- <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
- <apache.scout.version>0.7rc2</apache.scout.version>
- <juddi.version>0.9RC4</juddi.version>
- <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
+ <jboss.logging.version>2.1.0.GA</jboss.logging.version>
+ <jboss.remoting.version>2.5.1</jboss.remoting.version>
+ <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <apache.scout.version>1.1.1</apache.scout.version>
+ <juddi.version>2.0.1</juddi.version>
+ <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
- <woodstox.version>3.2.6</woodstox.version>
- <wsdl4j.version>1.6.1</wsdl4j.version>
- <xmlsec.version>1.4.2</xmlsec.version>
- <xalan.version>2.7.0</xalan.version>
- <xerces.version>2.8.1</xerces.version>
+ <woodstox.version>3.2.8</woodstox.version>
+ <wsdl4j.version>1.6.2</wsdl4j.version>
+ <xmlsec.version>1.4.3</xmlsec.version>
+ <xalan.version>2.7.1.patch02</xalan.version>
+ <xerces.version>2.9.1</xerces.version>
</properties>
<!-- DependencyManagement -->
@@ -147,6 +147,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -233,6 +238,52 @@
<artifactId>juddi-service</artifactId>
<version>${jboss.jaxr.version}</version>
<type>sar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-saaj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>apache-scout</groupId>
14 years, 12 months