Author: jim.ma Date: 2010-05-19 23:17:02 -0400 (Wed, 19 May 2010) New Revision: 12283 Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml stack/cxf/branches/jms-integration/modules/management/pom.xml stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf stack/cxf/branches/jms-integration/modules/server/pom.xml stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java stack/cxf/branches/jms-integration/modules/testsuite/pom.xml stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt stack/cxf/branches/jms-integration/pom.xml stack/cxf/branches/jms-integration/profiles.xml.example stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2791]:Add the JMSEndpointDeploymentDA dnd JMSEndpointDeploymentRegistryDA to deploy and registry the jms endpoints; Synched code with trunk Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -97,7 +97,7 @@ Bus bus; //Reset bus before constructing Service - BusFactory.setThreadDefaultBus(null); + BusFactory.setDefaultBus(null); URL cxfConfig = getCXFConfiguration(serviceRef.getVfsRoot()); if (cxfConfig != null) { Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -185,11 +185,16 @@ { try { - Class serviceClass = loader.loadClass(serviceImplClass); + Class<?> serviceClass = loader.loadClass(serviceImplClass); if (serviceClass.getAnnotation(WebServiceClient.class) != null) { WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); + //use the @WebServiceClien(wsdlLocation=...) if the service ref wsdl location returned at this time would be null + if (clientDecl.wsdlLocation().length() > 0 && serviceRef.getWsdlLocation() == null) + { + serviceRef.setWsdlOverride(clientDecl.wsdlLocation()); + } } } catch (ClassNotFoundException e) Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -22,16 +22,24 @@ package org.jboss.wsf.stack.cxf.client; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; +import javax.xml.namespace.QName; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.soap.MTOMFeature; + import org.apache.cxf.configuration.Configurer; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; +import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean; +import org.jboss.logging.Logger; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; /** - * A CXF configurer that sets the serviceref stub properties in the JaxWsProxyFactoryBean + * A CXF configurer that sets the serviceref data in the JaxWsProxyFactoryBean * * @author alessio.soldano(a)jboss.com * @since 21-Jul-2009 @@ -49,10 +57,6 @@ public void configureBean(Object beanInstance) { - if (beanInstance instanceof JaxWsProxyFactoryBean) - { - configureJaxWsProxyFactoryBean((JaxWsProxyFactoryBean)beanInstance); - } if (delegate != null) { delegate.configureBean(beanInstance); @@ -61,9 +65,19 @@ public void configureBean(String name, Object beanInstance) { - if (beanInstance instanceof JaxWsProxyFactoryBean) + if (name != null && beanInstance instanceof JaxWsProxyFactoryBean) { - configureJaxWsProxyFactoryBean((JaxWsProxyFactoryBean)beanInstance); + QName portQName = null; + try + { + String portName = name.substring(0, name.indexOf(".jaxws-client.proxyFactory")); + portQName = QName.valueOf(portName); + } + catch (Exception e) + { + Logger.getLogger(this.getClass()).warn("Unable to retrieve port QName from '" + name + "', trying matching port using endpoint interface name only."); + } + configureJaxWsProxyFactoryBean(portQName, (JaxWsProxyFactoryBean)beanInstance); } if (delegate != null) { @@ -71,21 +85,43 @@ } } - private synchronized void configureJaxWsProxyFactoryBean(JaxWsProxyFactoryBean proxyFactory) + private synchronized void configureJaxWsProxyFactoryBean(QName portQName, JaxWsProxyFactoryBean proxyFactory) { - Map<String, Object> properties = new HashMap<String, Object>(); - for (UnifiedPortComponentRefMetaData pcRef : serviceRefMD.getPortComponentRefs()) + Class<?> clazz = proxyFactory.getServiceClass(); + UnifiedPortComponentRefMetaData upcmd = serviceRefMD.getPortComponentRef(clazz != null ? clazz.getName() : null, portQName); + if (upcmd != null) { - String sei = pcRef.getServiceEndpointInterface(); - if (sei != null && sei.equals(proxyFactory.getServiceClass().getName())) + setProperties(proxyFactory, upcmd); + setMTOM((JaxWsServiceFactoryBean)proxyFactory.getServiceFactory(), upcmd); + } + } + + private void setMTOM(JaxWsServiceFactoryBean serviceFactoryBean, UnifiedPortComponentRefMetaData upcmd) + { + if (upcmd.getEnableMTOM()) + { + List<WebServiceFeature> features = new LinkedList<WebServiceFeature>(); + List<WebServiceFeature> prevFeatures = serviceFactoryBean.getWsFeatures(); + if (prevFeatures != null) { - for (UnifiedStubPropertyMetaData prop : pcRef.getStubProperties()) - { - properties.put(prop.getPropName(), prop.getPropValue()); - } + features.addAll(prevFeatures); } + features.add(new MTOMFeature(true)); + serviceFactoryBean.setWsFeatures(features); } - proxyFactory.setProperties(properties); } - + + private void setProperties(JaxWsProxyFactoryBean proxyFactory, UnifiedPortComponentRefMetaData upcmd) + { + Map<String, Object> properties = proxyFactory.getProperties(); + if (properties == null) + { + properties = new HashMap<String, Object>(); + proxyFactory.setProperties(properties); + } + for (UnifiedStubPropertyMetaData prop : upcmd.getStubProperties()) + { + properties.put(prop.getPropName(), prop.getPropValue()); + } + } } Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -22,11 +22,13 @@ package org.jboss.wsf.stack.cxf.client.configuration; import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; +import org.apache.cxf.transport.http.HTTPConduit; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.binding.JAXBBindingCustomization; @@ -36,42 +38,22 @@ * @author alessio.soldano(a)jboss.com * @since 05-Oct-2009 */ -public class JBossWSCXFConfigurer implements Configurer +public class JBossWSCXFConfigurer extends DelegatingConfigurer { protected BindingCustomization customization; - private Configurer delegate; public JBossWSCXFConfigurer(Configurer delegate) { - this.delegate = delegate; + super(delegate); } public JBossWSCXFConfigurer(Configurer delegate, BindingCustomization customization) { - this(delegate); + super(delegate); this.customization = customization; } @Override - public void configureBean(Object beanInstance) - { - internalConfigure(beanInstance); - if (delegate != null) - { - delegate.configureBean(beanInstance); - } - } - - @Override - public void configureBean(String name, Object beanInstance) - { - internalConfigure(beanInstance); - if (delegate != null) - { - delegate.configureBean(name, beanInstance); - } - } - protected void internalConfigure(Object beanInstance) { if (beanInstance instanceof AbstractWSDLBasedEndpointFactory) @@ -82,6 +64,10 @@ { configureClientProxyFactoryBean((ClientProxyFactoryBean)beanInstance); } + else if (beanInstance instanceof HTTPConduit) + { + configureHTTPConduit((HTTPConduit)beanInstance); + } //add other beans configuration here below } @@ -92,6 +78,26 @@ */ protected synchronized void configureEndpointFactory(AbstractWSDLBasedEndpointFactory factory) { + //Configure binding customization + if (customization != null) + { + ReflectionServiceFactoryBean serviceFactory = factory.getServiceFactory(); + //customize default databinding (early pulls in ServiceFactory default databinding and configure it, as it's lazily loaded) + serviceFactory.reset(); + DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true); + setBindingCustomization(serviceFactoryDataBinding, customization); + serviceFactory.setDataBinding(serviceFactoryDataBinding); + //customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one) + if (factory.getDataBinding() == null) + { + //set the endpoint factory's databinding to prevent CXF resetting everything because user did not provide anything + factory.setDataBinding(serviceFactoryDataBinding); + } + else + { + setBindingCustomization(factory.getDataBinding(), customization); + } + } //add other configurations here below } @@ -125,6 +131,27 @@ //add other configurations here below } + /** + * Configure the HTTPConduit; currently allows for setting disableCNcheck in TLS client parameters according + * to the JBoss' org.jboss.security.ignoreHttpsHost system property. + * + * @param conduit + */ + protected synchronized void configureHTTPConduit(HTTPConduit conduit) + { + TLSClientParameters parameters = conduit.getTlsClientParameters(); + if (parameters == null) //don't do anything when user already provided a configuration + { + parameters = new TLSClientParameters(); + parameters.setUseHttpsURLConnectionDefaultSslSocketFactory(true); + if (Boolean.getBoolean("org.jboss.security.ignoreHttpsHost")) + { + parameters.setDisableCNCheck(true); + } + conduit.setTlsClientParameters(parameters); + } + } + @SuppressWarnings("unchecked") protected static void setBindingCustomization(DataBinding db, BindingCustomization customization) { Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -1,6 +1,10 @@ <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + <bean id="clientConfigurerInstaller" class="org.jboss.wsf.stack.cxf.client.configuration.ConfigurerInstaller"> + <property name="bus" ref="cxf"/> + </bean> + <!-- <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -19,7 +19,7 @@ --> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties version="1.0"> +<properties> <entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry> <entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry> <entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry> Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -19,7 +19,7 @@ --> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties version="1.0"> +<properties> <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry> <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry> <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -19,7 +19,7 @@ --> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties version="1.0"> +<properties> <entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry> <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> Modified: stack/cxf/branches/jms-integration/modules/management/pom.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/management/pom.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/management/pom.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M2</artifactId> + <artifactId>jbossws-jboss600M3</artifactId> <scope>provided</scope> </dependency> <!-- [JBWS-2505] --> @@ -87,14 +87,45 @@ </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp</directory> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <executions> + <execution> + <id>console</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <warName>jbossws-cxf-management</warName> + <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory> + <webappDirectory>${project.build.directory}/jbossws-cxf-management</webappDirectory> + <webResources> + <webResource> + <directory>${basedir}/src/main/webapp</directory> + <filtering>true</filtering> + </webResource> + </webResources> + </configuration> + </execution> + <execution> + <id>pcl</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <warName>jbossws-cxf-management-pcl</warName> + <warSourceDirectory>${basedir}/src/main/pclwebapp</warSourceDirectory> + <webappDirectory>${project.build.directory}/jbossws-cxf-management-pcl</webappDirectory> + <webResources> + <webResource> + <directory>${basedir}/src/main/pclwebapp</directory> + <filtering>true</filtering> + </webResource> + </webResources> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf =================================================================== --- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l! ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.ja! r server/all/deployers/jbossws.deployer/wscommons-policy.jar s! erver/al l/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/! lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployer! s/jbossws.deployer/wscommons-policy.jar server/all/deployers/j! bossws.d eployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l! ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/! default/deployers/jbossws.deployer/wscommons-policy.jar server! /default /deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/! lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbo! ssws.deployer/wscommons-policy.jar server/default/deployers/jb! ossws.de ployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -231,6 +231,23 @@ </macrodef> <!-- ================================================================== --> + <!-- Deploy JBossWS Console + PortComponentLink servlet --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-jaxrpc-deployment"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest="@{targetdir}"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-management-pcl.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy Deployers --> <!-- ================================================================== --> @@ -273,7 +290,7 @@ <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> <sequential> <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}"> + <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer"> <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> @@ -308,7 +325,7 @@ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-jaxrpc-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf =================================================================== --- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l! ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.j! ar server/standard/deployers/jbossws.deployer/policy.jar serve! r/standa rd/deployers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/! lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/de! ployers/jbossws.deployer/policy.jar server/standard/deployers/! jbossws. deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/cxf/branches/jms-integration/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/server/pom.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/pom.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -229,17 +229,17 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> </artifactItem> - <!-- JBWS-2505 --> - <!-- START --> - <!-- <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> + <artifactId>jbossws-jboss600M3</artifactId> + <version>${jbossws.jboss600M3.version}</version> <classifier>resources</classifier> <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> </artifactItem> + <!-- JBWS-2505 --> + <!-- START --> + <!-- <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -49,7 +49,7 @@ import org.springframework.core.io.InputStreamResource; /** - * An wrapper of the Bus for performing most of the configurations required on it by JBossWS + * A wrapper of the Bus for performing most of the configurations required on it by JBossWS * * @author alessio.soldano(a)jboss.com * @since 25-Mar-2010 @@ -110,7 +110,7 @@ * @param configurer The JBossWSCXFConfigurer to install in the bus, if any * @throws IOException Throws IOException if the jboss-cxf.xml file can't be read */ - public void configure(URL jbossCxfXml, SoapTransportFactory soapTransportFactory, ResourceResolver resolver, JBossWSCXFConfigurer configurer) throws IOException + public void configure(URL jbossCxfXml, SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer) throws IOException { if (configured) { @@ -130,17 +130,19 @@ } /** - * A convenient method for getting a jbossws cxf configurer delegating to the cxf configurer - * that's currently installed in the hold bus. + * A convenient method for getting a jbossws cxf server configurer delegating to the + * cxf configurer that's currently installed in the hold bus. * * @param customization The binding customization to set in the configurer, if any * @param wsdlPublisher The wsdl file publisher to set in the configurer, if any * @return The new jbossws cxf configurer */ - public JBossWSCXFConfigurer createConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher) + public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher) { - Configurer delegate = bus.getExtension(Configurer.class); - return new JBossWSServerCXFConfigurer(delegate, customization, wsdlPublisher); + //the JBossWSCXFConfigurer should already be set through cxf-extensions-jbossws.xml + JBossWSCXFConfigurer delegate = (JBossWSCXFConfigurer)bus.getExtension(Configurer.class); + delegate.setBindingCustomization(customization); + return new JBossWSServerCXFConfigurer(delegate, wsdlPublisher); } /** Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -22,21 +22,17 @@ package org.jboss.wsf.stack.cxf.configuration; import org.apache.cxf.configuration.Configurer; -import org.apache.cxf.databinding.DataBinding; -import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory; -import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; -import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer; +import org.jboss.wsf.stack.cxf.client.configuration.DelegatingConfigurer; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; /** - * A JBossWSCXFConfigured to be used on server side + * A JBossWS CXF Configurer to be used on server side * * @author alessio.soldano(a)jboss.com * @since 31-Mar-2010 */ -public class JBossWSServerCXFConfigurer extends JBossWSCXFConfigurer +public class JBossWSServerCXFConfigurer extends DelegatingConfigurer { private WSDLFilePublisher wsdlPublisher; @@ -45,48 +41,21 @@ super(delegate); } - public JBossWSServerCXFConfigurer(Configurer delegate, BindingCustomization customization, WSDLFilePublisher wsdlPublisher) + public JBossWSServerCXFConfigurer(Configurer delegate, WSDLFilePublisher wsdlPublisher) { - super(delegate, customization); + super(delegate); this.wsdlPublisher = wsdlPublisher; } @Override protected void internalConfigure(Object beanInstance) { - super.internalConfigure(beanInstance); if (beanInstance instanceof EndpointImpl) { configureEndpoint((EndpointImpl)beanInstance); } } - @Override - protected synchronized void configureEndpointFactory(AbstractWSDLBasedEndpointFactory factory) - { - //Configure binding customization - if (customization != null) - { - ReflectionServiceFactoryBean serviceFactory = factory.getServiceFactory(); - //customize default databinding (early pulls in ServiceFactory default databinding and configure it, as it's lazily loaded) - serviceFactory.reset(); - DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true); - setBindingCustomization(serviceFactoryDataBinding, customization); - serviceFactory.setDataBinding(serviceFactoryDataBinding); - //customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one) - if (factory.getDataBinding() == null) - { - //set the endpoint factory's databinding to prevent CXF resetting everything because user did not provide anything - factory.setDataBinding(serviceFactoryDataBinding); - } - else - { - setBindingCustomization(factory.getDataBinding(), customization); - } - } - //add other configurations here below - } - protected synchronized void configureEndpoint(EndpointImpl endpoint) { //Configure wsdl file publisher Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.cxf.BusFactory; +import org.apache.cxf.configuration.Configurer; import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSConstants; import org.jboss.wsf.spi.binding.BindingCustomization; @@ -33,7 +34,6 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.ResourceResolver; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.resolver.JBossWSResourceResolver; @@ -77,7 +77,7 @@ { URL jbossCxfXml = deploymentResolver.resolve(contextParams.get(BusHolder.PARAM_CXF_BEANS_URL)); org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver); - JBossWSCXFConfigurer configurer = holder.createConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep)); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep)); holder.configure(jbossCxfXml, new SoapTransportFactoryExt(), resolver, configurer); } catch (IOException e) Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -26,20 +26,15 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.ws.BindingType; -import javax.xml.ws.soap.MTOM; -import javax.xml.ws.soap.SOAPBinding; - import org.jboss.logging.Logger; import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSConstants; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.cxf.configuration.BusHolder; +import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; -import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; /** * A deployer that locates or generates cxf.xml @@ -160,34 +155,9 @@ private URL generateCXFConfigFromDeployment(Deployment dep) { // Generate the jbossws-cxf.xml descriptor - DeploymentType depType = dep.getType(); - - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String id = ep.getShortName(); - String address = ep.getAddress(); - String implementor = ep.getTargetBeanName(); + MetadataBuilder builder = new MetadataBuilder(); + DDBeans dd = builder.build(dep, invokerEJB3, invokerJSE); - boolean mtomEnabled = isMtomEnabled(ep.getTargetBeanClass()); - - DDEndpoint ddep = new DDEndpoint(id, address, implementor, mtomEnabled); - - if (depType == DeploymentType.JAXWS_EJB3) - { - ddep.setInvoker(invokerEJB3); - } - - if (depType == DeploymentType.JAXWS_JSE) - { - ddep.setInvoker(invokerJSE); - } - - - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } - URL cxfURL = dd.createFileURL(); log.info("JBossWS-CXF configuration generated: " + cxfURL); @@ -218,19 +188,4 @@ contextParams.put(BusHolder.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); } - private static boolean isMtomEnabled(Class<?> beanClass) - { - BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class); - MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class); - - boolean mtomEnabled = mtom != null; - if (!mtomEnabled && bindingType != null) - { - String binding = bindingType.value(); - mtomEnabled = binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING); - } - - return mtomEnabled; - } - } Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -24,57 +24,148 @@ import java.io.IOException; import java.io.Writer; +import javax.xml.namespace.QName; + /** * Metadata model for cxf.xml * * @author Thomas.Diesler(a)jboss.org * @author ropalka(a)redhat.com + * @author alessio.soldano(a)jboss.com */ public class DDEndpoint { + //fields mapped to jboss-cxf.xml private String id; + private String address; + private String implementor; + private String invoker; - private String transportId; - + private boolean mtomEnabled; - public DDEndpoint(String id, String address, String implementor, boolean mtomEnabled) + private String wsdlLocation; + + private QName portName; + + private QName serviceName; + + //additional fields + private Class<?> epClass; + + private int counter = 0; + + public QName getPortName() { + return portName; + } + + public void setPortName(QName portName) + { + this.portName = portName; + } + + public QName getServiceName() + { + return serviceName; + } + + public void setServiceName(QName serviceName) + { + this.serviceName = serviceName; + } + + public String getId() + { + return id; + } + + public void setId(String id) + { this.id = id; + } + + public String getAddress() + { + return address; + } + + public void setAddress(String address) + { this.address = address; - this.implementor = implementor; - this.mtomEnabled = mtomEnabled; } - - public DDEndpoint(String id, String implementor) + + public String getImplementor() { - this.id = id; + return implementor; + } + + public void setImplementor(String implementor) + { this.implementor = implementor; } + public String getWsdlLocation() + { + return wsdlLocation; + } + + public void setWsdlLocation(String wsdlLocation) + { + this.wsdlLocation = wsdlLocation; + } + + public Class<?> getEpClass() + { + return epClass; + } + + public void setEpClass(Class<?> epClass) + { + this.epClass = epClass; + } + + public String getInvoker() + { + return invoker; + } + + public boolean isMtomEnabled() + { + return mtomEnabled; + } + public void setInvoker(String invoker) { this.invoker = invoker; } - + + public void setMtomEnabled(boolean mtomEnabled) + { + this.mtomEnabled = mtomEnabled; + } + public void writeTo(Writer writer) throws IOException { writer.write("<jaxws:endpoint id='" + this.id + "'"); - if (address != null) + writer.write(" address='" + this.address + "'"); + writer.write(" implementor='" + this.implementor + "'"); + if (this.serviceName != null) { - writer.write(" address='" + this.address + "'"); + this.writeQNameElementTo("serviceName", this.serviceName, writer); } - writer.write(" implementor='" + this.implementor + "'"); - - if (transportId != null) + if (this.portName != null) { - writer.write(" transportId='" + this.transportId + "'"); + this.writeQNameElementTo("endpointName", this.portName, writer); } - + if (this.wsdlLocation != null) + { + writer.write(" wsdlLocation='" + this.wsdlLocation + "'"); + } writer.write(">"); - + if (this.mtomEnabled) { writer.write("<jaxws:binding>"); @@ -86,16 +177,17 @@ { writer.write("<jaxws:invoker><bean class='" + this.invoker + "'/></jaxws:invoker>"); } - + writer.write("</jaxws:endpoint>"); } - - public void setTransportId(String transportId) + private void writeQNameElementTo(String elementName, QName qname, Writer writer) throws IOException { - this.transportId = transportId; + String prefix = "ns" + counter++; + writer.write(" " + elementName + "='" + prefix + ":" + qname.getLocalPart() + "'"); + writer.write(" xmlns:" + prefix + "='" + qname.getNamespaceURI() + "'"); } - + public String toString() { StringBuilder str = new StringBuilder("Service"); @@ -103,8 +195,10 @@ str.append("\n address=" + this.address); str.append("\n implementor=" + this.implementor); str.append("\n invoker=" + this.invoker); + str.append("\n serviceName=" + this.serviceName); + str.append("\n portName=" + this.portName); + str.append("\n wsdlLocation=" + this.wsdlLocation); str.append("\n mtomEnabled=" + this.mtomEnabled); - str.append("\n transportId=" + this.transportId); return str.toString(); } } Modified: stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -45,14 +45,6 @@ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> <property name="forJaxRpc">false</property> </bean> - - <bean name="EndpointsDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.EndpointsDescriptorDeploymentAspect"> - <property name="requires">EndpointAddress,JAXBIntros</property> - <property name="provides">StackDescriptor</property> - <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround --> - <property name="forJaxRpc">false</property> - </bean> - <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> <property name="requires">JmsEndpointAddress</property> @@ -89,5 +81,18 @@ <property name="requires">ResourceResolver,StackDescriptor</property> <property name="forJaxRpc">false</property> </bean> + + <!---JMSEndpoints Deployment Aspect--> + <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect"> + <property name="provides">BusHolder</property> + <property name="forJaxRpc">false</property> + </bean> + + <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect"> + <property name="requires">BusHolder</property> + <property name="forJaxRpc">false</property> + </bean> + + -</deployment> +</deployment> \ No newline at end of file Modified: stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -35,9 +35,14 @@ file="${src.dir}/jbossws-cxf-config-as6.xml" tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> - + <copy file="${src.dir}/jbossws-jaxrpc-config-as6.xml" + tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-jaxrpc-config-as6.xml" tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> Modified: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-05-20 03:17:02 UTC (rev 12283) @@ -54,14 +54,13 @@ private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jaxbintros/EndpointService"; private Bus bus; - private Configurer originalConfigurer; + private JBossWSCXFConfigurer configurer; public static Test suite() { return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-cxf-jaxbintros.jar"); } - @SuppressWarnings("unchecked") public void testWSDLAccess() throws Exception { URL wsdlURL = new URL(endpointAddress + "?wsdl"); @@ -105,7 +104,7 @@ } finally { - restoreConfigurer(); + unsetBindingCustomizationOnClientSide(); } } @@ -135,22 +134,20 @@ * * @throws Exception */ + @SuppressWarnings("unchecked") private void setBindingCustomizationOnClientSide() throws Exception { BindingCustomization jaxbCustomizations = new JAXBBindingCustomization(); BindingCustomizationFactory.populateBindingCustomization(getResourceURL("jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml").openStream(), jaxbCustomizations); bus = BusFactory.getThreadDefaultBus(); - originalConfigurer = bus.getExtension(Configurer.class); - JBossWSCXFConfigurer configurer = new JBossWSCXFConfigurer(originalConfigurer); + configurer = (JBossWSCXFConfigurer)bus.getExtension(Configurer.class); configurer.setBindingCustomization(jaxbCustomizations); - bus.setExtension(configurer, Configurer.class); - } - - private void restoreConfigurer() + + private void unsetBindingCustomizationOnClientSide() { - bus.setExtension(originalConfigurer, Configurer.class); + if (configurer != null) + configurer.setBindingCustomization(null); } - } Modified: stack/cxf/branches/jms-integration/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/pom.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/pom.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -26,7 +26,7 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <asm.version>2.2.3</asm.version> - <hornetq.version>2.1.0.BETA1</hornetq.version> + <hornetq.version>2.1.0.BETA3</hornetq.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> @@ -442,7 +442,7 @@ <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20100216-M2</jboss.version> + <jboss.version>6.0.0.20100429-M3</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -453,14 +453,54 @@ </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-aspects</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-security</artifactId> <version>${jboss.version}</version> </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-client</artifactId> + <version>${hornetq.version}</version> + </dependency> </dependencies> <build> <plugins> @@ -553,11 +593,6 @@ </dependency> <dependency> <groupId>org.hornetq</groupId> - <artifactId>hornetq-transports</artifactId> - <version>${hornetq.version}</version> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> <artifactId>hornetq-jms-client</artifactId> <version>${hornetq.version}</version> </dependency> Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt 2010-05-20 03:17:02 UTC (rev 12283) @@ -57,7 +57,16 @@ # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** +org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/jbws3022/** + +# [JBWS-3020] Investigate why HandlerScopeTestCase fails org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** + +# [JBWS-3002] Verify POJO endpoints are shared +org/jboss/test/ws/jaxws/jbws2486/** + Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt 2010-05-20 03:17:02 UTC (rev 12283) @@ -57,7 +57,16 @@ # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** +org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/jbws3022/** + +# [JBWS-3020] Investigate why HandlerScopeTestCase fails org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** + +# [JBWS-3002] Verify POJO endpoints are shared +org/jboss/test/ws/jaxws/jbws2486/** + Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt 2010-05-20 03:17:02 UTC (rev 12283) @@ -45,19 +45,22 @@ # [JBWS-2397] Fix jbws1797 testcase org/jboss/test/ws/jaxws/jbws1797/** -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** +# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** +org/jboss/test/ws/jaxws/jbws2960/** +org/jboss/test/ws/jaxws/jbws2985/** +org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - -# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/jbws2960/** -org/jboss/test/ws/jaxws/jbws2985/** +# [JBWS-3020] Investigate why HandlerScopeTestCase fails org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** + +# [JBWS-3002] Verify POJO endpoints are shared +org/jboss/test/ws/jaxws/jbws2486/** + Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt 2010-05-20 03:17:02 UTC (rev 12283) @@ -23,9 +23,6 @@ # [CXF-2006] RespectBinding feature and not understood required extensibility elements org/jboss/test/ws/jaxws/jbws2449/** -# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation -org/jboss/test/ws/jaxws/cxf/jaxbintros/** - # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* @@ -50,8 +47,17 @@ org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** +org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* + +# [JBWS-3020] Investigate why HandlerScopeTestCase fails org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** + +# [JBWS-3002] Verify POJO endpoints are shared +org/jboss/test/ws/jaxws/jbws2486/** + Modified: stack/cxf/branches/jms-integration/pom.xml =================================================================== --- stack/cxf/branches/jms-integration/pom.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/pom.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -16,6 +16,7 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> <packaging>pom</packaging> + <description>JBossWS CXF stack</description> <version>3.3.0-SNAPSHOT</version> @@ -23,7 +24,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.4.GA</version> + <version>1.0.6.GA</version> </parent> <!-- Source Control Management --> @@ -48,14 +49,14 @@ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version> + <jbossws.jboss600M3.version>3.3.0-SNAPSHOT</jbossws.jboss600M3.version> <!-- JBWS-2505 --> <!-- START --> <!-- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> --> <!-- END --> - <cxf.version>2.2.6</cxf.version> + <cxf.version>2.2.8</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>2.2.3</cxf.asm.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> @@ -134,13 +135,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M2</artifactId> - <version>${jbossws.jboss600M2.version}</version> + <artifactId>jbossws-jboss600M3</artifactId> + <version>${jbossws.jboss600M3.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M2</artifactId> - <version>${jbossws.jboss600M2.version}</version> + <artifactId>jbossws-jboss600M3</artifactId> + <version>${jbossws.jboss600M3.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -505,24 +506,6 @@ </plugins> </build> - <!-- Repositories --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <!-- Profiles --> <profiles> <!-- Modified: stack/cxf/branches/jms-integration/profiles.xml.example =================================================================== --- stack/cxf/branches/jms-integration/profiles.xml.example 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/profiles.xml.example 2010-05-20 03:17:02 UTC (rev 12283) @@ -13,7 +13,7 @@ <properties> <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2</jboss600.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3</jboss600.home> <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -93,7 +93,7 @@ <target name="deploy-structure-jboss600" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> + <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -122,7 +122,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true" /><!-- [JBWS-2505][JBWS-2895] --> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] --> </target> <!-- ================================================================== --> Modified: stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 03:07:44 UTC (rev 12282) +++ stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 03:17:02 UTC (rev 12283) @@ -129,7 +129,7 @@ <scope>provided</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss600M2:jar</include> + <include>org.jboss.ws:jbossws-jboss600M3:jar</include> </includes> </dependencySet> <!-- [JBWS-2505] --> @@ -172,6 +172,16 @@ <include>jbossws-*/**</include> </includes> </fileSet> + + <!-- management console and port component link servlet --> + <fileSet> + <directory>modules/management/target</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>jbossws-cxf-management.war</include> + <include>jbossws-cxf-management-pcl.war</include> + </includes> + </fileSet> </fileSets> </assembly>