You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2012/05/10 13:21:29 UTC
svn commit: r1336595 - in /cxf/branches/2.5.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/
rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/
rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/
Author: asoldano
Date: Thu May 10 11:21:29 2012
New Revision: 1336595
URL: http://svn.apache.org/viewvc?rev=1336595&view=rev
Log:
Merged revisions 1336589 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1336589 | asoldano | 2012-05-10 13:11:14 +0200 (Thu, 10 May 2012) | 2 lines
[CXF-4304] Complete WSA support for STS client configuration via EPR
........
Added:
cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
- copied, changed from r1336589, cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
cxf/branches/2.5.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/
- copied from r1336589, cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/
cxf/branches/2.5.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/epr.xml
- copied unchanged from r1336589, cxf/trunk/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/sts/epr.xml
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1336589
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1336595&r1=1336594&r2=1336595&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Thu May 10 11:21:29 2012
@@ -437,6 +437,18 @@ public class STSClient implements Config
return;
}
location = EndpointReferenceUtils.getAddress(ref);
+ final QName sName = EndpointReferenceUtils.getServiceName(ref, bus);
+ if (sName != null) {
+ serviceName = sName;
+ final QName epName = EndpointReferenceUtils.getPortQName(ref, bus);
+ if (epName != null) {
+ endpointName = epName;
+ }
+ }
+ final String wsdlLoc = EndpointReferenceUtils.getWSDLLocation(ref);
+ if (wsdlLoc != null) {
+ wsdlLocation = wsdlLoc;
+ }
String mexLoc = findMEXLocation(ref);
if (mexLoc != null) {
try {
@@ -486,7 +498,7 @@ public class STSClient implements Config
}
}
}
- return EndpointReferenceUtils.getAddress(ref);
+ return null;
}
protected String findMEXLocation(Element ref) {
Element el = DOMUtils.getFirstElement(ref);
Copied: cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java (from r1336589, cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java?p2=cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java&p1=cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java&r1=1336589&r2=1336595&rev=1336595&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java Thu May 10 11:21:29 2012
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.common.jaxb.JAXBContextCache;
+import org.apache.cxf.jaxb.JAXBContextCache;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.security.trust.STSClient;
import org.junit.Assert;