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)