10:45 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2010-11-19 11:45:10 -0500 (Fri, 19 Nov 2010)
New Revision: 13310
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] svn merge -r 13308:13309 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
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-19
16:41:21 UTC (rev 13309)
+++
stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-19
16:45:10 UTC (rev 13310)
@@ -81,6 +81,7 @@
{
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;
@@ -97,6 +98,7 @@
this.bus = bus;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain(PortInfo portInfo)
{
List<Handler> handlerChain = handlerMap.get(portInfo);
@@ -122,7 +124,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(Handler handler) {
+ private void configHandler(@SuppressWarnings("rawtypes") Handler handler) {
if (handler != null) {
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
List<ResourceResolver> resolvers =
resourceManager.getResourceResolvers();
@@ -138,6 +140,7 @@
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();
@@ -152,7 +155,6 @@
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>();
@@ -163,7 +165,6 @@
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);
@@ -186,7 +187,7 @@
return sortHandlers(chain);
}
- private void processHandlerChainElement(Element el, List<Handler> chain,
+ private void processHandlerChainElement(Element el,
@SuppressWarnings("rawtypes") List<Handler> chain,
QName portQName, QName serviceQName, String bindingID) {
Node node = el.getFirstChild();
while (node != null) {
@@ -269,6 +270,7 @@
return true;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> sortHandlers(List<Handler> handlers) {
List<LogicalHandler> logicalHandlers = new
ArrayList<LogicalHandler>();
@@ -291,7 +293,8 @@
private InputStream getInputStream(String filename, Class<?> wsClass)
{
URL fileURL = null;
- log.debug("processHandlerChain [" + filename + "] on: " +
wsClass.getName());
+ if (log.isDebugEnabled())
+ log.debug("processHandlerChain [" + filename + "] on: " +
wsClass.getName());
// Try the filename as URL
try
@@ -321,8 +324,11 @@
// Try the filename as Resource
if (fileURL == null)
{
- log.debug(wsClass.getProtectionDomain().getCodeSource());
- log.debug(wsClass.getClassLoader());
+ if (log.isDebugEnabled())
+ {
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
+ }
fileURL = wsClass.getClassLoader().getResource(filename);
}
@@ -354,7 +360,7 @@
}
}
- private void processHandlerElement(Element el, List<Handler> chain) {
+ private void processHandlerElement(Element el, @SuppressWarnings("rawtypes")
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-19
16:41:21 UTC (rev 13309)
+++
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-19
16:45:10 UTC (rev 13310)
@@ -32,7 +32,6 @@
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;
@@ -51,8 +50,6 @@
*/
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-19
16:41:21 UTC (rev 13309)
+++
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-19
16:45:10 UTC (rev 13310)
@@ -73,7 +73,7 @@
@Override
public void stop(Deployment dep)
{
- log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
+ log.debugf("Undeploying jms endpoints in %s", 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-19
16:41:21 UTC (rev 13309)
+++
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-19
16:45:10 UTC (rev 13310)
@@ -186,12 +186,12 @@
}
}
String urlStr = uriScheme + "://" + host + port + path;
- log.debug("Rewritten new candidate service endpoint address '" + s
+ "' to '" + urlStr + "'");
+ log.debugf("Rewritten new candidate service endpoint address '%s'
to '%s'", s, urlStr);
return urlStr;
}
catch (Exception e)
{
- log.debug("Invalid url provided, using it without rewriting: " + s);
+ log.debugf("Invalid url provided, using it without rewriting: %s",
s);
return s;
}
}