Index: modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java	(revision 17777)
+++ modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java	(working copy)
@@ -44,14 +44,15 @@
 
 /**
  * An extension to the CXF servlet
- * 
+ *
  * @author Thomas.Diesler@jboss.org
  * @author alessio.soldano@jboss.com
- * 
+ *
  * @since 21-Apr-2007
  */
 public class CXFServletExt extends AbstractHTTPServlet implements ServletDelegate
 {
+   private static final long serialVersionUID = -1820187716558491952L;
    protected Endpoint endpoint;
    protected Bus bus;
 
@@ -86,13 +87,13 @@
    {
       ServletHelper.callRequestHandler(req, res, getServletContext(), bus, endpoint);
    }
-   
+
    @Override
-   public void destroy() 
+   public void destroy()
    {
       ServletHelper.callPreDestroy(endpoint);
    }
-   
+
    @Override
    public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
          throws ServletException, IOException
Index: modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java	(revision 17777)
+++ modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java	(working copy)
@@ -52,13 +52,12 @@
 import org.jboss.wsf.spi.invocation.InvocationContext;
 import org.jboss.wsf.spi.invocation.RequestHandler;
 import org.jboss.wsf.spi.management.EndpointMetrics;
-import org.jboss.wsf.spi.management.ServerConfig;
 import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper;
 import org.jboss.wsf.stack.cxf.configuration.BusHolder;
 
 /**
  * A request handler
- * 
+ *
  * @author Thomas.Diesler@jboss.org
  * @author alessio.soldano@jboss.com
  * @since 21-May-2007
@@ -66,12 +65,12 @@
 public class RequestHandlerImpl implements RequestHandler
 {
    private static RequestHandlerImpl me = new RequestHandlerImpl();
-   
+
    RequestHandlerImpl()
    {
       //NOOP
    }
-   
+
    static RequestHandlerImpl getInstance()
    {
       return me;
@@ -81,8 +80,8 @@
    {
       Bus bus = ep.getService().getDeployment().getAttachment(BusHolder.class).getBus();
       AbstractHTTPDestination dest = findDestination(req, bus);
-      
-      boolean requestHandled = handleQuery(req, res, dest, bus); 
+
+      boolean requestHandled = handleQuery(req, res, dest, bus);
       if (false == requestHandled)
       {
          Long beginTime = initRequestMetrics(ep);
@@ -116,7 +115,7 @@
    {
       throw new NotImplementedException();
    }
-   
+
    /**
     * Finds destination based on request URI
     * @param requestURI to be recognized
@@ -138,7 +137,7 @@
       {
          EndpointInfo endpointInfo = destination.getEndpointInfo();
          String address = endpointInfo.getAddress();
-         
+
          String path = address;
          try
          {
@@ -148,7 +147,7 @@
          {
             // ignore
          }
-         
+
          if (path != null)
          {
             if (requestURI.equals(path))
@@ -164,10 +163,10 @@
 
       if (returnValue == null)
          throw Messages.MESSAGES.cannotObtainDestinationFor(requestURI);
-      
+
       return returnValue;
    }
-   
+
    private static DestinationRegistry getDestinationRegistryFromBus(Bus bus) throws ServletException {
       DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
       try {
@@ -182,7 +181,7 @@
       }
       return null;
   }
-   
+
    /**
     * When request includes query it tries to lookup the query handler and tries to handle the request message
     * @param req request
@@ -206,7 +205,7 @@
                   AbstractServerConfig.getServerIntegrationServerConfig());
             endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite);
             endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite);
-   
+
             for (QueryHandler queryHandler : qhr.getHandlers())
             {
                if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
@@ -227,10 +226,10 @@
             }
          }
       }
-         
+
       return false;
    }
-   
+
    private long initRequestMetrics(Endpoint endpoint)
    {
       long beginTime = 0;
Index: modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
===================================================================
--- modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java	(revision 17777)
+++ modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java	(working copy)
@@ -33,7 +33,7 @@
 /**
  * An implementation of DigestCallback that generates password
  * digests according to the UsernameTokenProfile 1.0 specification.
- * 
+ *
  * @author alessio.soldano@jboss.com
  * @since 12-Mar-2008
  *
@@ -48,8 +48,7 @@
 
    private MapCallback info;
 
-   @SuppressWarnings("unchecked")
-   public void init(Map options)
+   public void init(Map<String,Object> options)
    {
       // Ask for MapCallback to obtain the digest parameters
       info = new MapCallback();
Index: modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java	(revision 17777)
+++ modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java	(working copy)
@@ -51,7 +51,7 @@
 import org.jboss.wsf.stack.cxf.Messages;
 
 /**
- * 
+ *
  * @author alessio.soldano@jboss.com
  * @since 16-Jun-2010
  *
@@ -90,17 +90,17 @@
       return endpoint;
    }
 
-   @SuppressWarnings("unchecked")
    private static void injectServiceAndHandlerResources(Endpoint endpoint)
    {
       ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
       if (factory != null)
       {
+         @SuppressWarnings("rawtypes")
          List<Handler> chain = ((JaxWsEndpointImpl) factory.getServer().getEndpoint()).getJaxwsBinding()
                .getHandlerChain();
          if (chain != null)
          {
-            for (Handler handler : chain)
+            for (Handler<?> handler : chain)
             {
                final Reference handlerReference = endpoint.getInstanceProvider().getInstance(handler.getClass().getName());
                if (!handlerReference.isInitialized()) {
@@ -112,7 +112,7 @@
          }
       }
    }
-   
+
    public static void callPreDestroy(Endpoint endpoint)
    {
       ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
@@ -121,7 +121,7 @@
          if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null)
          {
             final Reference epReference = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName());
-            final Object epInstance = epReference.getValue(); 
+            final Object epInstance = epReference.getValue();
             InjectionHelper.callPreDestroyMethod(epInstance);
          }
       }