Author: coheigea
Date: Mon Nov 26 13:43:23 2012
New Revision: 1413612
URL: http://svn.apache.org/viewvc?rev=1413612&view=rev
Log:
Merged revisions 1413591 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1413591 | coheigea | 2012-11-26 13:12:00 +0000 (Mon, 26 Nov 2012) | 2 lines
Fixing STS wsdls
........
Modified:
cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl
Modified:
cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl?rev=1413612&r1=1413611&r2=1413612&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
Mon Nov 26 13:43:23 2012
@@ -11,7 +11,6 @@
xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
- >
<wsdl:types>
<xs:schema elementFormDefault="qualified"
targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
Modified:
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1413612&r1=1413611&r2=1413612&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
Mon Nov 26 13:43:23 2012
@@ -12,7 +12,6 @@
xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
- >
<wsdl:types>
<xs:schema elementFormDefault="qualified"
targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
Modified:
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl?rev=1413612&r1=1413611&r2=1413612&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
Mon Nov 26 13:43:23 2012
@@ -12,7 +12,6 @@
xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
- >
<wsdl:types>
<xs:schema elementFormDefault="qualified"
targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
Modified:
cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1413612&r1=1413611&r2=1413612&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
Mon Nov 26 13:43:23 2012
@@ -11,7 +11,6 @@
xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
- >
<wsdl:types>
<xs:schema elementFormDefault="qualified"
targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
Modified:
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl?rev=1413612&r1=1413611&r2=1413612&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl
(original)
+++
cxf/branches/2.6.x-fixes/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl
Mon Nov 26 13:43:23 2012
@@ -11,7 +11,6 @@
xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
- >
<wsdl:types>
<xs:schema elementFormDefault="qualified"
targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'>
@@ -310,4 +309,4 @@
</wsp:ExactlyOne>
</wsp:Policy>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>