Author: alessio.soldano(a)jboss.com Date: 2010-05-14 06:04:52 -0400 (Fri, 14 May 2010) New Revision: 12234 Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml Log: [JBPAPP-4194] Removing cxf jaxrs from EAP branch Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -66,10 +66,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -81,8 +81,5 @@ <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.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://apache.org/cxf/binding/jaxrs</namespace> - </extension> </extensions> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -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. ---> - -<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"> - - <bean class="org.apache.cxf.jaxrs.JAXRSBindingFactory" - id="org.apache.cxf.jaxrs.JAXRSBindingFactory" - lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://apache.org/cxf/binding/jaxrs</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> -</beans> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-14 10:04:52 UTC (rev 12234) @@ -11,7 +11,6 @@ META-INF/cxf/cxf-extension-jms.xml META-INF/cxf/cxf-extension-object-binding.xml META-INF/cxf/cxf-extension-http-binding.xml -META-INF/cxf/cxf-extension-jaxrs-binding.xml META-INF/cxf/cxf-extension-ws-security.xml META-INF/cxf/cxf-extension-policy.xml META-INF/cxf/cxf-extension-rm.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -52,10 +52,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> </dependency> <dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -81,8 +81,5 @@ <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.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://apache.org/cxf/binding/jaxrs</namespace> - </extension> </extensions> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -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. ---> - -<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"> - - <bean class="org.apache.cxf.jaxrs.JAXRSBindingFactory" - id="org.apache.cxf.jaxrs.JAXRSBindingFactory" - lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://apache.org/cxf/binding/jaxrs</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> -</beans> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2010-05-14 10:04:52 UTC (rev 12234) @@ -11,7 +11,6 @@ META-INF/cxf/cxf-extension-jms.xml META-INF/cxf/cxf-extension-object-binding.xml META-INF/cxf/cxf-extension-http-binding.xml -META-INF/cxf/cxf-extension-jaxrs-binding.xml META-INF/cxf/cxf-extension-ws-security.xml META-INF/cxf/cxf-extension-policy.xml META-INF/cxf/cxf-extension-rm.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 10:04:52 UTC (rev 12234) @@ -276,26 +276,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - <!-- Specify the Spring bits we need at the version we need later --> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> </dependency>