Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 10:14:15 -0400 (Tue, 26 Apr 2011)
New Revision: 14201
Modified:
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
Log:
Cleanup
Modified:
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
---
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-26
14:10:04 UTC (rev 14200)
+++
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-26
14:14:15 UTC (rev 14201)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -21,40 +21,13 @@
*/
package org.jboss.wsf.stack.cxf.client.configuration;
-//import java.lang.ref.WeakReference;
-//import java.util.Collection;
import java.util.HashMap;
-//import java.util.LinkedList;
import java.util.Map;
-//import javax.xml.bind.JAXBException;
-//import javax.xml.namespace.QName;
-
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
import org.apache.cxf.configuration.Configurer;
-//import org.apache.cxf.ws.addressing.Names;
-//import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder;
-//import org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider;
-//import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
-//import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
-//import org.apache.cxf.ws.policy.PolicyBuilder;
-//import org.apache.cxf.ws.policy.PolicyBuilderImpl;
-//import org.apache.cxf.ws.policy.PolicyEngine;
-//import org.apache.cxf.ws.policy.PolicyEngineImpl;
-//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
-//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl;
-//import org.apache.cxf.ws.policy.PolicyProvider;
-//import org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider;
-//import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry;
-//import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
-//import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
-//import org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder;
-//import org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider;
-//import org.apache.cxf.ws.rm.RMManager;
-//import org.apache.cxf.ws.rm.policy.RMAssertionBuilder;
-//import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider;
import org.jboss.wsf.stack.cxf.client.ProviderImpl;
/**
@@ -77,8 +50,6 @@
extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new
BeanCustomizer()));
}
-// preparePolicyEngine(extensions);
-
//Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for
getting
//cxf bus extensions (as that classloader is the jaxws-client module one which
'sees' all
//extensions, unless different dependencies are explicitly set)
@@ -88,75 +59,5 @@
initializeBus(bus);
bus.initialize();
return bus;
-
-// initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus);
-//
-// possiblySetDefaultBus(bus);
-// initializeBus(bus);
-// return bus;
}
-
-// @SuppressWarnings("rawtypes")
-// private static void preparePolicyEngine(Map<Class, Object> extensions)
-// {
-// PolicyEngineImpl engine = new PolicyEngineImpl(true);
-// extensions.put(PolicyEngine.class, engine);
-// DomainExpressionBuilderRegistry domainExpBuilderRegistry = new
DomainExpressionBuilderRegistry();
-// extensions.put(DomainExpressionBuilderRegistry.class, domainExpBuilderRegistry);
-// }
-//
-// private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus)
-// {
-// engine.setBus(bus);
-// AssertionBuilderRegistry assertionBuilderRegistry = new
AssertionBuilderRegistryImpl(bus);
-// PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new
PolicyInterceptorProviderRegistryImpl(bus);
-// PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl();
-// policyBuilder.setBus(bus);
-// policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry);
-// bus.setExtension(policyBuilder, PolicyBuilder.class);
-// Collection<PolicyProvider> policyProviders = engine.getPolicyProviders();
-// Wsdl11AttachmentPolicyProvider wsdl11PolicyAttachmentProvider = new
Wsdl11AttachmentPolicyProvider(bus);
-// wsdl11PolicyAttachmentProvider.setBuilder(policyBuilder);
-// wsdl11PolicyAttachmentProvider.setRegistry(engine.getRegistry());
-// policyProviders.add(wsdl11PolicyAttachmentProvider);
-// ServiceModelPolicyProvider serviceModelPolicyProvider = new
ServiceModelPolicyProvider(bus);
-// serviceModelPolicyProvider.setBuilder(policyBuilder);
-// serviceModelPolicyProvider.setRegistry(engine.getRegistry());
-// policyProviders.add(serviceModelPolicyProvider);
-//
-// //MTOM Policy
-// assertionBuilderRegistry.register(new MTOMAssertionBuilder());
-// policyInterceptorProviderRegistry.register(new MTOMPolicyInterceptorProvider());
-//
-// //RM
-// RMManager rmManager = new RMManager();
-// rmManager.init(bus);
-//
-// //RM Policy
-// policyInterceptorProviderRegistry.register(new
RMPolicyInterceptorProvider(bus));
-// try
-// {
-// assertionBuilderRegistry.register(new RMAssertionBuilder());
-// }
-// catch (JAXBException e)
-// {
-// throw new RuntimeException(e);
-// }
-//
-// //Addressing Policy
-// policyInterceptorProviderRegistry.register(new
AddressingPolicyInterceptorProvider());
-// assertionBuilderRegistry.register(new AddressingAssertionBuilder(bus));
-// Collection<QName> addressingKnownEls = new LinkedList<QName>();
-// addressingKnownEls.add(new
QName("http://schemas.xmlsoap.org/ws/2004/08/addressing/policy",
Names.WSAW_USING_ADDRESSING_NAME));
-// addressingKnownEls.add(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD,
Names.WSAW_USING_ADDRESSING_NAME));
-// addressingKnownEls.add(Names.WSAW_USING_ADDRESSING_QNAME);
-// PrimitiveAssertionBuilder primitiveAssertionBuilder = new
PrimitiveAssertionBuilder(addressingKnownEls);
-// primitiveAssertionBuilder.setBus(bus);
-// assertionBuilderRegistry.register(primitiveAssertionBuilder);
-// }
-//
-// @Override
-// protected void initializeBus(Bus bus) {
-// super.initializeBus(bus);
-// }
}
Modified:
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
---
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-26
14:10:04 UTC (rev 14200)
+++
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-26
14:14:15 UTC (rev 14201)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -33,10 +33,7 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
-//import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-//import org.apache.cxf.transport.servlet.ServletController;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@@ -54,12 +51,6 @@
protected Endpoint endpoint;
protected Bus bus;
-// private ServletController createServletController(ServletConfig servletConfig)
-// {
-// ServletTransportFactory stf = (ServletTransportFactory)
createServletTransportFactory();
-// return new ServletControllerExt(stf, servletConfig,
servletConfig.getServletContext(), bus);
-// }
-
@Override
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
@@ -87,11 +78,6 @@
//update the resource manager adding the ServletContextResourceResolver that was to
be added by CXF servlet
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
resourceManager.addResourceResolver(new
ServletContextResourceResolver(servletConfig.getServletContext()));
- //TODO!!! replaceDestinationFactory();
-// //set up the ServletController as the CXF servlet would have done
-// controller = createServletController(servletConfig);
-// //set the controller in the servlet context now that the bus has been configured
in the servlet
-// servletConfig.getServletContext().setAttribute(ServletController.class.getName(),
getController());
}
@Override
Modified:
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
---
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-26
14:10:04 UTC (rev 14200)
+++
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-26
14:14:15 UTC (rev 14201)
@@ -21,24 +21,7 @@
*/
package org.jboss.wsf.stack.cxf;
-//import java.io.IOException;
-//
-//import javax.servlet.ServletConfig;
-//import javax.servlet.ServletContext;
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//
-//import org.apache.cxf.BusFactory;
-//import org.apache.cxf.resource.ResourceManager;
-//import org.apache.cxf.transport.servlet.CXFServlet;
-//import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-//import org.apache.cxf.transport.servlet.ServletController;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
-//import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
-//import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-//import org.jboss.wsf.stack.cxf.transport.ServletHelper;
/**
* An extension to the CXF servlet
@@ -48,97 +31,7 @@
*
* @since 21-Apr-2007
*/
-//public class CXFServletExt extends CXFServlet implements ServletDelegate
public class CXFServletExt extends CXFNonSpringServletExt implements ServletDelegate
{
-// protected Endpoint endpoint;
-//
-// private ServletController createServletController(ServletConfig servletConfig)
-// {
-// ServletTransportFactory stf = (ServletTransportFactory)
createServletTransportFactory();
-// return new ServletControllerExt(stf, servletConfig,
servletConfig.getServletContext(), bus);
-// }
-//
-// @Override
-// public void loadBus(ServletConfig servletConfig) throws ServletException
-// {
-// //Init the Endpoint
-// endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
-//
-// //keep the bus created during deployment and update it with the information
coming from the servlet config
-// updateAvailableBusWithServletInfo(servletConfig);
-//
-// //register the InstrumentManagementImpl
-// ServletHelper.registerInstrumentManger(bus, getServletContext());
-// }
-//
-// private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
-// {
-// BusHolder holder =
endpoint.getService().getDeployment().getAttachment(BusHolder.class);
-// //set the bus from deployment into the CXF servlet and assign it to the current
thread (do not touch the default bus!)
-// bus = holder.getBus();
-// BusFactory.setThreadDefaultBus(bus);
-// //update the resource manager adding the ServletContextResourceResolver that was
to be added by CXF servlet
-// ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
-// resourceManager.addResourceResolver(new
ServletContextResourceResolver(servletConfig.getServletContext()));
-// replaceDestinationFactory();
-// //set up the ServletController as the CXF servlet would have done
-// controller = createServletController(servletConfig);
-// //set the controller in the servlet context now that the bus has been configured
in the servlet
-// servletConfig.getServletContext().setAttribute(ServletController.class.getName(),
getController());
-// }
-//
-// @Override
-// protected void invoke(HttpServletRequest req, HttpServletResponse res) throws
ServletException
-// {
-// ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(),
endpoint);
-// }
-//
-// @Override
-// public void destroy()
-// {
-// ServletHelper.callPreDestroy(endpoint);
-// }
-//
-// @Override
-// public void doHead(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doHead(request, response);
-// }
-//
-// @Override
-// public void doGet(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doGet(request, response);
-// }
-//
-// @Override
-// public void doPost(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doPost(request, response);
-// }
-//
-// @Override
-// public void doPut(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doPut(request, response);
-// }
-//
-// @Override
-// public void doDelete(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doDelete(request, response);
-// }
-//
-// @Override
-// public void service(HttpServletRequest request, HttpServletResponse response,
ServletContext context)
-// throws ServletException, IOException
-// {
-// this.service(request, response);
-// }
+
}
Modified:
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
---
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-26
14:10:04 UTC (rev 14200)
+++
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-26
14:14:15 UTC (rev 14201)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -32,11 +32,8 @@
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.http.HttpDestinationFactory;
import org.apache.cxf.transport.servlet.ServletDestinationFactory;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;