Author: alessio.soldano(a)jboss.com Date: 2010-11-22 02:43:10 -0500 (Mon, 22 Nov 2010) New Revision: 13313 Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java Log: [JBWS-2896] rollback changes on 3.4.0 branch as the jboss-logging available on AS 5.0.1 does not support them (svn merge -r 13310:13309 .) Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-22 07:19:59 UTC (rev 13312) +++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-22 07:43:10 UTC (rev 13313) @@ -81,7 +81,6 @@ { private static final Logger log = Logger.getLogger(CXFHandlerResolverImpl.class); - @SuppressWarnings("rawtypes") private final Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>(); private final String handlerFile; private static JAXBContext context; @@ -98,7 +97,6 @@ this.bus = bus; } - @SuppressWarnings("rawtypes") public List<Handler> getHandlerChain(PortInfo portInfo) { List<Handler> handlerChain = handlerMap.get(portInfo); @@ -124,7 +122,7 @@ * the case where no injections were requested, the runtime MUST invoke the * method carrying a javax.annotation .PostConstruct annotation, if present. */ - private void configHandler(@SuppressWarnings("rawtypes") Handler handler) { + private void configHandler(Handler handler) { if (handler != null) { ResourceManager resourceManager = bus.getExtension(ResourceManager.class); List<ResourceResolver> resolvers = resourceManager.getResourceResolvers(); @@ -140,7 +138,6 @@ return this.getInputStream(this.handlerFile, this.clazz); } - @SuppressWarnings("rawtypes") public List<Handler> createHandlerChain(PortInfo portInfo, QName portQName, QName serviceQName, String bindingID) { List<Handler> chain = new ArrayList<Handler>(); InputStream is = getInputStream(); @@ -155,6 +152,7 @@ if (!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI()) || !"handler-chains".equals(el.getLocalName())) { + String xml = XMLUtils.toString(el); throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chains element expected"); } chain = new ArrayList<Handler>(); @@ -165,6 +163,7 @@ if (!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee") || !el.getLocalName().equals("handler-chain")) { + String xml = XMLUtils.toString(el); throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chain element expected"); } processHandlerChainElement(el, chain, portQName, serviceQName, bindingID); @@ -187,7 +186,7 @@ return sortHandlers(chain); } - private void processHandlerChainElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain, + private void processHandlerChainElement(Element el, List<Handler> chain, QName portQName, QName serviceQName, String bindingID) { Node node = el.getFirstChild(); while (node != null) { @@ -270,7 +269,6 @@ return true; } - @SuppressWarnings("rawtypes") public List<Handler> sortHandlers(List<Handler> handlers) { List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>(); @@ -293,8 +291,7 @@ private InputStream getInputStream(String filename, Class<?> wsClass) { URL fileURL = null; - if (log.isDebugEnabled()) - log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); + log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); // Try the filename as URL try @@ -324,11 +321,8 @@ // Try the filename as Resource if (fileURL == null) { - if (log.isDebugEnabled()) - { - log.debug(wsClass.getProtectionDomain().getCodeSource()); - log.debug(wsClass.getClassLoader()); - } + log.debug(wsClass.getProtectionDomain().getCodeSource()); + log.debug(wsClass.getClassLoader()); fileURL = wsClass.getClassLoader().getResource(filename); } @@ -360,7 +354,7 @@ } } - private void processHandlerElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain) { + private void processHandlerElement(Element el, List<Handler> chain) { try { JAXBContext ctx = getContextForPortComponentHandlerType(); PortComponentHandlerType pt = ctx.createUnmarshaller() Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-22 07:19:59 UTC (rev 13312) +++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-22 07:43:10 UTC (rev 13313) @@ -32,6 +32,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.ReferenceParametersType; import org.apache.cxf.ws.addressing.RelatesToType; +import org.jboss.logging.Logger; import org.jboss.wsf.common.addressing.MAP; import org.jboss.wsf.common.addressing.MAPBuilder; import org.jboss.wsf.common.addressing.MAPEndpoint; @@ -50,6 +51,8 @@ */ public class CXFMAP implements MAP { + private static final Logger log = Logger.getLogger(CXFMAP.class); + /** * the wrapped instance which this class delegates to */ Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-22 07:19:59 UTC (rev 13312) +++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-22 07:43:10 UTC (rev 13313) @@ -73,7 +73,7 @@ @Override public void stop(Deployment dep) { - log.debugf("Undeploying jms endpoints in %s", dep.getSimpleName()); + log.debug("Undeploying jms endpoints in " + dep.getSimpleName()); if (dep.getAttachment(Bus.class) != null) { Bus bus = dep.getAttachment(Bus.class); Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-22 07:19:59 UTC (rev 13312) +++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-22 07:43:10 UTC (rev 13313) @@ -186,12 +186,12 @@ } } String urlStr = uriScheme + "://" + host + port + path; - log.debugf("Rewritten new candidate service endpoint address '%s' to '%s'", s, urlStr); + log.debug("Rewritten new candidate service endpoint address '" + s + "' to '" + urlStr + "'"); return urlStr; } catch (Exception e) { - log.debugf("Invalid url provided, using it without rewriting: %s", s); + log.debug("Invalid url provided, using it without rewriting: " + s); return s; } }