Author: alessio.soldano(a)jboss.com Date: 2010-08-06 15:56:22 -0400 (Fri, 06 Aug 2010) New Revision: 12757 Removed: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml Log: svn merge -r 12754:12755 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk . Deleted: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 18:14:15 UTC (rev 12756) +++ stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 19:56:22 UTC (rev 12757) @@ -1,81 +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. ---> -<extensions xmlns="http://cxf.apache.org/bus/extension"> - <!-- <extension class="org.apache.cxf.binding.BindingFactoryManagerImpl"--> - <!-- interface="org.apache.cxf.binding.BindingFactoryManager"/>--> - <!-- <extension class="org.apache.cxf.transport.DestinationFactoryManagerImpl"--> - <!-- interface="org.apache.cxf.transport.DestinationFactoryManager"/>--> - <!-- <extension class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"--> - <!-- interface="org.apache.cxf.transport.ConduitInitiatorManager"/>--> - <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.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> - <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> - <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> - </extension> - <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" 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.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" /> - <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false"> - <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.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.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://cxf.apache.org/binding/object/</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> -</extensions> - Deleted: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 18:14:15 UTC (rev 12756) +++ stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 19:56:22 UTC (rev 12757) @@ -1,37 +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. ---> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> - <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.ws.addressing-1">javax.wsdl.Binding=org.apache.cxf.ws.addressing.wsdl.UsingAddressing</entry> - <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.apache.cxf.wsdl.http.AddressType</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> - <entry key="org.apache.cxf.transport.jms-4">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientConfig</entry> - <entry key="org.apache.cxf.transport.jms-5">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerConfig</entry> - <entry key="org.apache.cxf.transport.jms-6">javax.wsdl.Port=org.apache.cxf.transport.jms.SessionPoolType</entry> -</properties> -