Author: ningjiang
Date: Sun Nov 9 18:15:17 2008
New Revision: 712599
URL: http://svn.apache.org/viewvc?rev=712599&view=rev
Log:
Merged revisions 712299 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r712299 | ericjohnson | 2008-11-08 06:43:27 +0800 (Sat, 08 Nov 2008) | 2 lines
added some annotations
cleaned up a javadoc comment
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/binding/Binding.java
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 9 18:15:17 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710150,710154,711490,71197
5,712194,712198,712238,712272
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710150,710154,711490,71197
5,712194,712198,712238,712272,712299
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/binding/Binding.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/binding/Binding.java?rev=712599&r1=712598&r2=712599&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/binding/Binding.java
(original)
+++
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/binding/Binding.java
Sun Nov 9 18:15:17 2008
@@ -44,7 +44,8 @@
Message createMessage(Message m);
/**
- * Get the BindingInfor
+ * Get the BindingInfo for this binding.
+ *
* @return the BingdingInfo Object
*/
BindingInfo getBindingInfo();
Modified:
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java?rev=712599&r1=712598&r2=712599&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
(original)
+++
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
Sun Nov 9 18:15:17 2008
@@ -25,7 +25,7 @@
/**
- * Strategy for retreival of a Conduit to mediate an outbound message.
+ * Strategy for retreiving a Conduit to mediate an outbound message.
* A specific instance implementing a particular strategy may be injected
* into the Client via config.
*/
@@ -65,7 +65,7 @@
Endpoint getEndpoint();
/**
- * @param endpoint the endpoint to encapsulate
+ * @param endpoint the Endpoint to encapsulate
*/
void setEndpoint(Endpoint endpoint);
}
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd?rev=712599&r1=712598&r2=712599&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
Sun Nov 9 18:15:17 2008
@@ -40,8 +40,16 @@
<jaxb:class
implClass="org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl"/>
</xs:appinfo>
</xs:annotation>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="type" type="xs:QName" use="required"/>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies a name for the mapped type.
Typically this name is derived from the XML Schema type being
mapped.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="type" type="xs:QName" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the XML Schema type being
mapped to the CORBA type.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="qualified" type="xs:boolean" />
</xs:complexType>
<xs:complexType name="namedType">
@@ -50,7 +58,11 @@
</xs:annotation>
<xs:complexContent>
<xs:extension base="corba:corbaType">
- <xs:attribute name="repositoryID"
type="xs:string" use="required"/>
+ <xs:attribute name="repositoryID"
type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the fully
qualified repository ID of the CORBA type being mapped.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=712599&r1=712598&r2=712599&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Sun Nov 9 18:15:17 2008
@@ -34,7 +34,7 @@
<xs:attribute name="rootNode" type="xs:QName"
use="optional">
<xs:annotation>
- <xs:documentation>The QName of
the root element used to wrap the message passed across the
wire</xs:documentation>
+ <xs:documentation>Specifies the
QName of the root element used to wrap the message passed across the
wire</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
@@ -57,7 +57,7 @@
</xs:element>
<xs:element name="binding" type="xformat:XMLFormatBinding">
<xs:annotation>
- <xs:documentation>Specifies that the messages are
mapped to XML documents</xs:documentation>
+ <xs:documentation>Specifies that the messages are
mapped to XML documents.</xs:documentation>
</xs:annotation>
</xs:element>
