hlship      2004/05/20 16:56:54

  Modified:    framework/src/test-data/TestConstructRegistry testSDL.xml
                        testUptoDate.xml testBasic.xml testJars.xml
  Log:
  Update tests due to use of Xerces packaged with Ant 1.6.
  
  Revision  Changes    Path
  1.3       +48 -48    
jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testSDL.xml
  
  Index: testSDL.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testSDL.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testSDL.xml       13 May 2004 11:04:44 -0000      1.2
  +++ testSDL.xml       20 May 2004 23:56:54 -0000      1.3
  @@ -1,18 +1,18 @@
   <?xml version="1.0"?>
   <registry>
       <module id="hivemind" uid="1" version="1.0.0">
  -        <description uid="2"><![CDATA[The master module for HiveMind, 
defining core, universal functionality.]]></description>
  +        <description uid="2">The master module for HiveMind, defining core, 
universal functionality.</description>
           <schema id="hivemind.SymbolSource" uid="3">
               <element name="source">
  -                <description><![CDATA[Describes a single source of symbol 
values.]]></description>
  +                <description>Describes a single source of symbol 
values.</description>
                   <attribute name="order">
  -                    <description><![CDATA[A number used to set the order in 
which sources are checked.]]></description>
  +                    <description>A number used to set the order in which 
sources are checked.</description>
                   </attribute>
                   <attribute name="class">
  -                    <description><![CDATA[Name of a class implementing the 
SymbolSource interface.]]></description>
  +                    <description>Name of a class implementing the 
SymbolSource interface.</description>
                   </attribute>
                   <attribute name="service-id">
  -                    <description><![CDATA[Service configuration id for a 
service which implements the SymbolSource interface.]]></description>
  +                    <description>Service configuration id for a service 
which implements the SymbolSource interface.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.SymbolSourceContribution">
                       <map attribute="class" property="source" 
translator="object"/>
  @@ -22,7 +22,7 @@
           </schema>
           <configuration-point id="hivemind.SymbolSource"
               schema-id="hivemind.SymbolSource" uid="4">
  -            <description><![CDATA[Provides a list of sources for vlaues of 
substitution symbols.]]></description>
  +            <description>Provides a list of sources for vlaues of 
substitution symbols.</description>
           </configuration-point>
           <contribution configuration-id="hivemind.SymbolSource" uid="5">
               <source order="900000" 
service-id="ApplicationDefaultsSymbolSource"/>
  @@ -30,27 +30,27 @@
           </contribution>
           <schema id="hivemind.Defaults" uid="6">
               <element name="default">
  -                <description><![CDATA[Provides a default symbol 
value.]]></description>
  +                <description>Provides a default symbol value.</description>
                   <attribute name="symbol" required="true">
  -                    <description><![CDATA[The id of the symbol to define a 
default value for.]]></description>
  +                    <description>The id of the symbol to define a default 
value for.</description>
                   </attribute>
                   <attribute name="value" required="true">
  -                    <description><![CDATA[The value for the 
symbol.]]></description>
  +                    <description>The value for the symbol.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.service.impl.FactoryDefault"/>
               </element>
           </schema>
           <configuration-point id="hivemind.FactoryDefaults"
               schema-id="hivemind.Defaults" uid="7">
  -            <description><![CDATA[Extension point for setting "factory 
defaults" for symbol values.]]></description>
  +            <description>Extension point for setting "factory defaults" for 
symbol values.</description>
           </configuration-point>
           <configuration-point id="hivemind.ApplicationDefaults"
               schema-id="hivemind.Defaults" uid="8">
  -            <description><![CDATA[Extension point for setting application 
defaults; these defaults will override factory defaults specified in the 
FactoryDefaults configuration point.]]></description>
  +            <description>Extension point for setting application defaults; 
these defaults will override factory defaults specified in the FactoryDefaults 
configuration point.</description>
           </configuration-point>
           <service-point id="hivemind.FactoryDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="9">
  -            <description><![CDATA[SymbolSource implementation driven by the 
FactoryDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
FactoryDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -61,7 +61,7 @@
           </service-point>
           <service-point id="hivemind.ApplicationDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="10">
  -            <description><![CDATA[SymbolSource implementation driven by the 
ApplicationDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
ApplicationDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -72,13 +72,13 @@
           </service-point>
           <service-point id="hivemind.ClassFactory"
               interface="org.apache.hivemind.service.ClassFactory" uid="11">
  -            <description><![CDATA[Wrapper around Javassist used to 
dynamically create classes such as service interceptors.]]></description>
  +            <description>Wrapper around Javassist used to dynamically create 
classes such as service interceptors.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.ClassFactoryImpl" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.LoggingInterceptor"
               interface="org.apache.hivemind.ServiceInterceptorFactory" 
uid="12">
  -            <description><![CDATA[An interceptor factory for adding 
method-level logging to a service. Logging occurs at level DEBUG and uses the 
service id as the logger. Method entry (with parameters) and method exit (with 
return value) are logged, as are any exceptions.]]></description>
  +            <description>An interceptor factory for adding method-level 
logging to a service. Logging occurs at level DEBUG and uses the service id as 
the logger. Method entry (with parameters) and method exit (with return value) 
are logged, as are any exceptions.</description>
               <invoke-factory model="primitive" 
service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.LoggingInterceptorFactory" 
service-id-property="serviceId">
  @@ -88,18 +88,18 @@
           </service-point>
           <schema id="hivemind.BuilderFactory" uid="13">
               <element name="construct">
  -                <description><![CDATA[A single construct element identifies 
the class to instantiate.]]></description>
  +                <description>A single construct element identifies the class 
to instantiate.</description>
                   <attribute name="class" required="true">
  -                    <description><![CDATA[The name of the class to 
instantiate.]]></description>
  +                    <description>The name of the class to 
instantiate.</description>
                   </attribute>
                   <attribute name="messages-property">
  -                    <description><![CDATA[The name of a property to assign 
to invoking module's messages to.]]></description>
  +                    <description>The name of a property to assign to 
invoking module's messages to.</description>
                   </attribute>
                   <attribute name="log-property">
  -                    <description><![CDATA[The name of a property to assign 
the Log instance for the service to. The Log instance is built from the service 
configuration point id.]]></description>
  +                    <description>The name of a property to assign the Log 
instance for the service to. The Log instance is built from the service 
configuration point id.</description>
                   </attribute>
                   <attribute name="service-id-property">
  -                    <description><![CDATA[The name of a property to assign 
the configuration point id of the service to.]]></description>
  +                    <description>The name of a property to assign the 
configuration point id of the service to.</description>
                   </attribute>
                   <rules>
                       <create-object 
class="org.apache.hivemind.service.impl.BuilderParameter"/>
  @@ -116,7 +116,7 @@
                       <invoke-parent depth="3" method="addProperty"/>
                   </rules>
                   <element name="string">
  -                    <description><![CDATA[A string value constructor 
parameter.]]></description>
  +                    <description>A string value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value"/>
  @@ -124,7 +124,7 @@
                       </rules>
                   </element>
                   <element name="int">
  -                    <description><![CDATA[An integer value constructor 
parameter.]]></description>
  +                    <description>An integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="int"/>
  @@ -132,7 +132,7 @@
                       </rules>
                   </element>
                   <element name="long">
  -                    <description><![CDATA[A long (64-bit) integer value 
constructor parameter.]]></description>
  +                    <description>A long (64-bit) integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="long"/>
  @@ -140,7 +140,7 @@
                       </rules>
                   </element>
                   <element name="boolean">
  -                    <description><![CDATA[A boolean value constructor 
parameter.]]></description>
  +                    <description>A boolean value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="enumeration,java.lang.Boolean,true=TRUE,false=FALSE"/>
  @@ -148,7 +148,7 @@
                       </rules>
                   </element>
                   <element name="service">
  -                    <description><![CDATA[A constructor parameter providing 
the identified HiveMind service.]]></description>
  +                    <description>A constructor parameter providing the 
identified HiveMind service.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="service"/>
  @@ -156,7 +156,7 @@
                       </rules>
                   </element>
                   <element name="configuration">
  -                    <description><![CDATA[A constructor parameter providing 
a HiveMind configuration point (as a List).]]></description>
  +                    <description>A constructor parameter providing a 
HiveMind configuration point (as a List).</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="configuration"/>
  @@ -164,7 +164,7 @@
                       </rules>
                   </element>
                   <element name="resource">
  -                    <description><![CDATA[A Resource constructor 
parameter.]]></description>
  +                    <description>A Resource constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="resource"/>
  @@ -172,33 +172,33 @@
                       </rules>
                   </element>
                   <element name="log">
  -                    <description><![CDATA[Placeholder for a Log instance for 
the constructed service as constructor parameter.]]></description>
  +                    <description>Placeholder for a Log instance for the 
constructed service as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderLogFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="messages">
  -                    <description><![CDATA[Placeholder for a Messages object 
(from the invoking module) as constructor parameter.]]></description>
  +                    <description>Placeholder for a Messages object (from the 
invoking module) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderMessagesFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="service-id">
  -                    <description><![CDATA[Placeholder for the service id (of 
the constructed service) as constructor parameter.]]></description>
  +                    <description>Placeholder for the service id (of the 
constructed service) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderServiceIdFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="set">
  -                    <description><![CDATA[Configures a property of the 
service instance.]]></description>
  +                    <description>Configures a property of the service 
instance.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of a property of the 
service instance to configure.]]></description>
  +                        <description>The name of a property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="value" required="true">
  -                        <description><![CDATA[The value to set the property 
to. The value will be converted to the type of the property.]]></description>
  +                        <description>The value to set the property to. The 
value will be converted to the type of the property.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderSmartPropertyFacet"/>
  @@ -208,12 +208,12 @@
                       </rules>
                   </element>
                   <element name="set-service">
  -                    <description><![CDATA[Configures a property of the 
service instance to another service.]]></description>
  +                    <description>Configures a property of the service 
instance to another service.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The id of the 
service.]]></description>
  +                        <description>The id of the service.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -224,12 +224,12 @@
                       </rules>
                   </element>
                   <element name="set-configuration">
  -                    <description><![CDATA[Configures a property of the 
service instance to the elements contributed to an configuration 
point.]]></description>
  +                    <description>Configures a property of the service 
instance to the elements contributed to an configuration point.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="configuration-id" required="true">
  -                        <description><![CDATA[The id of the configuration 
point to access.]]></description>
  +                        <description>The id of the configuration point to 
access.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -240,12 +240,12 @@
                       </rules>
                   </element>
                   <element name="set-resource">
  -                    <description><![CDATA[Configures a property of the 
service instance to a resource.]]></description>
  +                    <description>Configures a property of the service 
instance to a resource.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="path" required="true">
  -                        <description><![CDATA[The path, relative to the 
module's deployment descriptor, of the resource.]]></description>
  +                        <description>The path, relative to the module's 
deployment descriptor, of the resource.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -256,12 +256,12 @@
                       </rules>
                   </element>
                   <element name="event-listener">
  -                    <description><![CDATA[Registers the new services as an 
event listener for events produced by the specified service.]]></description>
  +                    <description>Registers the new services as an event 
listener for events produced by the specified service.</description>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The service which will produce 
events.]]></description>
  +                        <description>The service which will produce 
events.</description>
                       </attribute>
                       <attribute name="event-set">
  -                        <description><![CDATA[If given, the name of an event 
set for which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.]]></description>
  +                        <description>If given, the name of an event set for 
which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.EventRegistration"/>
  @@ -276,18 +276,18 @@
           <service-point id="hivemind.BuilderFactory"
               interface="org.apache.hivemind.ServiceImplementationFactory"
               parameters-schema-id="hivemind.BuilderFactory" uid="14">
  -            <description><![CDATA[Used to construct a service from a class 
name and optional constructor parameters and properties.]]></description>
  +            <description>Used to construct a service from a class name and 
optional constructor parameters and properties.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.BuilderFactory" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.ThreadEventNotifier"
               interface="org.apache.hivemind.service.ThreadEventNotifier" 
uid="15">
  -            <description><![CDATA[Service used by other services to be 
alerted when a thread is cleaned up (typically, at the end of a request or 
transaction).]]></description>
  +            <description>Service used by other services to be alerted when a 
thread is cleaned up (typically, at the end of a request or 
transaction).</description>
               <create-instance 
class="org.apache.hivemind.service.impl.ThreadEventNotifierImpl"/>
           </service-point>
           <service-point id="hivemind.ThreadLocalStorage"
               interface="org.apache.hivemind.service.ThreadLocalStorage" 
uid="16">
  -            <description><![CDATA[Service which manages a thread-local map 
of data items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.]]></description>
  +            <description>Service which manages a thread-local map of data 
items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct 
class="org.apache.hivemind.service.impl.ThreadLocalStorageImpl">
                       <set-service property="notifier" 
service-id="ThreadEventNotifier"/>
  
  
  
  1.6       +48 -48    
jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testUptoDate.xml
  
  Index: testUptoDate.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testUptoDate.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testUptoDate.xml  13 May 2004 11:04:44 -0000      1.5
  +++ testUptoDate.xml  20 May 2004 23:56:54 -0000      1.6
  @@ -1,18 +1,18 @@
   <?xml version="1.0"?>
   <registry>
       <module id="hivemind" uid="1" version="1.0.0">
  -        <description uid="2"><![CDATA[The master module for HiveMind, 
defining core, universal functionality.]]></description>
  +        <description uid="2">The master module for HiveMind, defining core, 
universal functionality.</description>
           <schema id="hivemind.SymbolSource" uid="3">
               <element name="source">
  -                <description><![CDATA[Describes a single source of symbol 
values.]]></description>
  +                <description>Describes a single source of symbol 
values.</description>
                   <attribute name="order">
  -                    <description><![CDATA[A number used to set the order in 
which sources are checked.]]></description>
  +                    <description>A number used to set the order in which 
sources are checked.</description>
                   </attribute>
                   <attribute name="class">
  -                    <description><![CDATA[Name of a class implementing the 
SymbolSource interface.]]></description>
  +                    <description>Name of a class implementing the 
SymbolSource interface.</description>
                   </attribute>
                   <attribute name="service-id">
  -                    <description><![CDATA[Service configuration id for a 
service which implements the SymbolSource interface.]]></description>
  +                    <description>Service configuration id for a service 
which implements the SymbolSource interface.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.SymbolSourceContribution">
                       <map attribute="class" property="source" 
translator="object"/>
  @@ -22,7 +22,7 @@
           </schema>
           <configuration-point id="hivemind.SymbolSource"
               schema-id="hivemind.SymbolSource" uid="4">
  -            <description><![CDATA[Provides a list of sources for vlaues of 
substitution symbols.]]></description>
  +            <description>Provides a list of sources for vlaues of 
substitution symbols.</description>
           </configuration-point>
           <contribution configuration-id="hivemind.SymbolSource" uid="5">
               <source order="900000" 
service-id="ApplicationDefaultsSymbolSource"/>
  @@ -30,27 +30,27 @@
           </contribution>
           <schema id="hivemind.Defaults" uid="6">
               <element name="default">
  -                <description><![CDATA[Provides a default symbol 
value.]]></description>
  +                <description>Provides a default symbol value.</description>
                   <attribute name="symbol" required="true">
  -                    <description><![CDATA[The id of the symbol to define a 
default value for.]]></description>
  +                    <description>The id of the symbol to define a default 
value for.</description>
                   </attribute>
                   <attribute name="value" required="true">
  -                    <description><![CDATA[The value for the 
symbol.]]></description>
  +                    <description>The value for the symbol.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.service.impl.FactoryDefault"/>
               </element>
           </schema>
           <configuration-point id="hivemind.FactoryDefaults"
               schema-id="hivemind.Defaults" uid="7">
  -            <description><![CDATA[Extension point for setting "factory 
defaults" for symbol values.]]></description>
  +            <description>Extension point for setting "factory defaults" for 
symbol values.</description>
           </configuration-point>
           <configuration-point id="hivemind.ApplicationDefaults"
               schema-id="hivemind.Defaults" uid="8">
  -            <description><![CDATA[Extension point for setting application 
defaults; these defaults will override factory defaults specified in the 
FactoryDefaults configuration point.]]></description>
  +            <description>Extension point for setting application defaults; 
these defaults will override factory defaults specified in the FactoryDefaults 
configuration point.</description>
           </configuration-point>
           <service-point id="hivemind.FactoryDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="9">
  -            <description><![CDATA[SymbolSource implementation driven by the 
FactoryDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
FactoryDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -61,7 +61,7 @@
           </service-point>
           <service-point id="hivemind.ApplicationDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="10">
  -            <description><![CDATA[SymbolSource implementation driven by the 
ApplicationDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
ApplicationDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -72,13 +72,13 @@
           </service-point>
           <service-point id="hivemind.ClassFactory"
               interface="org.apache.hivemind.service.ClassFactory" uid="11">
  -            <description><![CDATA[Wrapper around Javassist used to 
dynamically create classes such as service interceptors.]]></description>
  +            <description>Wrapper around Javassist used to dynamically create 
classes such as service interceptors.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.ClassFactoryImpl" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.LoggingInterceptor"
               interface="org.apache.hivemind.ServiceInterceptorFactory" 
uid="12">
  -            <description><![CDATA[An interceptor factory for adding 
method-level logging to a service. Logging occurs at level DEBUG and uses the 
service id as the logger. Method entry (with parameters) and method exit (with 
return value) are logged, as are any exceptions.]]></description>
  +            <description>An interceptor factory for adding method-level 
logging to a service. Logging occurs at level DEBUG and uses the service id as 
the logger. Method entry (with parameters) and method exit (with return value) 
are logged, as are any exceptions.</description>
               <invoke-factory model="primitive" 
service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.LoggingInterceptorFactory" 
service-id-property="serviceId">
  @@ -88,18 +88,18 @@
           </service-point>
           <schema id="hivemind.BuilderFactory" uid="13">
               <element name="construct">
  -                <description><![CDATA[A single construct element identifies 
the class to instantiate.]]></description>
  +                <description>A single construct element identifies the class 
to instantiate.</description>
                   <attribute name="class" required="true">
  -                    <description><![CDATA[The name of the class to 
instantiate.]]></description>
  +                    <description>The name of the class to 
instantiate.</description>
                   </attribute>
                   <attribute name="messages-property">
  -                    <description><![CDATA[The name of a property to assign 
to invoking module's messages to.]]></description>
  +                    <description>The name of a property to assign to 
invoking module's messages to.</description>
                   </attribute>
                   <attribute name="log-property">
  -                    <description><![CDATA[The name of a property to assign 
the Log instance for the service to. The Log instance is built from the service 
configuration point id.]]></description>
  +                    <description>The name of a property to assign the Log 
instance for the service to. The Log instance is built from the service 
configuration point id.</description>
                   </attribute>
                   <attribute name="service-id-property">
  -                    <description><![CDATA[The name of a property to assign 
the configuration point id of the service to.]]></description>
  +                    <description>The name of a property to assign the 
configuration point id of the service to.</description>
                   </attribute>
                   <rules>
                       <create-object 
class="org.apache.hivemind.service.impl.BuilderParameter"/>
  @@ -116,7 +116,7 @@
                       <invoke-parent depth="3" method="addProperty"/>
                   </rules>
                   <element name="string">
  -                    <description><![CDATA[A string value constructor 
parameter.]]></description>
  +                    <description>A string value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value"/>
  @@ -124,7 +124,7 @@
                       </rules>
                   </element>
                   <element name="int">
  -                    <description><![CDATA[An integer value constructor 
parameter.]]></description>
  +                    <description>An integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="int"/>
  @@ -132,7 +132,7 @@
                       </rules>
                   </element>
                   <element name="long">
  -                    <description><![CDATA[A long (64-bit) integer value 
constructor parameter.]]></description>
  +                    <description>A long (64-bit) integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="long"/>
  @@ -140,7 +140,7 @@
                       </rules>
                   </element>
                   <element name="boolean">
  -                    <description><![CDATA[A boolean value constructor 
parameter.]]></description>
  +                    <description>A boolean value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="enumeration,java.lang.Boolean,true=TRUE,false=FALSE"/>
  @@ -148,7 +148,7 @@
                       </rules>
                   </element>
                   <element name="service">
  -                    <description><![CDATA[A constructor parameter providing 
the identified HiveMind service.]]></description>
  +                    <description>A constructor parameter providing the 
identified HiveMind service.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="service"/>
  @@ -156,7 +156,7 @@
                       </rules>
                   </element>
                   <element name="configuration">
  -                    <description><![CDATA[A constructor parameter providing 
a HiveMind configuration point (as a List).]]></description>
  +                    <description>A constructor parameter providing a 
HiveMind configuration point (as a List).</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="configuration"/>
  @@ -164,7 +164,7 @@
                       </rules>
                   </element>
                   <element name="resource">
  -                    <description><![CDATA[A Resource constructor 
parameter.]]></description>
  +                    <description>A Resource constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="resource"/>
  @@ -172,33 +172,33 @@
                       </rules>
                   </element>
                   <element name="log">
  -                    <description><![CDATA[Placeholder for a Log instance for 
the constructed service as constructor parameter.]]></description>
  +                    <description>Placeholder for a Log instance for the 
constructed service as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderLogFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="messages">
  -                    <description><![CDATA[Placeholder for a Messages object 
(from the invoking module) as constructor parameter.]]></description>
  +                    <description>Placeholder for a Messages object (from the 
invoking module) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderMessagesFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="service-id">
  -                    <description><![CDATA[Placeholder for the service id (of 
the constructed service) as constructor parameter.]]></description>
  +                    <description>Placeholder for the service id (of the 
constructed service) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderServiceIdFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="set">
  -                    <description><![CDATA[Configures a property of the 
service instance.]]></description>
  +                    <description>Configures a property of the service 
instance.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of a property of the 
service instance to configure.]]></description>
  +                        <description>The name of a property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="value" required="true">
  -                        <description><![CDATA[The value to set the property 
to. The value will be converted to the type of the property.]]></description>
  +                        <description>The value to set the property to. The 
value will be converted to the type of the property.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderSmartPropertyFacet"/>
  @@ -208,12 +208,12 @@
                       </rules>
                   </element>
                   <element name="set-service">
  -                    <description><![CDATA[Configures a property of the 
service instance to another service.]]></description>
  +                    <description>Configures a property of the service 
instance to another service.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The id of the 
service.]]></description>
  +                        <description>The id of the service.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -224,12 +224,12 @@
                       </rules>
                   </element>
                   <element name="set-configuration">
  -                    <description><![CDATA[Configures a property of the 
service instance to the elements contributed to an configuration 
point.]]></description>
  +                    <description>Configures a property of the service 
instance to the elements contributed to an configuration point.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="configuration-id" required="true">
  -                        <description><![CDATA[The id of the configuration 
point to access.]]></description>
  +                        <description>The id of the configuration point to 
access.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -240,12 +240,12 @@
                       </rules>
                   </element>
                   <element name="set-resource">
  -                    <description><![CDATA[Configures a property of the 
service instance to a resource.]]></description>
  +                    <description>Configures a property of the service 
instance to a resource.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="path" required="true">
  -                        <description><![CDATA[The path, relative to the 
module's deployment descriptor, of the resource.]]></description>
  +                        <description>The path, relative to the module's 
deployment descriptor, of the resource.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -256,12 +256,12 @@
                       </rules>
                   </element>
                   <element name="event-listener">
  -                    <description><![CDATA[Registers the new services as an 
event listener for events produced by the specified service.]]></description>
  +                    <description>Registers the new services as an event 
listener for events produced by the specified service.</description>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The service which will produce 
events.]]></description>
  +                        <description>The service which will produce 
events.</description>
                       </attribute>
                       <attribute name="event-set">
  -                        <description><![CDATA[If given, the name of an event 
set for which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.]]></description>
  +                        <description>If given, the name of an event set for 
which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.EventRegistration"/>
  @@ -276,18 +276,18 @@
           <service-point id="hivemind.BuilderFactory"
               interface="org.apache.hivemind.ServiceImplementationFactory"
               parameters-schema-id="hivemind.BuilderFactory" uid="14">
  -            <description><![CDATA[Used to construct a service from a class 
name and optional constructor parameters and properties.]]></description>
  +            <description>Used to construct a service from a class name and 
optional constructor parameters and properties.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.BuilderFactory" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.ThreadEventNotifier"
               interface="org.apache.hivemind.service.ThreadEventNotifier" 
uid="15">
  -            <description><![CDATA[Service used by other services to be 
alerted when a thread is cleaned up (typically, at the end of a request or 
transaction).]]></description>
  +            <description>Service used by other services to be alerted when a 
thread is cleaned up (typically, at the end of a request or 
transaction).</description>
               <create-instance 
class="org.apache.hivemind.service.impl.ThreadEventNotifierImpl"/>
           </service-point>
           <service-point id="hivemind.ThreadLocalStorage"
               interface="org.apache.hivemind.service.ThreadLocalStorage" 
uid="16">
  -            <description><![CDATA[Service which manages a thread-local map 
of data items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.]]></description>
  +            <description>Service which manages a thread-local map of data 
items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct 
class="org.apache.hivemind.service.impl.ThreadLocalStorageImpl">
                       <set-service property="notifier" 
service-id="ThreadEventNotifier"/>
  
  
  
  1.6       +48 -48    
jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testBasic.xml
  
  Index: testBasic.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testBasic.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testBasic.xml     13 May 2004 11:04:43 -0000      1.5
  +++ testBasic.xml     20 May 2004 23:56:54 -0000      1.6
  @@ -1,18 +1,18 @@
   <?xml version="1.0"?>
   <registry>
       <module id="hivemind" uid="1" version="1.0.0">
  -        <description uid="2"><![CDATA[The master module for HiveMind, 
defining core, universal functionality.]]></description>
  +        <description uid="2">The master module for HiveMind, defining core, 
universal functionality.</description>
           <schema id="hivemind.SymbolSource" uid="3">
               <element name="source">
  -                <description><![CDATA[Describes a single source of symbol 
values.]]></description>
  +                <description>Describes a single source of symbol 
values.</description>
                   <attribute name="order">
  -                    <description><![CDATA[A number used to set the order in 
which sources are checked.]]></description>
  +                    <description>A number used to set the order in which 
sources are checked.</description>
                   </attribute>
                   <attribute name="class">
  -                    <description><![CDATA[Name of a class implementing the 
SymbolSource interface.]]></description>
  +                    <description>Name of a class implementing the 
SymbolSource interface.</description>
                   </attribute>
                   <attribute name="service-id">
  -                    <description><![CDATA[Service configuration id for a 
service which implements the SymbolSource interface.]]></description>
  +                    <description>Service configuration id for a service 
which implements the SymbolSource interface.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.SymbolSourceContribution">
                       <map attribute="class" property="source" 
translator="object"/>
  @@ -22,7 +22,7 @@
           </schema>
           <configuration-point id="hivemind.SymbolSource"
               schema-id="hivemind.SymbolSource" uid="4">
  -            <description><![CDATA[Provides a list of sources for vlaues of 
substitution symbols.]]></description>
  +            <description>Provides a list of sources for vlaues of 
substitution symbols.</description>
           </configuration-point>
           <contribution configuration-id="hivemind.SymbolSource" uid="5">
               <source order="900000" 
service-id="ApplicationDefaultsSymbolSource"/>
  @@ -30,27 +30,27 @@
           </contribution>
           <schema id="hivemind.Defaults" uid="6">
               <element name="default">
  -                <description><![CDATA[Provides a default symbol 
value.]]></description>
  +                <description>Provides a default symbol value.</description>
                   <attribute name="symbol" required="true">
  -                    <description><![CDATA[The id of the symbol to define a 
default value for.]]></description>
  +                    <description>The id of the symbol to define a default 
value for.</description>
                   </attribute>
                   <attribute name="value" required="true">
  -                    <description><![CDATA[The value for the 
symbol.]]></description>
  +                    <description>The value for the symbol.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.service.impl.FactoryDefault"/>
               </element>
           </schema>
           <configuration-point id="hivemind.FactoryDefaults"
               schema-id="hivemind.Defaults" uid="7">
  -            <description><![CDATA[Extension point for setting "factory 
defaults" for symbol values.]]></description>
  +            <description>Extension point for setting "factory defaults" for 
symbol values.</description>
           </configuration-point>
           <configuration-point id="hivemind.ApplicationDefaults"
               schema-id="hivemind.Defaults" uid="8">
  -            <description><![CDATA[Extension point for setting application 
defaults; these defaults will override factory defaults specified in the 
FactoryDefaults configuration point.]]></description>
  +            <description>Extension point for setting application defaults; 
these defaults will override factory defaults specified in the FactoryDefaults 
configuration point.</description>
           </configuration-point>
           <service-point id="hivemind.FactoryDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="9">
  -            <description><![CDATA[SymbolSource implementation driven by the 
FactoryDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
FactoryDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -61,7 +61,7 @@
           </service-point>
           <service-point id="hivemind.ApplicationDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="10">
  -            <description><![CDATA[SymbolSource implementation driven by the 
ApplicationDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
ApplicationDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -72,13 +72,13 @@
           </service-point>
           <service-point id="hivemind.ClassFactory"
               interface="org.apache.hivemind.service.ClassFactory" uid="11">
  -            <description><![CDATA[Wrapper around Javassist used to 
dynamically create classes such as service interceptors.]]></description>
  +            <description>Wrapper around Javassist used to dynamically create 
classes such as service interceptors.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.ClassFactoryImpl" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.LoggingInterceptor"
               interface="org.apache.hivemind.ServiceInterceptorFactory" 
uid="12">
  -            <description><![CDATA[An interceptor factory for adding 
method-level logging to a service. Logging occurs at level DEBUG and uses the 
service id as the logger. Method entry (with parameters) and method exit (with 
return value) are logged, as are any exceptions.]]></description>
  +            <description>An interceptor factory for adding method-level 
logging to a service. Logging occurs at level DEBUG and uses the service id as 
the logger. Method entry (with parameters) and method exit (with return value) 
are logged, as are any exceptions.</description>
               <invoke-factory model="primitive" 
service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.LoggingInterceptorFactory" 
service-id-property="serviceId">
  @@ -88,18 +88,18 @@
           </service-point>
           <schema id="hivemind.BuilderFactory" uid="13">
               <element name="construct">
  -                <description><![CDATA[A single construct element identifies 
the class to instantiate.]]></description>
  +                <description>A single construct element identifies the class 
to instantiate.</description>
                   <attribute name="class" required="true">
  -                    <description><![CDATA[The name of the class to 
instantiate.]]></description>
  +                    <description>The name of the class to 
instantiate.</description>
                   </attribute>
                   <attribute name="messages-property">
  -                    <description><![CDATA[The name of a property to assign 
to invoking module's messages to.]]></description>
  +                    <description>The name of a property to assign to 
invoking module's messages to.</description>
                   </attribute>
                   <attribute name="log-property">
  -                    <description><![CDATA[The name of a property to assign 
the Log instance for the service to. The Log instance is built from the service 
configuration point id.]]></description>
  +                    <description>The name of a property to assign the Log 
instance for the service to. The Log instance is built from the service 
configuration point id.</description>
                   </attribute>
                   <attribute name="service-id-property">
  -                    <description><![CDATA[The name of a property to assign 
the configuration point id of the service to.]]></description>
  +                    <description>The name of a property to assign the 
configuration point id of the service to.</description>
                   </attribute>
                   <rules>
                       <create-object 
class="org.apache.hivemind.service.impl.BuilderParameter"/>
  @@ -116,7 +116,7 @@
                       <invoke-parent depth="3" method="addProperty"/>
                   </rules>
                   <element name="string">
  -                    <description><![CDATA[A string value constructor 
parameter.]]></description>
  +                    <description>A string value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value"/>
  @@ -124,7 +124,7 @@
                       </rules>
                   </element>
                   <element name="int">
  -                    <description><![CDATA[An integer value constructor 
parameter.]]></description>
  +                    <description>An integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="int"/>
  @@ -132,7 +132,7 @@
                       </rules>
                   </element>
                   <element name="long">
  -                    <description><![CDATA[A long (64-bit) integer value 
constructor parameter.]]></description>
  +                    <description>A long (64-bit) integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="long"/>
  @@ -140,7 +140,7 @@
                       </rules>
                   </element>
                   <element name="boolean">
  -                    <description><![CDATA[A boolean value constructor 
parameter.]]></description>
  +                    <description>A boolean value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="enumeration,java.lang.Boolean,true=TRUE,false=FALSE"/>
  @@ -148,7 +148,7 @@
                       </rules>
                   </element>
                   <element name="service">
  -                    <description><![CDATA[A constructor parameter providing 
the identified HiveMind service.]]></description>
  +                    <description>A constructor parameter providing the 
identified HiveMind service.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="service"/>
  @@ -156,7 +156,7 @@
                       </rules>
                   </element>
                   <element name="configuration">
  -                    <description><![CDATA[A constructor parameter providing 
a HiveMind configuration point (as a List).]]></description>
  +                    <description>A constructor parameter providing a 
HiveMind configuration point (as a List).</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="configuration"/>
  @@ -164,7 +164,7 @@
                       </rules>
                   </element>
                   <element name="resource">
  -                    <description><![CDATA[A Resource constructor 
parameter.]]></description>
  +                    <description>A Resource constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="resource"/>
  @@ -172,33 +172,33 @@
                       </rules>
                   </element>
                   <element name="log">
  -                    <description><![CDATA[Placeholder for a Log instance for 
the constructed service as constructor parameter.]]></description>
  +                    <description>Placeholder for a Log instance for the 
constructed service as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderLogFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="messages">
  -                    <description><![CDATA[Placeholder for a Messages object 
(from the invoking module) as constructor parameter.]]></description>
  +                    <description>Placeholder for a Messages object (from the 
invoking module) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderMessagesFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="service-id">
  -                    <description><![CDATA[Placeholder for the service id (of 
the constructed service) as constructor parameter.]]></description>
  +                    <description>Placeholder for the service id (of the 
constructed service) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderServiceIdFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="set">
  -                    <description><![CDATA[Configures a property of the 
service instance.]]></description>
  +                    <description>Configures a property of the service 
instance.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of a property of the 
service instance to configure.]]></description>
  +                        <description>The name of a property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="value" required="true">
  -                        <description><![CDATA[The value to set the property 
to. The value will be converted to the type of the property.]]></description>
  +                        <description>The value to set the property to. The 
value will be converted to the type of the property.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderSmartPropertyFacet"/>
  @@ -208,12 +208,12 @@
                       </rules>
                   </element>
                   <element name="set-service">
  -                    <description><![CDATA[Configures a property of the 
service instance to another service.]]></description>
  +                    <description>Configures a property of the service 
instance to another service.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The id of the 
service.]]></description>
  +                        <description>The id of the service.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -224,12 +224,12 @@
                       </rules>
                   </element>
                   <element name="set-configuration">
  -                    <description><![CDATA[Configures a property of the 
service instance to the elements contributed to an configuration 
point.]]></description>
  +                    <description>Configures a property of the service 
instance to the elements contributed to an configuration point.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="configuration-id" required="true">
  -                        <description><![CDATA[The id of the configuration 
point to access.]]></description>
  +                        <description>The id of the configuration point to 
access.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -240,12 +240,12 @@
                       </rules>
                   </element>
                   <element name="set-resource">
  -                    <description><![CDATA[Configures a property of the 
service instance to a resource.]]></description>
  +                    <description>Configures a property of the service 
instance to a resource.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="path" required="true">
  -                        <description><![CDATA[The path, relative to the 
module's deployment descriptor, of the resource.]]></description>
  +                        <description>The path, relative to the module's 
deployment descriptor, of the resource.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -256,12 +256,12 @@
                       </rules>
                   </element>
                   <element name="event-listener">
  -                    <description><![CDATA[Registers the new services as an 
event listener for events produced by the specified service.]]></description>
  +                    <description>Registers the new services as an event 
listener for events produced by the specified service.</description>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The service which will produce 
events.]]></description>
  +                        <description>The service which will produce 
events.</description>
                       </attribute>
                       <attribute name="event-set">
  -                        <description><![CDATA[If given, the name of an event 
set for which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.]]></description>
  +                        <description>If given, the name of an event set for 
which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.EventRegistration"/>
  @@ -276,18 +276,18 @@
           <service-point id="hivemind.BuilderFactory"
               interface="org.apache.hivemind.ServiceImplementationFactory"
               parameters-schema-id="hivemind.BuilderFactory" uid="14">
  -            <description><![CDATA[Used to construct a service from a class 
name and optional constructor parameters and properties.]]></description>
  +            <description>Used to construct a service from a class name and 
optional constructor parameters and properties.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.BuilderFactory" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.ThreadEventNotifier"
               interface="org.apache.hivemind.service.ThreadEventNotifier" 
uid="15">
  -            <description><![CDATA[Service used by other services to be 
alerted when a thread is cleaned up (typically, at the end of a request or 
transaction).]]></description>
  +            <description>Service used by other services to be alerted when a 
thread is cleaned up (typically, at the end of a request or 
transaction).</description>
               <create-instance 
class="org.apache.hivemind.service.impl.ThreadEventNotifierImpl"/>
           </service-point>
           <service-point id="hivemind.ThreadLocalStorage"
               interface="org.apache.hivemind.service.ThreadLocalStorage" 
uid="16">
  -            <description><![CDATA[Service which manages a thread-local map 
of data items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.]]></description>
  +            <description>Service which manages a thread-local map of data 
items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct 
class="org.apache.hivemind.service.impl.ThreadLocalStorageImpl">
                       <set-service property="notifier" 
service-id="ThreadEventNotifier"/>
  
  
  
  1.6       +48 -48    
jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testJars.xml
  
  Index: testJars.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-hivemind/framework/src/test-data/TestConstructRegistry/testJars.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testJars.xml      13 May 2004 11:04:44 -0000      1.5
  +++ testJars.xml      20 May 2004 23:56:54 -0000      1.6
  @@ -1,18 +1,18 @@
   <?xml version="1.0"?>
   <registry>
       <module id="hivemind" uid="1" version="1.0.0">
  -        <description uid="2"><![CDATA[The master module for HiveMind, 
defining core, universal functionality.]]></description>
  +        <description uid="2">The master module for HiveMind, defining core, 
universal functionality.</description>
           <schema id="hivemind.SymbolSource" uid="3">
               <element name="source">
  -                <description><![CDATA[Describes a single source of symbol 
values.]]></description>
  +                <description>Describes a single source of symbol 
values.</description>
                   <attribute name="order">
  -                    <description><![CDATA[A number used to set the order in 
which sources are checked.]]></description>
  +                    <description>A number used to set the order in which 
sources are checked.</description>
                   </attribute>
                   <attribute name="class">
  -                    <description><![CDATA[Name of a class implementing the 
SymbolSource interface.]]></description>
  +                    <description>Name of a class implementing the 
SymbolSource interface.</description>
                   </attribute>
                   <attribute name="service-id">
  -                    <description><![CDATA[Service configuration id for a 
service which implements the SymbolSource interface.]]></description>
  +                    <description>Service configuration id for a service 
which implements the SymbolSource interface.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.SymbolSourceContribution">
                       <map attribute="class" property="source" 
translator="object"/>
  @@ -22,7 +22,7 @@
           </schema>
           <configuration-point id="hivemind.SymbolSource"
               schema-id="hivemind.SymbolSource" uid="4">
  -            <description><![CDATA[Provides a list of sources for vlaues of 
substitution symbols.]]></description>
  +            <description>Provides a list of sources for vlaues of 
substitution symbols.</description>
           </configuration-point>
           <contribution configuration-id="hivemind.SymbolSource" uid="5">
               <source order="900000" 
service-id="ApplicationDefaultsSymbolSource"/>
  @@ -30,27 +30,27 @@
           </contribution>
           <schema id="hivemind.Defaults" uid="6">
               <element name="default">
  -                <description><![CDATA[Provides a default symbol 
value.]]></description>
  +                <description>Provides a default symbol value.</description>
                   <attribute name="symbol" required="true">
  -                    <description><![CDATA[The id of the symbol to define a 
default value for.]]></description>
  +                    <description>The id of the symbol to define a default 
value for.</description>
                   </attribute>
                   <attribute name="value" required="true">
  -                    <description><![CDATA[The value for the 
symbol.]]></description>
  +                    <description>The value for the symbol.</description>
                   </attribute>
                   <conversion 
class="org.apache.hivemind.service.impl.FactoryDefault"/>
               </element>
           </schema>
           <configuration-point id="hivemind.FactoryDefaults"
               schema-id="hivemind.Defaults" uid="7">
  -            <description><![CDATA[Extension point for setting "factory 
defaults" for symbol values.]]></description>
  +            <description>Extension point for setting "factory defaults" for 
symbol values.</description>
           </configuration-point>
           <configuration-point id="hivemind.ApplicationDefaults"
               schema-id="hivemind.Defaults" uid="8">
  -            <description><![CDATA[Extension point for setting application 
defaults; these defaults will override factory defaults specified in the 
FactoryDefaults configuration point.]]></description>
  +            <description>Extension point for setting application defaults; 
these defaults will override factory defaults specified in the FactoryDefaults 
configuration point.</description>
           </configuration-point>
           <service-point id="hivemind.FactoryDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="9">
  -            <description><![CDATA[SymbolSource implementation driven by the 
FactoryDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
FactoryDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -61,7 +61,7 @@
           </service-point>
           <service-point id="hivemind.ApplicationDefaultsSymbolSource"
               interface="org.apache.hivemind.SymbolSource" uid="10">
  -            <description><![CDATA[SymbolSource implementation driven by the 
ApplicationDefaults configuration point.]]></description>
  +            <description>SymbolSource implementation driven by the 
ApplicationDefaults configuration point.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.DefaultsSymbolSource" 
log-property="log">
  @@ -72,13 +72,13 @@
           </service-point>
           <service-point id="hivemind.ClassFactory"
               interface="org.apache.hivemind.service.ClassFactory" uid="11">
  -            <description><![CDATA[Wrapper around Javassist used to 
dynamically create classes such as service interceptors.]]></description>
  +            <description>Wrapper around Javassist used to dynamically create 
classes such as service interceptors.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.ClassFactoryImpl" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.LoggingInterceptor"
               interface="org.apache.hivemind.ServiceInterceptorFactory" 
uid="12">
  -            <description><![CDATA[An interceptor factory for adding 
method-level logging to a service. Logging occurs at level DEBUG and uses the 
service id as the logger. Method entry (with parameters) and method exit (with 
return value) are logged, as are any exceptions.]]></description>
  +            <description>An interceptor factory for adding method-level 
logging to a service. Logging occurs at level DEBUG and uses the service id as 
the logger. Method entry (with parameters) and method exit (with return value) 
are logged, as are any exceptions.</description>
               <invoke-factory model="primitive" 
service-id="hivemind.BuilderFactory">
                   <construct
                       
class="org.apache.hivemind.service.impl.LoggingInterceptorFactory" 
service-id-property="serviceId">
  @@ -88,18 +88,18 @@
           </service-point>
           <schema id="hivemind.BuilderFactory" uid="13">
               <element name="construct">
  -                <description><![CDATA[A single construct element identifies 
the class to instantiate.]]></description>
  +                <description>A single construct element identifies the class 
to instantiate.</description>
                   <attribute name="class" required="true">
  -                    <description><![CDATA[The name of the class to 
instantiate.]]></description>
  +                    <description>The name of the class to 
instantiate.</description>
                   </attribute>
                   <attribute name="messages-property">
  -                    <description><![CDATA[The name of a property to assign 
to invoking module's messages to.]]></description>
  +                    <description>The name of a property to assign to 
invoking module's messages to.</description>
                   </attribute>
                   <attribute name="log-property">
  -                    <description><![CDATA[The name of a property to assign 
the Log instance for the service to. The Log instance is built from the service 
configuration point id.]]></description>
  +                    <description>The name of a property to assign the Log 
instance for the service to. The Log instance is built from the service 
configuration point id.</description>
                   </attribute>
                   <attribute name="service-id-property">
  -                    <description><![CDATA[The name of a property to assign 
the configuration point id of the service to.]]></description>
  +                    <description>The name of a property to assign the 
configuration point id of the service to.</description>
                   </attribute>
                   <rules>
                       <create-object 
class="org.apache.hivemind.service.impl.BuilderParameter"/>
  @@ -116,7 +116,7 @@
                       <invoke-parent depth="3" method="addProperty"/>
                   </rules>
                   <element name="string">
  -                    <description><![CDATA[A string value constructor 
parameter.]]></description>
  +                    <description>A string value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value"/>
  @@ -124,7 +124,7 @@
                       </rules>
                   </element>
                   <element name="int">
  -                    <description><![CDATA[An integer value constructor 
parameter.]]></description>
  +                    <description>An integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="int"/>
  @@ -132,7 +132,7 @@
                       </rules>
                   </element>
                   <element name="long">
  -                    <description><![CDATA[A long (64-bit) integer value 
constructor parameter.]]></description>
  +                    <description>A long (64-bit) integer value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="long"/>
  @@ -140,7 +140,7 @@
                       </rules>
                   </element>
                   <element name="boolean">
  -                    <description><![CDATA[A boolean value constructor 
parameter.]]></description>
  +                    <description>A boolean value constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="enumeration,java.lang.Boolean,true=TRUE,false=FALSE"/>
  @@ -148,7 +148,7 @@
                       </rules>
                   </element>
                   <element name="service">
  -                    <description><![CDATA[A constructor parameter providing 
the identified HiveMind service.]]></description>
  +                    <description>A constructor parameter providing the 
identified HiveMind service.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" translator="service"/>
  @@ -156,7 +156,7 @@
                       </rules>
                   </element>
                   <element name="configuration">
  -                    <description><![CDATA[A constructor parameter providing 
a HiveMind configuration point (as a List).]]></description>
  +                    <description>A constructor parameter providing a 
HiveMind configuration point (as a List).</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="configuration"/>
  @@ -164,7 +164,7 @@
                       </rules>
                   </element>
                   <element name="resource">
  -                    <description><![CDATA[A Resource constructor 
parameter.]]></description>
  +                    <description>A Resource constructor 
parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
                           <read-content property="value" 
translator="resource"/>
  @@ -172,33 +172,33 @@
                       </rules>
                   </element>
                   <element name="log">
  -                    <description><![CDATA[Placeholder for a Log instance for 
the constructed service as constructor parameter.]]></description>
  +                    <description>Placeholder for a Log instance for the 
constructed service as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderLogFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="messages">
  -                    <description><![CDATA[Placeholder for a Messages object 
(from the invoking module) as constructor parameter.]]></description>
  +                    <description>Placeholder for a Messages object (from the 
invoking module) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderMessagesFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="service-id">
  -                    <description><![CDATA[Placeholder for the service id (of 
the constructed service) as constructor parameter.]]></description>
  +                    <description>Placeholder for the service id (of the 
constructed service) as constructor parameter.</description>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderServiceIdFacet"/>
                           <invoke-parent depth="4" method="addParameter"/>
                       </rules>
                   </element>
                   <element name="set">
  -                    <description><![CDATA[Configures a property of the 
service instance.]]></description>
  +                    <description>Configures a property of the service 
instance.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of a property of the 
service instance to configure.]]></description>
  +                        <description>The name of a property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="value" required="true">
  -                        <description><![CDATA[The value to set the property 
to. The value will be converted to the type of the property.]]></description>
  +                        <description>The value to set the property to. The 
value will be converted to the type of the property.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderSmartPropertyFacet"/>
  @@ -208,12 +208,12 @@
                       </rules>
                   </element>
                   <element name="set-service">
  -                    <description><![CDATA[Configures a property of the 
service instance to another service.]]></description>
  +                    <description>Configures a property of the service 
instance to another service.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The id of the 
service.]]></description>
  +                        <description>The id of the service.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -224,12 +224,12 @@
                       </rules>
                   </element>
                   <element name="set-configuration">
  -                    <description><![CDATA[Configures a property of the 
service instance to the elements contributed to an configuration 
point.]]></description>
  +                    <description>Configures a property of the service 
instance to the elements contributed to an configuration point.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="configuration-id" required="true">
  -                        <description><![CDATA[The id of the configuration 
point to access.]]></description>
  +                        <description>The id of the configuration point to 
access.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -240,12 +240,12 @@
                       </rules>
                   </element>
                   <element name="set-resource">
  -                    <description><![CDATA[Configures a property of the 
service instance to a resource.]]></description>
  +                    <description>Configures a property of the service 
instance to a resource.</description>
                       <attribute name="property" required="true">
  -                        <description><![CDATA[The name of the property of 
the service instance to configure.]]></description>
  +                        <description>The name of the property of the service 
instance to configure.</description>
                       </attribute>
                       <attribute name="path" required="true">
  -                        <description><![CDATA[The path, relative to the 
module's deployment descriptor, of the resource.]]></description>
  +                        <description>The path, relative to the module's 
deployment descriptor, of the resource.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.BuilderPropertyFacet"/>
  @@ -256,12 +256,12 @@
                       </rules>
                   </element>
                   <element name="event-listener">
  -                    <description><![CDATA[Registers the new services as an 
event listener for events produced by the specified service.]]></description>
  +                    <description>Registers the new services as an event 
listener for events produced by the specified service.</description>
                       <attribute name="service-id" required="true">
  -                        <description><![CDATA[The service which will produce 
events.]]></description>
  +                        <description>The service which will produce 
events.</description>
                       </attribute>
                       <attribute name="event-set">
  -                        <description><![CDATA[If given, the name of an event 
set for which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.]]></description>
  +                        <description>If given, the name of an event set for 
which the service will be registered. If omitted, the service will be 
registered for all events sets for which it implements the necessary listener 
interfaces.</description>
                       </attribute>
                       <rules>
                           <create-object 
class="org.apache.hivemind.service.impl.EventRegistration"/>
  @@ -276,18 +276,18 @@
           <service-point id="hivemind.BuilderFactory"
               interface="org.apache.hivemind.ServiceImplementationFactory"
               parameters-schema-id="hivemind.BuilderFactory" uid="14">
  -            <description><![CDATA[Used to construct a service from a class 
name and optional constructor parameters and properties.]]></description>
  +            <description>Used to construct a service from a class name and 
optional constructor parameters and properties.</description>
               <create-instance
                   class="org.apache.hivemind.service.impl.BuilderFactory" 
model="primitive"/>
           </service-point>
           <service-point id="hivemind.ThreadEventNotifier"
               interface="org.apache.hivemind.service.ThreadEventNotifier" 
uid="15">
  -            <description><![CDATA[Service used by other services to be 
alerted when a thread is cleaned up (typically, at the end of a request or 
transaction).]]></description>
  +            <description>Service used by other services to be alerted when a 
thread is cleaned up (typically, at the end of a request or 
transaction).</description>
               <create-instance 
class="org.apache.hivemind.service.impl.ThreadEventNotifierImpl"/>
           </service-point>
           <service-point id="hivemind.ThreadLocalStorage"
               interface="org.apache.hivemind.service.ThreadLocalStorage" 
uid="16">
  -            <description><![CDATA[Service which manages a thread-local map 
of data items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.]]></description>
  +            <description>Service which manages a thread-local map of data 
items. This can be used for temporary storage of information when local 
variables can't be used. All stored items are released when the thread is 
cleaned up.</description>
               <invoke-factory service-id="hivemind.BuilderFactory">
                   <construct 
class="org.apache.hivemind.service.impl.ThreadLocalStorageImpl">
                       <set-service property="notifier" 
service-id="ThreadEventNotifier"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to