[jbossws-commits] JBossWS SVN: r19562 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 2 other directories.

Author: asoldano Date: 2015-03-13 13:14:11 -0400 (Fri, 13 Mar 2015) New Revision: 19562 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.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/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java Log: [JBWS-3884] Deprecating Spring facilities in jbossws-cxf-client module and adding a WARN on Spring integration being deprecated in jbossws-cxf-server module. Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -240,4 +240,8 @@ @LogMessage(level = WARN) @Message(id = 24106, value = "Could not remove previuosly set features on client: %s") void couldNoRemoveFeaturesOnClient(String feature); + + @LogMessage(level = WARN) + @Message(id = 24107, value = "JBossWS-CXF integration with Spring is deprecated and will be dropped in a future release. See https://issues.jboss.org/browse/JBWS-3884 for details.") + void deprecatedSpringIntegration(); } Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -50,6 +50,7 @@ { private static final Map<ClassLoader, Bus> classLoaderBusses = new WeakHashMap<ClassLoader, Bus>(); + @SuppressWarnings("deprecation") private JBossWSSpringBusFactory springBusFactory; private JBossWSNonSpringBusFactory nonSpringBusFactory; @@ -74,41 +75,49 @@ } /** JBossWSSpringBusFactory methods **/ + @Deprecated public Bus createBus(String cfgFile) { return getSpringBusFactory().createBus(cfgFile, true); } + @Deprecated public Bus createBus(String cfgFiles[]) { return getSpringBusFactory().createBus(cfgFiles, true); } + @Deprecated public Bus createBus(String cfgFile, boolean includeDefaults) { return getSpringBusFactory().createBus(cfgFile, includeDefaults); } + @Deprecated public Bus createBus(String cfgFiles[], boolean includeDefaults) { return getSpringBusFactory().createBus(cfgFiles, includeDefaults); } + @Deprecated public Bus createBus(URL url) { return getSpringBusFactory().createBus(url); } + @Deprecated public Bus createBus(URL[] urls) { return getSpringBusFactory().createBus(urls); } + @Deprecated public Bus createBus(URL url, boolean includeDefaults) { return getSpringBusFactory().createBus(url, includeDefaults); } + @Deprecated public Bus createBus(URL[] urls, boolean includeDefaults) { return getSpringBusFactory().createBus(urls, includeDefaults); @@ -125,6 +134,7 @@ return getNonSpringBusFactory().createBus(extensions, properties); } + @Deprecated public synchronized JBossWSSpringBusFactory getSpringBusFactory() { if (springBusFactory == null) Modified: 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 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -44,6 +44,7 @@ * @since 25-May-2010 * */ +@Deprecated public class JBossWSSpringBusFactory extends SpringBusFactory { private boolean customContextProvided = false; Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -36,6 +36,7 @@ * @author alessio.soldano(a)jboss.com * @since 05-Oct-2009 */ +@Deprecated public class JBossWSSpringConfigurer implements JBossWSConfigurer, ApplicationContextAware, BusExtension { private BeanCustomizer customizer; Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -46,7 +46,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.configuration.Configurer; import org.jboss.ws.common.Messages; import org.jboss.wsf.spi.WSFException; @@ -56,7 +55,7 @@ import org.jboss.wsf.stack.cxf.client.ClientBusSelector; import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; /** * This ServiceObjectFactory reconstructs a javax.xml.ws.Service @@ -516,13 +515,14 @@ {}); } + @SuppressWarnings("deprecation") private Bus createNewBus(final UnifiedServiceRefMetaData serviceRefMD) { final Bus bus; final URL cxfConfig = this.getCXFConfiguration(serviceRefMD.getVfsRoot()); if (cxfConfig != null) { - final SpringBusFactory busFactory = new JBossWSSpringBusFactory(); + final JBossWSBusFactory busFactory = new JBossWSBusFactory(); bus = busFactory.createBus(cxfConfig); BusFactory.setThreadDefaultBus(bus); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2015-03-13 10:10:15 UTC (rev 19561) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2015-03-13 17:14:11 UTC (rev 19562) @@ -66,6 +66,7 @@ //create additional DD if user provided jbossws-cxf.xml and Spring is available OR spring descriptor generation is forced if (cxfURL != null || PREFER_SPRING_DESCRIPTOR_GENERATION) { + DEPLOYMENT_LOGGER.deprecatedSpringIntegration(); URL generated = dd.createFileURL(); DEPLOYMENT_LOGGER.jbwscxfConfGenerated(generated); putCXFConfigToDeployment(dep, BusHolder.PARAM_CXF_GEN_URL, generated);