cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] git commit: Improving logging a bit in the STS
Date Mon, 23 Jun 2014 11:42:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes b90489c90 -> fdd9c9707


Improving logging a bit in the STS


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b86d56a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b86d56a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b86d56a1

Branch: refs/heads/2.7.x-fixes
Commit: b86d56a10d41f3e470db2105775aec2b16178628
Parents: b90489c
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Jun 23 12:28:34 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Jun 23 12:42:28 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b86d56a1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 70cc175..f2cda23 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -491,6 +491,8 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
         if (location != null) {
             location = location.trim();
         }
+        LOG.fine("EPR address: " + location);
+        
         final QName sName = EndpointReferenceUtils.getServiceName(ref, bus);
         if (sName != null) {
             serviceName = sName;
@@ -498,12 +500,15 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
             if (epName != null) {
                 endpointName = epName;
             }
+            LOG.fine("EPR endpoint: " + serviceName + " " + endpointName);
         }
         final String wsdlLoc = EndpointReferenceUtils.getWSDLLocation(ref);
         if (wsdlLoc != null) {
             wsdlLocation = wsdlLoc;
         }
+        
         String mexLoc = findMEXLocation(ref, useEPRWSAAddrAsMEXLocation);
+        LOG.fine("WS-MEX location: " + mexLoc);
         if (mexLoc != null) {
             try {
                 JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
@@ -556,6 +561,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                                 if (ei.getAddress().equals(location)) {
                                     endpointName = ei.getName();
                                     serviceName = serv.getName();
+                                    LOG.fine("Matched endpoint to location");
                                 }
                             }
                         }
@@ -564,6 +570,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                     EndpointInfo ei = service.getEndpointInfo(endpointName);
                     if (ei == null && anonymousAddress.equals(location)
                         && !services.isEmpty() && !services.get(0).getEndpoints().isEmpty())
{
+                        LOG.fine("Anonymous location so taking first endpoint");
                         serviceName = services.get(0).getName();
                         endpointName = services.get(0).getEndpoints().iterator().next().getName();
                         ei = service.getEndpointInfo(endpointName);
@@ -658,7 +665,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
         for (BindingOperationInfo boi : bi.getOperations()) {
             SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);
             String soapAction = soi != null ? soi.getAction() : null;
-            Object o  = boi.getOperationInfo().getInput()
+            Object o = boi.getOperationInfo().getInput()
                     .getExtensionAttribute(new QName("http://www.w3.org/2007/05/addressing/metadata",
                                                      "Action"));
             if (o instanceof QName) {


Mime
View raw message