6:24 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2009-05-29 07:24:49 -0400 (Fri, 29 May 2009)
New Revision: 10144
Removed:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-2653] svn merge -r 10142:10143
https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-3.1.2 .
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
---
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29
11:19:47 UTC (rev 10143)
+++
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-05-29
11:24:49 UTC (rev 10144)
@@ -54,16 +54,8 @@
<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">
+ <extension
class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
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>
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
---
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29
11:19:47 UTC (rev 10143)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-05-29
11:24:49 UTC (rev 10144)
@@ -54,16 +54,8 @@
<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">
+ <extension
class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
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>
Deleted:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml
===================================================================
---
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29
11:19:47 UTC (rev 10143)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2009-05-29
11:24:49 UTC (rev 10144)
@@ -1,39 +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.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/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-05-29 11:19:47 UTC (rev 10143)
+++ stack/cxf/trunk/pom.xml 2009-05-29 11:24:49 UTC (rev 10144)
@@ -56,7 +56,7 @@
<jbossws.jboss600.version>3.2.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
- <cxf.version>2.2.2-SNAPSHOT</cxf.version>
+ <cxf.version>2.2.2</cxf.version>
<cxf.anttasks.version>2.1.5</cxf.anttasks.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>