Author: thomas.diesler(a)jboss.com Date: 2007-12-18 07:42:07 -0500 (Tue, 18 Dec 2007) New Revision: 5343 Added: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml stack/cxf/trunk/src/test/etc/log4j.xml stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/ stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/reliable.wsdl Removed: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml Log: More work on WS-RM integration Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -20,17 +20,24 @@ <mkdir dir="${tests.output.dir}/libs"/> + <!-- jaxws-cxf-descriptor --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + <!-- jaxws-cxf-reliable --> <war warfile="${tests.output.dir}/libs/jaxws-cxf-reliable.war" webxml="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.class"/> </classes> - <classes dir="${tests.output.dir}/resources/jaxws/cxf/reliable"> - <include name="cxf.xml"/> - </classes> - <!--webinf dir="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF"> <include name="jbossws-cxf.xml"/> - </webinf--> + </webinf> </war> <!-- Please add alphabetically --> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/build.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -127,11 +127,11 @@ </webinf> </war> - <!-- Update cxf-${cxf.version}.jar --> + <!-- Remove config files from cxf-${cxf.version}.jar --> <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/> <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar"> <fileset dir="${cxf.output.lib.dir}/cxf-${cxf.version}"> - <exclude name="META-INF/cxf/**"/> + <exclude name="META-INF/**"/> </fileset> </jar> @@ -165,8 +165,6 @@ <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="jetty-${cxf.jetty}.jar"/> - <include name="jetty-util-${cxf.jetty}.jar"/> <include name="jdom-${cxf.jdom}.jar"/> <include name="neethi-${cxf.neethi}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> @@ -216,12 +214,9 @@ <include name="jbossws-cxf.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="cxf-${cxf.version}.jar"/> <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="jetty-${cxf.jetty}.jar"/> - <include name="jetty-util-${cxf.jetty}.jar"/> <include name="jdom-${cxf.jdom}.jar"/> <include name="neethi-${cxf.neethi}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> Added: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java (rev 0) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; + +// $Id$ + +import java.io.IOException; +import java.util.logging.Logger; + +import org.apache.cxf.Bus; +import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.http.AbstractHTTPDestination; + +public class TomcatHTTPDestination extends AbstractHTTPDestination +{ + private static final Logger LOG = LogUtils.getL7dLogger(TomcatHTTPDestination.class); + + private TomcatHTTPTransportFactory transportFactory; + + public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException + { + super(b, ci, ei, dp); + this.transportFactory = ci; + } + + @Override + protected Logger getLogger() + { + return LOG; + } + + @Override + public void shutdown() { + transportFactory.removeDestination(endpointInfo); + super.shutdown(); + } +} Property changes on: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java (rev 0) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; + +// $Id$ + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.Destination; +import org.apache.cxf.transport.DestinationFactory; +import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; + +public class TomcatHTTPTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory +{ + private Map<String, TomcatHTTPDestination> destinations = new HashMap<String, TomcatHTTPDestination>(); + + public TomcatHTTPTransportFactory() + { + super(); + } + + public Destination getDestination(EndpointInfo endpointInfo) throws IOException + { + String addr = endpointInfo.getAddress(); + TomcatHTTPDestination destination = destinations.get(addr); + if (destination == null) + { + destination = createDestination(endpointInfo); + } + + return destination; + } + + private synchronized TomcatHTTPDestination createDestination(EndpointInfo endpointInfo) throws IOException + { + + TomcatHTTPDestination destination = destinations.get(endpointInfo.getAddress()); + if (destination == null) + { + destination = new TomcatHTTPDestination(getBus(), this, endpointInfo, true); + + destinations.put(endpointInfo.getAddress(), destination); + + configure(destination); + } + return destination; + } + + /** + * This function removes the destination for a particular endpoint. + */ + void removeDestination(EndpointInfo ei) + { + destinations.remove(ei.getAddress()); + } +} Property changes on: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,10 @@ +Apache CXF is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<extensions xmlns="http://cxf.apache.org/bus/extension"> + <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/binding/object/</namespace> + </extension> + <extension class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + <namespace>http://schemas.xmlsoap.org/soap/http</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> + <namespace>http://cxf.apache.org/transports/http/configuration</name... + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + </extension> + <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://apache.org/cxf/binding/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + <namespace>http://www.w3.org/2004/08/wsdl/http</namespace> + </extension> + <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/> + <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/> + <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/> + <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/> + <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/> + <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/> + <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/> + <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/> + <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/> + <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"> + <namespace>http://cxf.apache.org/transports/jms</namespace> + <namespace>http://cxf.apache.org/transports/jms/configuration</names... + </extension> + <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/> + <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + </extension> +</extensions> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Deleted: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> - - <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" - lazy-init="false" - depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://cxf.apache.org/bindings/xformat</value> - </list> - </property> - </bean> - -</beans> Copied: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml (from rev 5332, stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml) =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/> + + <bean class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" lazy-init="false" depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> + +</beans> \ No newline at end of file Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2007-12-18 12:42:07 UTC (rev 5343) @@ -1,7 +1,7 @@ META-INF/cxf/cxf-extension-jaxws.xml META-INF/cxf/cxf-extension-rm.xml META-INF/cxf/cxf-extension-addr.xml -META-INF/cxf/cxf-extension-http-jetty.xml +META-INF/cxf/cxf-extension-http-tomcat.xml META-INF/cxf/cxf-extension-object-binding.xml META-INF/cxf/cxf-extension-http.xml META-INF/cxf/cxf-extension-http-binding.xml Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> + +<properties version="1.0"> + <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry> + <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry> + <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry> + <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry> + <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry> + <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry> + <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry> +</properties> + Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> +</catalog> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> +</properties> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,2 @@ +org.apache.cxf.xjc.ts.ToStringPlugin +org.apache.cxf.xjc.dv.DefaultValuePlugin Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1 @@ +org.apache.cxf.jaxws.spi.ProviderImpl Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,2 @@ +org.apache.cxf.bus.spring.SpringBusFactory +org.springframework.context.ApplicationContext \ No newline at end of file Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,259 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler +http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler +http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,293 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd +http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd +http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd +http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd +http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd +http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd +http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd +http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd +http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd +http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd +http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd + +http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd + + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> + <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/> + <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> + <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/> + <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/> + <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/> + <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> + <generator name="AntGenerator"/> + <generator name="ClientGenerator"/> + <generator name="FaultGenerator"/> + <generator name="ImplGenerator"/> + <generator name="SEIGenerator"/> + <generator name="ServerGenerator"/> + <generator name="ServiceGenerator"/> + </generators> + </frontend> +</plugin> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <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> + <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> + <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> +</properties> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/etc/log4j.xml =================================================================== --- stack/cxf/trunk/src/test/etc/log4j.xml (rev 0) +++ stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id$ --> + +<!-- +| For more configuration infromation and examples see the Jakarta Log4j +| owebsite: http://jakarta.apache.org/log4j +--> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${build.testlog}/test.log"/> + <param name="Append" value="true"/> + + <!-- Rollover at midnight each day --> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.apache.cxf"> + <priority value="DEBUG"/> + </category> + + <!-- Apache security is verbose --> + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <!--appender-ref ref="CONSOLE"/--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Property changes on: stack/cxf/trunk/src/test/etc/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.descriptor; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the CXF WS-descriptorMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class DescriptorCXFJSETestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-descriptor/TestService"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor"; + + public static Test suite() + { + return new JBossWSTestSetup(DescriptorCXFJSETestCase.class, "jaxws-cxf-descriptor.war"); + } + + public void testLegalAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + QName serviceName = new QName(targetNS, "DescriptorService"); + + Service service = Service.create(wsdlURL, serviceName); + DescriptorEndpoint port = (DescriptorEndpoint)service.getPort(DescriptorEndpoint.class); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.descriptor; + +// $Id$ + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the CXF WS-descriptorMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface DescriptorEndpoint +{ + String echo(String input); +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.descriptor; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the CXF WS-descriptorMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class DescriptorEndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java (from rev 5332, stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java) =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.reliable; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class BasicRMTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-reliable/TestService"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/reliable"; + + public static Test suite() + { + return new JBossWSTestSetup(BasicRMTestCase.class, "jaxws-cxf-reliable.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + + System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); + } + + + public void testBasicRMAccess() throws Exception + { + URL wsdlURL = new File("resources/jaxws/cxf/reliable/reliable.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Deleted: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java 2007-12-18 12:42:07 UTC (rev 5343) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.reliable; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the CXF WS-ReliableMessaging - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Dec-2007 - */ -public class RMTestCase extends JBossWSTest -{ - private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-reliable/TestService"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/reliable"; - - public static Test suite() - { - return new JBossWSTestSetup(RMTestCase.class, "jaxws-cxf-reliable.war"); - } - - public void testLegalAccess() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} \ No newline at end of file Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,16 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor' + implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'> + + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + + </jaxws:endpoint> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,19 @@ +<?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"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -2,17 +2,17 @@ xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <!--wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing> <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> </wsrmp:RMAssertion> - </wsp:Policy--> + </wsp:Policy> <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'> @@ -20,11 +20,11 @@ <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> </jaxws:invoker> - <!--jaxws:features> - <p:policies> + <jaxws:features> + <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> </p:policies> - </jaxws:features--> + </jaxws:features> </jaxws:endpoint> Deleted: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml 2007-12-18 12:01:58 UTC (rev 5342) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml 2007-12-18 12:42:07 UTC (rev 5343) @@ -1,31 +0,0 @@ -<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" - xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> - <wsp:Policy/> - </wsam:Addressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> - <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> - </wsrmp:RMAssertion> - </wsp:Policy> - - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'> - - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - - <jaxws:features> - <p:policies> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - - </jaxws:endpoint> - -</beans> \ No newline at end of file Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/reliable.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/reliable.wsdl (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/reliable.wsdl 2007-12-18 12:42:07 UTC (rev 5343) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/reliable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" + targetNamespace="http://org.jboss.ws.jaxws.cxf/reliable"> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <wsdl:message name="echoResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="arg0" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="RMEndpoint"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="echo"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/reliable" use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/reliable" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="RMService"> + <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> + <soap:address location="http://localhost:8080/jaxws-cxf-reliable"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/reliable.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF