Author: dkulp Date: Thu Sep 11 14:17:48 2008 New Revision: 694487 URL: http://svn.apache.org/viewvc?rev=694487&view=rev Log: Merged revisions 694466 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r694466 | dkulp | 2008-09-11 16:39:32 -0400 (Thu, 11 Sep 2008) | 9 lines Merged revisions 693653 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r693653 | ericjohnson | 2008-09-09 19:08:23 -0400 (Tue, 09 Sep 2008) | 1 line added comments clarifying the use of the attributes ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 11 14:17:48 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Sep 11 14:17:48 2008 @@ -1 +1 @@ -/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500 +/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500,694466 Modified: cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=694487&r1=694486&r2=694487&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd (original) +++ cxf/branches/2.0.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd Thu Sep 11 14:17:48 2008 @@ -30,6 +30,7 @@ <xsd:attribute name="name" type="xsd:string"> <xsd:annotation> <xsd:documentation> + A unique identifier for the bean. This can also be a list of identifiers. See documentation for attribute name in attribute group beanAttributes in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd </xsd:documentation> @@ -38,6 +39,9 @@ <xsd:attribute name="abstract" type="xsd:boolean"> <xsd:annotation> <xsd:documentation> + Specifies if the bean is an abstract bean. Abstract beans act as parents for + concrete bean definitions and are not instantiated. The default is "false". + Setting this to "true" instructs the bean factory not to instantiate the bean, See documentation for attribute abstract in attribute group beanAttributes in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd </xsd:documentation> @@ -46,6 +50,8 @@ <xsd:attribute name="depends-on" type="xsd:string"> <xsd:annotation> <xsd:documentation> + A list of beans that the bean depends on being instantiated before the bean + can be instantiated. See documentation for attribute depends-on in attribute group beanAttributes in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd </xsd:documentation> @@ -54,6 +60,12 @@ <xsd:attribute name="createdFromAPI" type="xsd:boolean"> <xsd:annotation> <xsd:documentation> + Specifies that the user created that bean using CXF APIs like + Endpoint.publish or Service.getPort. + The default is "false". + Setting this to "true" does the following: Changes the internal name of the + bean by appending either ".jaxws-client" or ".jaxws-endpoint" to the bean's + id. Make the bean abstract. See documentation for attribute abstract in attribute group beanAttributes in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd </xsd:documentation> @@ -66,4 +78,4 @@ <xsd:attribute name="bean" type="xsd:string"/> </xsd:complexType> -</xsd:schema> +</xsd:schema> \ No newline at end of file
