Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1d904eda Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1d904eda Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1d904eda Branch: refs/heads/1.3.x-fixes Commit: 1d904eda8a7ca4236cff7bb1bc6cc022581fa939 Parents: 1879daf Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Nov 8 14:48:44 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Nov 8 14:48:44 2016 +0000 ---------------------------------------------------------------------- services/sts/src/main/webapp/WEB-INF/ldap.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1d904eda/services/sts/src/main/webapp/WEB-INF/ldap.xml ---------------------------------------------------------------------- diff --git a/services/sts/src/main/webapp/WEB-INF/ldap.xml b/services/sts/src/main/webapp/WEB-INF/ldap.xml index 8b36f86..9ee9807 100644 --- a/services/sts/src/main/webapp/WEB-INF/ldap.xml +++ b/services/sts/src/main/webapp/WEB-INF/ldap.xml @@ -102,7 +102,7 @@ </bean> <jaxws:endpoint id="transportSTS1" implementor="#transportSTSProviderBean" - address="/REALMA/STSServiceTransportUT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" + address="/STSService" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port"> <jaxws:properties>
