Author: dkulp
Date: Mon Feb 6 21:32:10 2012
New Revision: 1241189
URL: http://svn.apache.org/viewvc?rev=1241189&view=rev
Log:
Merged revisions 1240059 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1240059 | cschneider | 2012-02-03 05:05:04 -0500 (Fri, 03 Feb 2012) | 1 line
CXF-4080 Removing basicAuthSupplier element from conduit schema as it did not
work and was deprecated since some time
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1240059
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=1241189&r1=1241188&r2=1241189&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Mon Feb 6 21:32:10 2012
@@ -49,8 +49,6 @@
<xs:element name="tlsClientParameters" type="sec:TLSClientParametersType"/>
<xs:element name="trustDecider" type="cxf-beans:ClassOrBeanType"/>
<xs:element name="authSupplier" type="cxf-beans:ClassOrBeanType"/>
- <xs:element name="basicAuthSupplier" type="cxf-beans:ClassOrBeanType"/>
-
<xs:element name="conduit">
<xs:complexType>
@@ -101,18 +99,6 @@
of an object that supplies Auth information
both preemptively and in response to a 401 HTTP
Challenge. This class must extend the abstract class
- org.apache.cxf.transport.http.HttpAuthSupplier.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element ref="http-conf:basicAuthSupplier"
- minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>
- Holds the bean reference or class name
- of an object that supplies Auth information
- both preemptively and in response to a 401 HTTP
- Challenge. This class must extend the abstract class
org.apache.cxf.transport.http.HttpBasicAuthSupplier.
</xs:documentation>
</xs:annotation>
