JBossWS SVN: r12324 - stack/native/trunk/modules/core/src/main/resources/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 04:40:02 -0400 (Wed, 26 May 2010)
New Revision: 12324
Modified:
stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml
stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
Log:
[JBWS-3040] standard wssecurity configuration support both SOAP protocols since now
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2010-05-25 17:14:33 UTC (rev 12323)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2010-05-26 08:40:02 UTC (rev 12324)
@@ -47,7 +47,7 @@
<config-name>Standard WSSecurity Client</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2010-05-25 17:14:33 UTC (rev 12323)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2010-05-26 08:40:02 UTC (rev 12324)
@@ -63,7 +63,7 @@
<config-name>Standard WSSecurity Endpoint</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurity Handler</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12323 - in stack/cxf/trunk/modules/client/src/main: resources/META-INF/cxf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 13:14:33 -0400 (Tue, 25 May 2010)
New Revision: 12323
Removed:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
Log:
[JBWS-3033] Modify our configurer to extend the CXF ConfigurerImpl and install it by default using our integration configuration
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java 2010-05-25 16:36:47 UTC (rev 12322)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java 2010-05-25 17:14:33 UTC (rev 12323)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.client.configuration;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurer;
-
-
-/**
- * A simple bean created through cxf-extension-jbossws.xml in order to
- * install the JBossWS configurer.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 04-May-2010
- */
-public class ConfigurerInstaller
-{
- private Bus bus;
-
- public ConfigurerInstaller()
- {
- //NOOP
- }
-
- public Bus getBus()
- {
- return bus;
- }
-
- public void setBus(Bus bus)
- {
- this.bus = bus;
- updateConfigurer();
- }
-
- protected void updateConfigurer()
- {
- bus.setExtension(new JBossWSCXFConfigurer(bus.getExtension(Configurer.class)), Configurer.class);
- }
-}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-25 16:36:47 UTC (rev 12322)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-25 17:14:33 UTC (rev 12323)
@@ -21,8 +21,8 @@
*/
package org.jboss.wsf.stack.cxf.client.configuration;
-import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.configuration.spring.ConfigurerImpl;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
@@ -38,23 +38,25 @@
* @author alessio.soldano(a)jboss.com
* @since 05-Oct-2009
*/
-public class JBossWSCXFConfigurer extends DelegatingConfigurer
+public class JBossWSCXFConfigurer extends ConfigurerImpl
{
protected BindingCustomization customization;
- public JBossWSCXFConfigurer(Configurer delegate)
+ @Override
+ public void configureBean(Object beanInstance)
{
- super(delegate);
+ customConfigure(beanInstance);
+ super.configureBean(beanInstance);
}
-
- public JBossWSCXFConfigurer(Configurer delegate, BindingCustomization customization)
+
+ @Override
+ public void configureBean(String name, Object beanInstance)
{
- super(delegate);
- this.customization = customization;
+ customConfigure(beanInstance);
+ super.configureBean(name, beanInstance);
}
- @Override
- protected void internalConfigure(Object beanInstance)
+ protected void customConfigure(Object beanInstance)
{
if (beanInstance instanceof AbstractWSDLBasedEndpointFactory)
{
@@ -85,7 +87,7 @@
//customize default databinding (early pulls in ServiceFactory default databinding and configure it, as it's lazily loaded)
serviceFactory.reset();
DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true);
- setBindingCustomization(serviceFactoryDataBinding, customization);
+ configureBindingCustomization(serviceFactoryDataBinding, customization);
serviceFactory.setDataBinding(serviceFactoryDataBinding);
//customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one)
if (factory.getDataBinding() == null)
@@ -95,7 +97,7 @@
}
else
{
- setBindingCustomization(factory.getDataBinding(), customization);
+ configureBindingCustomization(factory.getDataBinding(), customization);
}
}
//add other configurations here below
@@ -115,7 +117,7 @@
ReflectionServiceFactoryBean serviceFactory = factory.getServiceFactory();
serviceFactory.reset();
DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true);
- setBindingCustomization(serviceFactoryDataBinding, customization);
+ configureBindingCustomization(serviceFactoryDataBinding, customization);
serviceFactory.setDataBinding(serviceFactoryDataBinding);
//customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one)
if (factory.getDataBinding() == null)
@@ -125,7 +127,7 @@
}
else
{
- setBindingCustomization(factory.getDataBinding(), customization);
+ configureBindingCustomization(factory.getDataBinding(), customization);
}
}
//add other configurations here below
@@ -153,7 +155,7 @@
}
@SuppressWarnings("unchecked")
- protected static void setBindingCustomization(DataBinding db, BindingCustomization customization)
+ protected static void configureBindingCustomization(DataBinding db, BindingCustomization customization)
{
//JAXB
if (customization instanceof JAXBBindingCustomization)
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-25 16:36:47 UTC (rev 12322)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-25 17:14:33 UTC (rev 12323)
@@ -1,10 +1,6 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clientConfigurerInstaller" class="org.jboss.wsf.stack.cxf.client.configuration.ConfigurerInstaller">
- <property name="bus" ref="cxf"/>
- </bean>
-
<!--
<bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-05-25 16:36:47 UTC (rev 12322)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-05-25 17:14:33 UTC (rev 12323)
@@ -44,9 +44,8 @@
</property>
<property name="bus" ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.configuration.Configurer"
- class="org.apache.cxf.configuration.spring.ConfigurerImpl">
- </bean>
+
+ <bean id="org.apache.cxf.configuration.Configurer" class="org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer"/>
<bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
<property name="mapProvider">
14 years, 7 months
- 1
- 0
JBossWS SVN: r12322 - in stack/cxf/trunk: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 12:36:47 -0400 (Tue, 25 May 2010)
New Revision: 12322
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3036] Use woodstox-lgpl instead of woodstox-asl
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-05-25 16:00:16 UTC (rev 12321)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-05-25 16:36:47 UTC (rev 12322)
@@ -149,7 +149,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx-lgpl</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -246,7 +246,7 @@
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
</manifest>
<manifestEntries>
- <Class-Path>jbossws-framework.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar</Class-Path>
+ <Class-Path>jbossws-framework.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-25 16:00:16 UTC (rev 12321)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-25 16:36:47 UTC (rev 12322)
@@ -150,7 +150,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx-lgpl</artifactId>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-25 16:00:16 UTC (rev 12321)
+++ stack/cxf/trunk/pom.xml 2010-05-25 16:36:47 UTC (rev 12322)
@@ -447,7 +447,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx-lgpl</artifactId>
<version>${wstx.version}</version>
</dependency>
<dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 16:00:16 UTC (rev 12321)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 16:36:47 UTC (rev 12322)
@@ -63,7 +63,7 @@
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>org.codehaus.woodstox:wstx-asl:jar</include>
+ <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
</dependencySet>
</dependencySets>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12321 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 12:00:16 -0400 (Tue, 25 May 2010)
New Revision: 12321
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3039] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-25 15:56:02 UTC (rev 12320)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-25 16:00:16 UTC (rev 12321)
@@ -58,3 +58,5 @@
# [JBWS-3002] Verify POJO endpoints are shared
org/jboss/test/ws/jaxws/jbws2486/**
+# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
+org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-05-25 15:56:02 UTC (rev 12320)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-05-25 16:00:16 UTC (rev 12321)
@@ -58,3 +58,5 @@
# [JBWS-3002] Verify POJO endpoints are shared
org/jboss/test/ws/jaxws/jbws2486/**
+# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
+org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
14 years, 7 months
- 1
- 0
JBossWS SVN: r12320 - stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 11:56:02 -0400 (Tue, 25 May 2010)
New Revision: 12320
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
Log:
[JBWS-3038] Add comment on BusApplicationContextResourceResolver removal from default Bus
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-05-25 15:54:04 UTC (rev 12319)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-05-25 15:56:02 UTC (rev 12320)
@@ -39,7 +39,7 @@
<list>
<bean class="org.apache.cxf.resource.ClasspathResolver"/>
<bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
- <!-- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> -->
+ <!-- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> --> <!-- Restore once JBWS-3039 is solved -->
</list>
</property>
<property name="bus" ref="cxf"/>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12319 - in stack/cxf/trunk: modules/client and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 11:54:04 -0400 (Tue, 25 May 2010)
New Revision: 12319
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3036] Move to SpringFramework 3.0.1 to synch with AS trunk
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-05-25 14:05:23 UTC (rev 12318)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-05-25 15:54:04 UTC (rev 12319)
@@ -55,7 +55,6 @@
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-corba</artifactId>
@@ -161,6 +160,39 @@
<artifactId>asm</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+
<!--
useStrictFiltering requires dependency in all included modules
http://jira.codehaus.org/browse/MASSEMBLY-317
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-25 14:05:23 UTC (rev 12318)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-25 15:54:04 UTC (rev 12319)
@@ -44,9 +44,12 @@
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
+ <include name="**/spring-aop.jar"/>
+ <include name="**/spring-asm.jar"/>
<include name="**/spring-beans.jar"/>
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
+ <include name="**/spring-expression.jar"/>
<include name="**/spring-jms.jar"/>
<include name="**/spring-tx.jar"/>
<include name="**/stax-api.jar"/>
@@ -86,9 +89,12 @@
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
+ <include name="**/spring-aop.jar"/>
+ <include name="**/spring-asm.jar"/>
<include name="**/spring-beans.jar"/>
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
+ <include name="**/spring-expression.jar"/>
<include name="**/spring-jms.jar"/>
<include name="**/spring-tx.jar"/>
<include name="**/XmlSchema.jar"/>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-25 14:05:23 UTC (rev 12318)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-25 15:54:04 UTC (rev 12319)
@@ -158,6 +158,30 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-25 14:05:23 UTC (rev 12318)
+++ stack/cxf/trunk/pom.xml 2010-05-25 15:54:04 UTC (rev 12319)
@@ -79,7 +79,7 @@
<velocity.version>1.5</velocity.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>2.5.6</spring.version>
+ <spring.version>3.0.1.RELEASE</spring.version>
</properties>
@@ -246,15 +246,6 @@
<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-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -466,6 +457,36 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 14:05:23 UTC (rev 12318)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 15:54:04 UTC (rev 12319)
@@ -34,9 +34,12 @@
<include>org.apache.neethi:neethi:jar</include>
<include>javax.xml.soap:saaj-api:jar</include>
<include>com.sun.xml.messaging.saaj:saaj-impl:jar</include>
+ <include>org.springframework:spring-aop:jar</include>
+ <include>org.springframework:spring-asm:jar</include>
<include>org.springframework:spring-beans:jar</include>
<include>org.springframework:spring-context:jar</include>
<include>org.springframework:spring-core:jar</include>
+ <include>org.springframework:spring-expression:jar</include>
<include>org.springframework:spring-jms:jar</include>
<include>org.springframework:spring-tx:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12318 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-25 10:05:23 -0400 (Tue, 25 May 2010)
New Revision: 12318
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-3038] Use custom BusFactory and BusApplicationContext
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-25 14:05:23 UTC (rev 12318)
@@ -47,6 +47,7 @@
import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
/**
* This ServiceObjectFactory reconstructs a javax.xml.ws.Service
@@ -101,7 +102,7 @@
URL cxfConfig = getCXFConfiguration(serviceRef.getVfsRoot());
if (cxfConfig != null)
{
- SpringBusFactory busFactory = new SpringBusFactory();
+ SpringBusFactory busFactory = new JBossWSSpringBusFactory();
bus = busFactory.createBus(cxfConfig);
BusFactory.setThreadDefaultBus(bus);
}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java 2010-05-25 14:05:23 UTC (rev 12318)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.client.configuration;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+/**
+ * A JBossWS version of @see{org.apache.cxf.bus.spring.BusApplicationContext} that
+ * allows for getting the default bus configuration from the JBossWS
+ * integration.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-May-2010
+ *
+ */
+public class JBossWSBusApplicationContext extends BusApplicationContext
+{
+ private static final String JBWS_INTEGRATION_CXF_CFG_FILE = "META-INF/cxf/jbossws-cxf.xml";
+
+ private static final String JBWS_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf-extension-jbossws.xml";
+
+ private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf.extension";
+
+ private final boolean jbwsIncludeDefaults;
+ private final boolean ready;
+
+ public JBossWSBusApplicationContext(String[] cf, boolean include, ApplicationContext parent)
+ {
+ super(cf, false, parent);
+ this.jbwsIncludeDefaults = include;
+ this.ready = true;
+ refresh();
+ }
+
+ public JBossWSBusApplicationContext(URL[] url, boolean include, ApplicationContext parent)
+ {
+ super(url, false, parent);
+ this.jbwsIncludeDefaults = include;
+ this.ready = true;
+ refresh();
+ }
+
+ @Override
+ protected Resource[] getConfigResources()
+ {
+ List<Resource> resources = new ArrayList<Resource>();
+ if (ready)
+ {
+ if (jbwsIncludeDefaults)
+ {
+ try
+ {
+ PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(Thread
+ .currentThread().getContextClassLoader());
+ //jbossws-cxf.xml with our integration defaults for the Bus
+ Collections.addAll(resources, resolver.getResources(JBWS_INTEGRATION_CXF_CFG_FILE));
+ //cxf-extensions-jbossws.xml, for customers' jbossws additions
+ Collections.addAll(resources, resolver.getResources(JBWS_CXF_EXT_CFG_FILE));
+ //CXF vanilla extensions, need to load them here as super skips defaults loading
+ Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE);
+ for (Resource r : exts)
+ {
+ InputStream is = r.getInputStream();
+ BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ String line = rd.readLine();
+ while (line != null)
+ {
+ if (!"".equals(line))
+ {
+ resources.add(resolver.getResource(line));
+ }
+ line = rd.readLine();
+ }
+ is.close();
+ }
+
+ }
+ catch (IOException ex)
+ {
+ // ignore
+ }
+ }
+ //recurse to super; this loads everything else the user specified
+ Resource[] superResources = super.getConfigResources();
+ if (superResources != null)
+ Collections.addAll(resources, superResources);
+ }
+ return resources.isEmpty() ? null : (Resource[]) resources.toArray(new Resource[resources.size()]);
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2010-05-25 14:05:23 UTC (rev 12318)
@@ -0,0 +1,162 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.client.configuration;
+
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.common.logging.LogUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * A JBossWS version of @see{org.apache.cxf.bus.spring.SpringBusFactory} that
+ * allows for loading a custom BusApplicationContext for integration reasons.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-May-2010
+ *
+ */
+public class JBossWSSpringBusFactory extends SpringBusFactory
+{
+ private static final Logger LOG = LogUtils.getL7dLogger(JBossWSSpringBusFactory.class);
+
+ public JBossWSSpringBusFactory()
+ {
+ super();
+ }
+
+ public JBossWSSpringBusFactory(ApplicationContext context)
+ {
+ super(context);
+ }
+
+ @Override
+ public Bus createBus(String cfgFiles[], boolean includeDefaults)
+ {
+ try
+ {
+ return finishCreatingBus(createApplicationContext(cfgFiles, includeDefaults));
+ }
+ catch (BeansException ex)
+ {
+ LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public Bus createBus(URL[] urls, boolean includeDefaults)
+ {
+ try
+ {
+ return finishCreatingBus(new JBossWSBusApplicationContext(urls, includeDefaults, getApplicationContext()));
+ }
+ catch (BeansException ex)
+ {
+ LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+ throw new RuntimeException(ex);
+ }
+ }
+
+ private Bus finishCreatingBus(BusApplicationContext bac)
+ {
+ final Bus bus = (Bus) bac.getBean(Bus.DEFAULT_BUS_ID);
+
+ bus.setExtension(bac, BusApplicationContext.class);
+
+ possiblySetDefaultBus(bus);
+
+ initializeBus(bus);
+
+ registerAppContextLifeCycleListener(bus, bac);
+ return bus;
+ }
+
+ private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
+ {
+ try
+ {
+ return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
+ }
+ catch (BeansException ex)
+ {
+ LogUtils.log(LOG, Level.WARNING, "INITIAL_APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[]) null);
+ ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+ if (contextLoader != BusApplicationContext.class.getClassLoader())
+ {
+ Thread.currentThread().setContextClassLoader(BusApplicationContext.class.getClassLoader());
+ try
+ {
+ return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext());
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(contextLoader);
+ }
+ }
+ else
+ {
+ throw ex;
+ }
+ }
+ }
+
+ void registerAppContextLifeCycleListener(final Bus bus, final BusApplicationContext bac)
+ {
+ BusLifeCycleManager lm = bus.getExtension(BusLifeCycleManager.class);
+ if (null != lm)
+ {
+ lm.registerLifeCycleListener(new BusApplicationContextLifeCycleListener(bac));
+ }
+ }
+
+ static class BusApplicationContextLifeCycleListener implements BusLifeCycleListener
+ {
+ private BusApplicationContext bac;
+
+ BusApplicationContextLifeCycleListener(BusApplicationContext b)
+ {
+ bac = b;
+ }
+
+ public void initComplete()
+ {
+ }
+
+ public void preShutdown()
+ {
+ }
+
+ public void postShutdown()
+ {
+ bac.close();
+ }
+
+ }
+}
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,53 +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"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"
- id="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
- id="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/>
-
- <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
- class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder">
- <property name="knownElements">
- <set>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- </set>
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,46 +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 id="org.apache.cxf.binding.corba.CorbaBindingFactory"
- class="org.apache.cxf.binding.corba.CorbaBindingFactory" lazy-init="true">
- <property name="bus" ref="cxf"/>
- <property name="activationNamespaces">
- <set>
- <value>http://cxf.apache.org/bindings/corba</value>
- <value>http://schemas.apache.org/yoko/bindings/corba</value>
- </set>
- </property>
- <property name="transportIds">
- <list>
- <value>http://cxf.apache.org/bindings/corba</value>
- <value>http://schemas.apache.org/yoko/bindings/corba</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.cxf.binding.corba.wsdl.WSDLExtensionRegister" lazy-init="false"/>
-
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -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.binding.http.HttpBindingFactory"
- id="org.apache.cxf.binding.http.HttpBindingFactory"
- lazy-init="true">
- <property name="activationNamespaces">
- <set>
- <value>http://apache.org/cxf/binding/http</value>
- </set>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,45 +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"
- id="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>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,50 +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.transport.http.policy.HTTPClientAssertionBuilder"
- id="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/>
- <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"
- id="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/>
- <bean class="org.apache.cxf.transport.http.policy.NoOpPolicyInterceptorProvider"
- id="org.apache.cxf.transport.http.policy.NoOpPolicyInterceptorProvider"/>
-
-
-
- <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"
- id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"
- lazy-init="true">
- <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>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,31 +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"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.apache.cxf.javascript.JavascriptQueryHandlerRegistry"
- id="org.apache.cxf.javascript.JavascriptQueryHandlerRegistry"
- init-method="register"
- >
- <constructor-arg ref="cxf"/>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -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>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,33 +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.jaxws.context.WebServiceContextResourceResolver"
- id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
- <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
- id="org.apache.cxf.jaxws.context.WebServiceContextImpl" lazy-init="true"/>
- <alias name="org.apache.cxf.jaxws.context.WebServiceContextImpl"
- alias="javax.xml.ws.WebServiceContext"/>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -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.transport.jms.JMSTransportFactory"
- id="org.apache.cxf.transport.jms.JMSTransportFactory"
- lazy-init="true">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://cxf.apache.org/transports/jms</value>
- <value>http://cxf.apache.org/transports/jms/configuration</value>
- </list>
- </property>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,36 +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.transport.local.LocalTransportFactory"
- id="org.apache.cxf.transport.local.LocalTransportFactory"
- lazy-init="true">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <list>
- <value>http://cxf.apache.org/transports/local</value>
- </list>
- </property>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,34 +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 id="org.apache.cxf.management.InstrumentationManager"
- class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
- <property name="bus" ref="cxf"/>
- <property name="enabled" value="false"/>
- <property name="threaded" value="false"/>
- <property name="daemon" value="false"/>
- </bean>
-
-</beans>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -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.binding.object.ObjectBindingFactory"
- id="org.apache.cxf.binding.object.ObjectBindingFactory"
- lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" >
- <property name="bus" ref="cxf"/>
- <property name="activationNamespaces">
- <set>
- <value>http://cxf.apache.org/binding/object</value>
- </set>
- </property>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,80 +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"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl">
- <constructor-arg>
- <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap">
- <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/>
- <property name="idsProperty" value="knownElements"/>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
- <constructor-arg>
- <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap">
- <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/>
- <property name="idsProperty" value="assertionTypes"/>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"
- class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry">
- <constructor-arg>
- <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap">
- <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/>
- <property name="idsProperty" value="domainExpressionTypes"/>
- </bean>
- </constructor-arg>
- </bean>
-
- <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"
- id="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/>
-
- <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl">
- <property name="bus" ref="cxf"/>
- <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/>
- </bean>
-
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"
- id="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"
- id="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider">
- <constructor-arg ref="cxf"/>
- </bean>
-
- <!-- MTOM Policy Support -->
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
- id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"/>
- <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
- id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,45 +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 id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"
- id="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider">
- <constructor-arg><ref bean="cxf"/></constructor-arg>
- </bean>
-
- <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder">
- <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/>
- <constructor-arg>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/>
- <constructor-arg value="RMAssertion"/>
- </bean>
- </constructor-arg>
- </bean>
-
-</beans>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,62 +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 id="org.apache.cxf.binding.soap.SoapBindingFactory"
- class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true">
- <property name="activationNamespaces">
- <set>
- <value>http://schemas.xmlsoap.org/soap/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
- <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- </set>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean class="org.apache.cxf.binding.soap.SoapTransportFactory"
- id="org.apache.cxf.binding.soap.SoapTransportFactory"
- lazy-init="true">
- <property name="transportIds">
- <list>
- <value>http://schemas.xmlsoap.org/soap/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
- </list>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.binding.soap.customEditorConfigurer"
- class="org.springframework.beans.factory.config.CustomEditorConfigurer">
- <property name="propertyEditorRegistrars">
- <list>
- <bean class="org.apache.cxf.binding.soap.spring.SoapVersionRegistrar"/>
- </list>
- </property>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,30 +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 id="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader"
- class="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader">
- <property name="bus" ref="cxf"/>
- </bean>
-</beans>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -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">
-
- <bean class="org.apache.cxf.binding.xml.XMLBindingFactory"
- id="org.apache.cxf.binding.xml.XMLBindingFactory"
- lazy-init="true">
- <property name="activationNamespaces">
- <set>
- <value>http://cxf.apache.org/bindings/xformat</value>
- <value>http://www.w3.org/2004/08/wsdl/http</value>
- <value>http://schemas.xmlsoap.org/wsdl/http/</value>
- </set>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,40 +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.transport.servlet.ServletTransportFactory"
- id="org.apache.cxf.transport.servlet.ServletTransportFactory">
- <property name="bus" ref="cxf"/>
- <property name="transportIds">
- <set>
- <value>http://cxf.apache.org/bindings/xformat</value>
- <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>
- </set>
- </property>
- </bean>
-</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,18 +0,0 @@
-META-INF/cxf/cxf-extension-corba.xml
-META-INF/cxf/cxf-extension-jaxws.xml
-META-INF/cxf/cxf-extension-soap.xml
-META-INF/cxf/cxf-extension-xml.xml
-META-INF/cxf/cxf-extension-addr.xml
-META-INF/cxf/cxf-extension-javascript-client.xml
-META-INF/cxf/cxf-extension-local.xml
-META-INF/cxf/cxf-extension-http.xml
-META-INF/cxf/cxf-extension-management.xml
-META-INF/cxf/cxf-extension-http-jetty.xml
-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
-META-INF/cxf/cxf-extension-jbossws.xml
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,129 +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:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <!-- For Testing using the Swing commons processor, uncomment one of:
- <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
- <context:annotation-config/>
- -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
- <bean id="org.apache.cxf.bus.spring.BusApplicationListener" class="org.apache.cxf.bus.spring.BusApplicationListener"/>
- <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
- <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
- <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
-
- <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
- <property name="resolvers">
- <list>
- <bean class="org.apache.cxf.resource.ClasspathResolver"/>
- <bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
- </list>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.configuration.Configurer"
- class="org.apache.cxf.configuration.spring.ConfigurerImpl">
- </bean>
-
- <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.binding.BindingFactory"/>
- <property name="idsProperty" value="activationNamespaces"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
- <property name="idsProperty" value="transportIds"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
- <property name="idsProperty" value="transportIds"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl">
-
- </bean>
-
- <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/>
- <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/>
-
-
- <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <property name="bus" ref="cxf"/>
- <property name="queryHandlers">
- <list>
- <bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <property name="bus" ref="cxf"/>
- </bean>
- </list>
- </property>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
- <property name="bus" ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl">
- <property name="bus" ref="cxf"/>
- </bean>
- <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
- <property name="bus" ref="cxf"/>
- </bean>
-
- <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
- <property name="bus" ref="cxf"/>
- </bean>
-</beans>
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-05-25 14:05:23 UTC (rev 12318)
@@ -0,0 +1,129 @@
+<?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:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <!-- For Testing using the Swing commons processor, uncomment one of:
+ <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
+ <context:annotation-config/>
+ -->
+ <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+ <bean id="org.apache.cxf.bus.spring.BusApplicationListener" class="org.apache.cxf.bus.spring.BusApplicationListener"/>
+ <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+
+ <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl">
+ <property name="resolvers">
+ <list>
+ <bean class="org.apache.cxf.resource.ClasspathResolver"/>
+ <bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
+ <!-- <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> -->
+ </list>
+ </property>
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="org.apache.cxf.configuration.Configurer"
+ class="org.apache.cxf.configuration.spring.ConfigurerImpl">
+ </bean>
+
+ <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
+ <property name="mapProvider">
+ <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
+ <property name="type" value="org.apache.cxf.binding.BindingFactory"/>
+ <property name="idsProperty" value="activationNamespaces"/>
+ </bean>
+ </property>
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
+ <property name="mapProvider">
+ <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
+ <property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
+ <property name="idsProperty" value="transportIds"/>
+ </bean>
+ </property>
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
+ <property name="mapProvider">
+ <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
+ <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
+ <property name="idsProperty" value="transportIds"/>
+ </bean>
+ </property>
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl">
+
+ </bean>
+
+ <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/>
+ <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/>
+
+
+ <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ <property name="queryHandlers">
+ <list>
+ <bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+ <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
+ <property name="bus" ref="cxf"/>
+ </bean>
+</beans>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2010-05-25 14:05:23 UTC (rev 12318)
@@ -1,2 +1 @@
-org.apache.cxf.bus.spring.SpringBusFactory
-org.springframework.context.ApplicationContext
\ No newline at end of file
+org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory
\ No newline at end of file
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-25 08:43:31 UTC (rev 12317)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-25 14:05:23 UTC (rev 12318)
@@ -30,7 +30,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
@@ -41,6 +40,7 @@
import org.jboss.ws.Constants;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -166,7 +166,7 @@
*/
protected void createBus(URL location)
{
- bus = new SpringBusFactory().createBus();
+ bus = new JBossWSSpringBusFactory().createBus();
ctx = bus.getExtension(BusApplicationContext.class);
//Load additional configurations from cxf-servlet.xml
if (location != null)
14 years, 7 months
- 1
- 0
JBossWS SVN: r12317 - in stack/native/trunk: modules/core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-25 04:43:31 -0400 (Tue, 25 May 2010)
New Revision: 12317
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2928][JBEE-28][JBEE-30][JBEE-31] use JBoss provided JAXWS, JAXB & SAAJ API libraries
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-05-24 13:35:39 UTC (rev 12316)
+++ stack/native/trunk/modules/core/pom.xml 2010-05-25 08:43:31 UTC (rev 12317)
@@ -39,8 +39,8 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.soap</groupId>
+ <artifactId>jboss-saaj-api_1.3_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
@@ -94,8 +94,8 @@
</dependency>
<!-- transitve dependencies -->
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
@@ -130,8 +130,8 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -186,8 +186,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-05-24 13:35:39 UTC (rev 12316)
+++ stack/native/trunk/pom.xml 2010-05-25 08:43:31 UTC (rev 12317)
@@ -61,11 +61,11 @@
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
- <jaxws.api.version>2.2</jaxws.api.version>
+ <jaxws.api.version>1.0.0.Beta1</jaxws.api.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <saaj.api.version>1.3</saaj.api.version>
+ <saaj.api.version>1.0.0.Beta1</saaj.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <jaxb.api.version>2.2</jaxb.api.version>
+ <jaxb.api.version>1.0.0.Beta1</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jboss.logging.version>2.2.0.CR1</jboss.logging.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
@@ -293,27 +293,9 @@
<version>${jsr181.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<version>${jaxws.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
@@ -327,19 +309,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.soap</groupId>
+ <artifactId>jboss-saaj-api_1.3_spec</artifactId>
<version>${saaj.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-24 13:35:39 UTC (rev 12316)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 08:43:31 UTC (rev 12317)
@@ -43,8 +43,6 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
- <include>javax.xml.bind:jaxb-api:jar</include>
- <include>javax.xml.ws:jaxws-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
@@ -55,7 +53,6 @@
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
<include>javax.xml:jaxrpc-api:jar</include>
- <include>javax.xml.soap:saaj-api:jar</include>
<include>org.codehaus.jettison:jettison:jar</include>
<include>com.sun.xml.ws:policy:jar</include>
<include>stax:stax-api:jar</include>
@@ -75,6 +72,27 @@
<include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12316 - in stack/cxf/trunk/modules/testsuite: framework-tests/src/test/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-24 09:35:39 -0400 (Mon, 24 May 2010)
New Revision: 12316
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
Log:
[JBWS-3037] using log4j appenders and removing jboss specific classes from log4j configuration
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2010-05-24 13:15:24 UTC (rev 12315)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2010-05-24 13:35:39 UTC (rev 12316)
@@ -18,13 +18,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/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"/>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 13:15:24 UTC (rev 12315)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 13:35:39 UTC (rev 12316)
@@ -18,13 +18,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/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"/>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12315 - in stack/metro/trunk/modules/testsuite: metro-tests/src/test/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-24 09:15:24 -0400 (Mon, 24 May 2010)
New Revision: 12315
Modified:
stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
Log:
[JBWS-3037] using log4j appenders and removing jboss specific classes from log4j configuration
Modified: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 12:45:20 UTC (rev 12314)
+++ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 13:15:24 UTC (rev 12315)
@@ -18,13 +18,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
<param name="Append" value="false"/>
- <!-- 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"/>
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2010-05-24 12:45:20 UTC (rev 12314)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2010-05-24 13:15:24 UTC (rev 12315)
@@ -18,13 +18,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
<param name="Append" value="false"/>
- <!-- 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"/>
14 years, 7 months
- 1
- 0