Author: dkulp
Date: Thu Sep 11 13:39:32 2008
New Revision: 694466
URL: http://svn.apache.org/viewvc?rev=694466&view=rev
Log:
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 11 13:39:32 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,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499
+/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,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd?rev=694466&r1=694465&r2=694466&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
(original)
+++
cxf/branches/2.1.x-fixes/common/common/src/main/resources/schemas/configuration/cxf-beans.xsd
Thu Sep 11 13:39:32 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