You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/06/08 09:08:00 UTC
svn commit: r545444 - in /incubator/cxf/trunk:
common/common/src/main/resources/schemas/configuration/
rt/transports/http/src/main/resources/schemas/configuration/
rt/transports/http/src/main/resources/schemas/wsdl/
Author: andreasmyth
Date: Fri Jun 8 00:07:59 2007
New Revision: 545444
URL: http://svn.apache.org/viewvc?view=rev&rev=545444
Log:
Moved definition of ClassOrBeanType from http-conf.xsd into cxf-beans.xsd as it has nothing to do with http.
Removed definition of obsolete types from http-conf.xsd
Removed:
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
Modified:
incubator/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Modified: incubator/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?view=diff&rev=545444&r1=545443&r2=545444
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd (original)
+++ incubator/cxf/trunk/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd Fri Jun 8 00:07:59 2007
@@ -53,4 +53,9 @@
</xsd:attribute>
</xsd:attributeGroup>
+ <xsd:complexType name="ClassOrBeanType">
+ <xsd:attribute name="class" type="xsd:string"/>
+ <xsd:attribute name="bean" type="xsd:string"/>
+ </xsd:complexType>
+
</xsd:schema>
Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?view=diff&rev=545444&r1=545443&r2=545444
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd Fri Jun 8 00:07:59 2007
@@ -42,28 +42,13 @@
<xs:import namespace="http://cxf.apache.org/configuration/beans"
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
- <!-- This are already defined as it can appear in WSDL
- <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
- <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
- ** The following are in the WSDL http-conf.xsd file because
- ** they need to be generated.
- ** Destination Specific Items **
- <xs:element name="contextMatchStrategy" type="xs:string" default="stem"/>
- <xs:element name="fixedParameterOrder" type="xs:boolean" default="false"/>
-
- <xs:complexType name="ClassOrBeanType">
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="bean" type="xs:string"/>
- </xs:complexType>
- -->
-
<!-- Conduit Specific Items -->
<xs:element name="authorization" type="sec:AuthorizationPolicy"/>
<xs:element name="proxyAuthorization" type="sec:ProxyAuthorizationPolicy"/>
<xs:element name="tlsClientParameters" type="sec:TLSClientParametersType"/>
- <xs:element name="trustDecider" type="http-conf:ClassOrBeanType"/>
- <xs:element name="basicAuthSupplier" type="http-conf:ClassOrBeanType"/>
+ <xs:element name="trustDecider" type="cxf-beans:ClassOrBeanType"/>
+ <xs:element name="basicAuthSupplier" type="cxf-beans:ClassOrBeanType"/>
<xs:element name="conduit">
Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?view=diff&rev=545444&r1=545443&r2=545444
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Fri Jun 8 00:07:59 2007
@@ -32,15 +32,9 @@
<xs:element name="server" type="http-conf:HTTPServerPolicy"/>
<xs:element name="client" type="http-conf:HTTPClientPolicy"/>
- <xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
<xs:element name="contextMatchStrategy" type="xs:string" default="stem"/>
<xs:element name="fixedParameterOrder" type="xs:boolean" default="false"/>
- <xs:complexType name="ClassOrBeanType">
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="bean" type="xs:string"/>
- </xs:complexType>
-
<xs:complexType name="HTTPServerPolicy">
<xs:annotation>
<xs:documentation>HTTP Server configuration properties.
@@ -358,40 +352,6 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="HTTPListenerPolicy">
- <xs:sequence>
- <xs:element name="MinThreads" type="xs:unsignedShort" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Minumum threads waiting to service requests.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxThreads" type="xs:unsignedShort" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Maximum thread that will service requests.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxIdleTimeMs" type="xs:unsignedInt" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Time for an idle thread to wait for a request or read.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LowResourcePersistTimeMs" type="xs:unsignedInt" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Time in ms that connections will persist if listener is low on resources.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
-
<xs:simpleType name="serverCacheControlType">
<xs:restriction base="xs:string">
<xs:enumeration value="no-cache"/>