diff options
Diffstat (limited to 'TAO/CIAO/docs')
75 files changed, 311 insertions, 380 deletions
diff --git a/TAO/CIAO/docs/Purify.html b/TAO/CIAO/docs/Purify.html index fff258db120..12c1900ba0c 100644 --- a/TAO/CIAO/docs/Purify.html +++ b/TAO/CIAO/docs/Purify.html @@ -1,72 +1,72 @@ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> <html> <head> - <title>Using Rational Purify with CIAO</title> + <title>Using Rational Purify with CIAO</title> <!-- $Id$ --> </head> <body> <h1>Using Rational Purify with CIAO</h1> - <p>This document is about using Purify with Visual Studio 7.1 to track down - memory leaks and other bugs in CIAO applications. For the Linux/Unix - environment, Valgrind is a better-suited tool - see Will Otte's documentation + <p>This document is about using Purify with Visual Studio 7.1 to track down + memory leaks and other bugs in CIAO applications. For the Linux/Unix + environment, Valgrind is a better-suited tool - see Will Otte's documentation on using Valgrind with CIAO in this directory.</p> - <p>Purify can be run from within Visual Studio, or standalone. The executable is - c:\Program Files\Rational\PurifyPlus\purifyw.exe. Typing this will bring up the - same Purify window you see if you run it from within Visual Studio. You can + <p>Purify can be run from within Visual Studio, or standalone. The executable is + c:\Program Files\Rational\PurifyPlus\purifyw.exe. Typing this will bring up the + same Purify window you see if you run it from within Visual Studio. You can install Purify from the web by going to <A href="file://\\Atlantis\software\RationSuiteEnterprise-v2003-06-12"> - \\Atlantis\software\RationSuiteEnterprise-v2003-06-12</A> and clicking - on <code>C57BPML.zip</code>. This will install a whole bunch of Rational stuff - by default, so you will probaby want to deselect everything but PurifyPlus, - although Quantify is a good bottleneck-finder when you're trying to improve - performance, so that might be worth installing and playing with as well. During - the installation process, you'll be prompted for a mode of licensing. Select + \\Atlantis\software\RationSuiteEnterprise-v2003-06-12</A> and clicking + on <code>C57BPML.zip</code>. This will install a whole bunch of Rational stuff + by default, so you will probaby want to deselect everything but PurifyPlus, + although Quantify is a good bottleneck-finder when you're trying to improve + performance, so that might be worth installing and playing with as well. During + the installation process, you'll be prompted for a mode of licensing. Select the use of a license server, and then you'll be prompted for its address. Use <code> rational.vuse.vanderbilt.edu</code>.</p> - <p>The option to exclude all modules in Windows directories will probably be set - by default, but if you notice memory leaks reported for Windows stuff, you - might want to double check this and turn it off. From the PurifyPlus menu bar - item in Visual Studio, it's at <b>PurifyPlus->Purify->Settings->DefaultSettings->PowerCheck</b>. - When run for the first time, Purify will instrument all libraries linked to the - executable. Select <b>PurifyPlus->Purify->Run</b>, and a window will pop - up prompting you for the executable name, command line options, and working + <p>The option to exclude all modules in Windows directories will probably be set + by default, but if you notice memory leaks reported for Windows stuff, you + might want to double check this and turn it off. From the PurifyPlus menu bar + item in Visual Studio, it's at <b>PurifyPlus->Purify->Settings->DefaultSettings->PowerCheck</b>. + When run for the first time, Purify will instrument all libraries linked to the + executable. Select <b>PurifyPlus->Purify->Run</b>, and a window will pop + up prompting you for the executable name, command line options, and working directory.</p> - <p>Purify's output will appear in the Visual Studio text editing window. This - output can be saved to the given filename. The type of error reported is - indicated by a 3-letter code - the most common are UMR (Unitialized Memory - Read), FMM (Freeing Mismatched Memory), and MLK (Memory Leak). Each of these - can be expanded to show the call stack. The depth of the call stack can be - modified in Settings if it's not deep enough. FMM messages will show both + <p>Purify's output will appear in the Visual Studio text editing window. This + output can be saved to the given filename. The type of error reported is + indicated by a 3-letter code - the most common are UMR (Unitialized Memory + Read), FMM (Freeing Mismatched Memory), and MLK (Memory Leak). Each of these + can be expanded to show the call stack. The depth of the call stack can be + modified in Settings if it's not deep enough. FMM messages will show both allocation and deallocation call stacks.</p> - Quite often in CIAO, we will want to Purify a process that is spawned by - another process, and therefore not directly runnable in Purify. This is fairly - easy to do, but it must be done from the command line. If the name of the child - process we want to instrument is <code>child.exe</code>, then it can be + Quite often in CIAO, we will want to Purify a process that is spawned by + another process, and therefore not directly runnable in Purify. This is fairly + easy to do, but it must be done from the command line. If the name of the child + process we want to instrument is <code>child.exe</code>, then it can be instrumented by typing <br> <code>purifyw /Run=no /Replace=yes child.exe</code><br> - This will rename the original executable as <code>child.exe.Original</code>, - and the new instrumented executable will be <code>child.exe</code>. Now when - you run the parent process under Purify, you'll see one window opened up in - Visual Studio's text editor for this process, and when the child process is - spawned, a second window will open. A couple of caveats to make this work + This will rename the original executable as <code>child.exe.Original</code>, + and the new instrumented executable will be <code>child.exe</code>. Now when + you run the parent process under Purify, you'll see one window opened up in + Visual Studio's text editor for this process, and when the child process is + spawned, a second window will open. A couple of caveats to make this work smoothly: <ul> <li> - Instrumented executables run 2 to 5 times slower than uninstrumented ones, so - any timeouts in the code should be extended accordingly. For example, if an + Instrumented executables run 2 to 5 times slower than uninstrumented ones, so + any timeouts in the code should be extended accordingly. For example, if an instrumented NodeApplication is spawned by NodeManager, add <code>-d 15</code> or <code>-d 20</code> to NodeManager's command line. <li> - If an instrumented process is simply killed, there will probably be many - spurious error messages, mostly related to ORB resources that were not cleaned - up by a graceful shutdown. All processes tested with Purify should have a + If an instrumented process is simply killed, there will probably be many + spurious error messages, mostly related to ORB resources that were not cleaned + up by a graceful shutdown. All processes tested with Purify should have a graceful shutdown built in to eliminate these bogus memory leak messages. </li> </ul> <hr> <address>Jeff Parsons</address> - <!-- hhmts start --> Last modified: Oct 3 2005 + <!-- hhmts start --> Last modified: Oct 3 2005 <!-- hhmts end --> </body> </html> diff --git a/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd b/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd index 7877afe2151..ca30620ae4f 100644 --- a/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd +++ b/TAO/CIAO/docs/XML/ciao_rt_cad_ext.dtd @@ -90,4 +90,4 @@ <connectionbands> element. --> <!ATTLIST banded_connection_policy - idref IDREF #REQUIRED>
\ No newline at end of file + idref IDREF #REQUIRED> diff --git a/TAO/CIAO/docs/imgs/CCM-v5.vsd b/TAO/CIAO/docs/imgs/CCM-v5.vsd Binary files differindex 7f4d7539050..ba79699b477 100644 --- a/TAO/CIAO/docs/imgs/CCM-v5.vsd +++ b/TAO/CIAO/docs/imgs/CCM-v5.vsd diff --git a/TAO/CIAO/docs/imgs/CCM.vsd b/TAO/CIAO/docs/imgs/CCM.vsd Binary files differindex 239a4e7943d..4ca4f231805 100644 --- a/TAO/CIAO/docs/imgs/CCM.vsd +++ b/TAO/CIAO/docs/imgs/CCM.vsd diff --git a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png Binary files differindex 2e9917e1520..ac719b3af2a 100644 --- a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png +++ b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.png diff --git a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd Binary files differindex b795c5ae049..3175b935a17 100644 --- a/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd +++ b/TAO/CIAO/docs/imgs/DAnCE-Dynamic.sxd diff --git a/TAO/CIAO/docs/imgs/File-Gen-Existing.png b/TAO/CIAO/docs/imgs/File-Gen-Existing.png Binary files differindex 8deb5d32fd3..0c89f232ce3 100644 --- a/TAO/CIAO/docs/imgs/File-Gen-Existing.png +++ b/TAO/CIAO/docs/imgs/File-Gen-Existing.png diff --git a/TAO/CIAO/docs/imgs/File-Gen-Future.png b/TAO/CIAO/docs/imgs/File-Gen-Future.png Binary files differindex 1daef691bdf..1b4d3ae25cb 100644 --- a/TAO/CIAO/docs/imgs/File-Gen-Future.png +++ b/TAO/CIAO/docs/imgs/File-Gen-Future.png diff --git a/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd b/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd Binary files differindex ef6332d49ac..e39ba75c4e6 100644 --- a/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd +++ b/TAO/CIAO/docs/imgs/File_Generation_Flow.vsd diff --git a/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd b/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd Binary files differindex 0986aa78d70..ed1c7191bab 100644 --- a/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd +++ b/TAO/CIAO/docs/imgs/IDL-CIDL-classes.vsd diff --git a/TAO/CIAO/docs/imgs/basic-container.png b/TAO/CIAO/docs/imgs/basic-container.png Binary files differindex 9df767b45a2..99f0bc2dd4b 100644 --- a/TAO/CIAO/docs/imgs/basic-container.png +++ b/TAO/CIAO/docs/imgs/basic-container.png diff --git a/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg b/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg Binary files differindex a385ad30848..65f5d4154f8 100644 --- a/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg +++ b/TAO/CIAO/docs/imgs/ciao-dynamic1.jpg diff --git a/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg b/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg Binary files differindex e0a705b9d3a..31d5eeb88d7 100644 --- a/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg +++ b/TAO/CIAO/docs/imgs/ciao-dynamic2.jpg diff --git a/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg b/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg Binary files differindex b876b7a82cb..eeb699c3469 100644 --- a/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg +++ b/TAO/CIAO/docs/imgs/ciao-static-vs-dynamic.jpg diff --git a/TAO/CIAO/docs/imgs/ciao-static1.jpg b/TAO/CIAO/docs/imgs/ciao-static1.jpg Binary files differindex 313084ff34d..de49dd66015 100644 --- a/TAO/CIAO/docs/imgs/ciao-static1.jpg +++ b/TAO/CIAO/docs/imgs/ciao-static1.jpg diff --git a/TAO/CIAO/docs/imgs/ciao-static2.jpg b/TAO/CIAO/docs/imgs/ciao-static2.jpg Binary files differindex 86ded87f448..6fd6e60b503 100644 --- a/TAO/CIAO/docs/imgs/ciao-static2.jpg +++ b/TAO/CIAO/docs/imgs/ciao-static2.jpg diff --git a/TAO/CIAO/docs/imgs/component-basic.png b/TAO/CIAO/docs/imgs/component-basic.png Binary files differindex 520dc9c4cca..ee5aed4951d 100644 --- a/TAO/CIAO/docs/imgs/component-basic.png +++ b/TAO/CIAO/docs/imgs/component-basic.png diff --git a/TAO/CIAO/docs/imgs/dance_arch.jpg b/TAO/CIAO/docs/imgs/dance_arch.jpg Binary files differindex 95f139c7e6e..2bb391f7b92 100644 --- a/TAO/CIAO/docs/imgs/dance_arch.jpg +++ b/TAO/CIAO/docs/imgs/dance_arch.jpg diff --git a/TAO/CIAO/docs/imgs/dance_arch.vsd b/TAO/CIAO/docs/imgs/dance_arch.vsd Binary files differindex cfe75fca9c6..d8813a7afdf 100644 --- a/TAO/CIAO/docs/imgs/dance_arch.vsd +++ b/TAO/CIAO/docs/imgs/dance_arch.vsd diff --git a/TAO/CIAO/docs/imgs/deployment.png b/TAO/CIAO/docs/imgs/deployment.png Binary files differindex 4cd8c6be646..f7759729b8b 100644 --- a/TAO/CIAO/docs/imgs/deployment.png +++ b/TAO/CIAO/docs/imgs/deployment.png diff --git a/TAO/CIAO/docs/imgs/extended-container.png b/TAO/CIAO/docs/imgs/extended-container.png Binary files differindex 39977e6eb83..5ff96da018e 100644 --- a/TAO/CIAO/docs/imgs/extended-container.png +++ b/TAO/CIAO/docs/imgs/extended-container.png diff --git a/TAO/CIAO/docs/imgs/home-config.png b/TAO/CIAO/docs/imgs/home-config.png Binary files differindex aebf5e62751..69144945bae 100644 --- a/TAO/CIAO/docs/imgs/home-config.png +++ b/TAO/CIAO/docs/imgs/home-config.png diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.jpg b/TAO/CIAO/docs/imgs/static_dance_arch.jpg Binary files differindex 3a4b579c3d5..7811cc27f6b 100644 --- a/TAO/CIAO/docs/imgs/static_dance_arch.jpg +++ b/TAO/CIAO/docs/imgs/static_dance_arch.jpg diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.vsd b/TAO/CIAO/docs/imgs/static_dance_arch.vsd Binary files differindex 1ca1f50f69d..bc7a826c668 100644 --- a/TAO/CIAO/docs/imgs/static_dance_arch.vsd +++ b/TAO/CIAO/docs/imgs/static_dance_arch.vsd diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.jpg b/TAO/CIAO/docs/imgs/static_dance_impl.jpg Binary files differindex 1040e65c1db..51923fe5152 100644 --- a/TAO/CIAO/docs/imgs/static_dance_impl.jpg +++ b/TAO/CIAO/docs/imgs/static_dance_impl.jpg diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.vsd b/TAO/CIAO/docs/imgs/static_dance_impl.vsd Binary files differindex 6c21e6139d4..1971a11292b 100644 --- a/TAO/CIAO/docs/imgs/static_dance_impl.vsd +++ b/TAO/CIAO/docs/imgs/static_dance_impl.vsd diff --git a/TAO/CIAO/docs/index.html b/TAO/CIAO/docs/index.html index fcfc8cd2060..2c6a17379a0 100644 --- a/TAO/CIAO/docs/index.html +++ b/TAO/CIAO/docs/index.html @@ -34,7 +34,7 @@ notes.)</a></li> <ul> </ul> <ul> - <p><!-- + <p><!-- <li>This <a href="new_components.html">page on implementing new @@ -77,7 +77,7 @@ interfaces </a></li> </ul> All these diagrams are generated from the <a href="imgs/CCM.vsd">CCM.vsd Visio file</a> (The same file in Visio V.5 format is <a - href="imgs/CCM-v5.vsd">here</a>.) and OpenOffice source file + href="imgs/CCM-v5.vsd">here</a>.) and OpenOffice source file <a href="imgs/DAnCE-Dynamic.sxd">DAnCE-Dynamic.sxd</a> <br> <br> <hr> diff --git a/TAO/CIAO/docs/releasenotes/index.html b/TAO/CIAO/docs/releasenotes/index.html index 324f1d83c77..0c4235aff1c 100644 --- a/TAO/CIAO/docs/releasenotes/index.html +++ b/TAO/CIAO/docs/releasenotes/index.html @@ -49,17 +49,17 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: <CODE>$CIAO_ROOT/tools</CODE> that are missing in the DAnCE implementation. Please see <a href="../TODO.html"> TODO </a> file for more details. We plan to implement them soon and use DAnCE - continuously. + continuously. - <li> The first cut of DAnCE includes two parts: + <li> The first cut of DAnCE includes two parts: <ul> <li> A modeling tool chain , <a href="http://www.dre.vanderbilt.edu/CoSMIC/"> - CoSMIC</a>, which is capable of describing the Assembly/Component + CoSMIC</a>, which is capable of describing the Assembly/Component using <a href="http://www.isis.vanderbilt.edu/Projects/gme/default.html"> GME</a> as the development bed. The artifacts generated from the - CoSMIC are a set of XML descriptors. + CoSMIC are a set of XML descriptors. <!-- Tao, I realy don't understand what this means - Bala --> <li>This run-time infrastructure that performs the actual deployment @@ -85,14 +85,14 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: developers have to implement those operations within the executor. We plan to get around this, i.e., users having to implement these two operations, in the next month or so. <p> - + <li> - + Here is a set of updates in the CIDL Compiler.<p> <ul> <li>Fixed bugs in generation of inherited: home operations, attribute operations, port operations, home factory operations, - supported operations.<p> + supported operations.<p> <li>Added support for multiplex uses ports. This implies that users could use "uses multiple" in their component definitions. <p> @@ -100,28 +100,28 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: <li>Added automatic registration of value factories for event consumers. This has been long outstanding. This change alleviates component developers need to register the valuetype factory of their - eventtypes with the ORB. <p> + eventtypes with the ORB. <p> <li>Added support for emits keyword and we now generate navigation code for this.<p> <li>Fixed bug with multiple facets in a build that provide the same interface.<p> - + <li>Added option <code>--gen-exec-impl</code> to generate executor impl classes, with no-op versions of each IDL operation.<p> <li>Implemented get_all_facets() and get_all_consumers() navigation methods.<p> - + <li>Added support for the IDL keywords <code>setraises</code> and <code>getraises</code>, associated with attributes in IDL3.<p> - + <li>Added support for both subscription and event push of event types that are a base class of the IDL-specified port type. A check is performed during the subscribe call to make sure the eventtype is actually an ancestor of the declared port type.<p> - + <li>Problems with generated code when the composition declaration is nested inside one or more IDL modules has prompted a change. The 'CIAO_GLUE_' prefix has been eliminated. The composition name is now @@ -150,12 +150,12 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: <li> The CIAO static configurator tool has been enhanced to support processing of RTCORBA policy related information. Please see ACE_wrappers/TAO/CIAO/docs/static_ciao_index.html.<p> - + <li> To further interoperability with non-component-aware clients, there - are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be + are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be compiled into an executable called tao_idl3_to_idl2. This executable takes an IDL file (on the command line) containing IDL3 declarations - and outputs an IDL file with the IDL3 declarations converted to + and outputs an IDL file with the IDL3 declarations converted to equivalent IDL2. IDL2 declarations in the input file are unchanged. See the README file in that directory for more information.<p> diff --git a/TAO/CIAO/docs/releasenotes/switch.html b/TAO/CIAO/docs/releasenotes/switch.html index 1120239b6ec..b9df3850193 100644 --- a/TAO/CIAO/docs/releasenotes/switch.html +++ b/TAO/CIAO/docs/releasenotes/switch.html @@ -23,7 +23,7 @@ binaries.<br> A couple examples of the component implementation are at: - <code>$CIAO_ROOT/DAnCE/tests</code>. + <code>$CIAO_ROOT/DAnCE/tests</code>. </ul> <h3>When switching from the new CIAO runtime to the old one</h3> diff --git a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd index a14a8f508d9..1d386841ea5 100644 --- a/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd +++ b/TAO/CIAO/docs/schema/Basic_Deployment_Data.xsd @@ -50,10 +50,9 @@ <xsd:sequence> <xsd:element name="kind" type="Deployment:TCKind"/> <xsd:element name="enum" type="Deployment:EnumType" minOccurs="0"/> -<!-- +<!-- @@ not supported now.. - <xsd:element name="objref" type="Deployment:ObjrefType"/> <xsd:element name="boundedString" type="Deployment:BoundedStringType"/> <xsd:element name="fixed" type="Deployment:FixedType"/> @@ -67,7 +66,6 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="DataValue"> <xsd:choice maxOccurs="unbounded"> <xsd:element name="short" type="xsd:short"/> @@ -107,19 +105,17 @@ <xsd:complexType name="Any"> <xsd:sequence> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="Property"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> - <!-- End of base definitions. --> <xsd:simpleType name="SatisfierPropertyKind"> @@ -133,16 +129,15 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="SatisfierProperty"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/> - <xsd:element name="value" type="Deployment:Any"/> + <xsd:element name="dynamic" type="xsd:boolean" /> + <xsd:element name="value" type="Deployment:Any"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="Resource"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -155,22 +150,20 @@ <xsd:sequence> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> - <!-- Deployment --> <xsd:complexType name="ResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ArtifactDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -184,7 +177,6 @@ <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:complexType name="MonolithicDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -206,32 +198,28 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="InstanceResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="InstanceDeploymentDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="node" type="xsd:string"/> <xsd:element name="source" type="xsd:string"/> <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription --> - <xsd:element name="configProperty" type="Deployment:Property" - minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/> <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:simpleType name="CCMComponentPortKind"> <xsd:restriction base="xsd:NCName"> <xsd:enumeration value="Facet"/> @@ -243,21 +231,20 @@ </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="ComponentPortDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string"/> - <xsd:element name="provider" type="xsd:string"/> - <xsd:element name="exclusiveProvider" type="xsd:string"/> - <xsd:element name="exclusiveUser" type="xsd:string"/> - <xsd:element name="optional" type="xsd:string"/> + <!-- @@MAJO: Hack - specific/supported types should be required. --> + <xsd:element name="specificType" type="xsd:string" minOccurs="0"/> + <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="provider" type="xsd:boolean"/> + <xsd:element name="exclusiveProvider" type="xsd:boolean"/> + <xsd:element name="exclusiveUser" type="xsd:boolean"/> + <xsd:element name="optional" type="xsd:boolean"/> <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ComponentPropertyDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -265,14 +252,12 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ComponentExternalPortEndpoint"> <xsd:sequence> - <xsd:element name="portName" type="xsd:string"/> + <xsd:element name="portName" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="PlanSubcomponentPortEndpoint"> <xsd:sequence> <xsd:element name="portName" type="xsd:string"/> @@ -282,24 +267,21 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ExternalReferenceEndpoint"> <xsd:sequence> - <xsd:element name="location" type="xsd:string"/> + <xsd:element name="location" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ConnectionResourceDeploymentDescription"> <xsd:sequence> <xsd:element name="targetName" type="xsd:string"/> <xsd:element name="requirementName" type="xsd:string"/> <xsd:element name="resourceName" type="xsd:string"/> - <xsd:element name="resourceValue" type="Deployment:Any"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="PlanConnectionDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> @@ -312,72 +294,41 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ImplementationDependency"> <xsd:sequence> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - <!-- Implementation --> - <xsd:complexType name="Capability"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="resourceType" type="xsd:string" maxOccurs="unbounded" /> + <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="ImplementationRequirement"> <xsd:sequence> - <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/> - <xsd:element name="resourcePort" type="xsd:string"/> - <xsd:element name="componentPort" type="xsd:string"/> + <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind" minOccurs="0"/> + <xsd:element name="resourcePort" type="xsd:string" minOccurs="0" /> + <xsd:element name="componentPort" type="xsd:string" minOccurs="0"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="property" type="Deployment:Property"/> - </xsd:sequence> - </xsd:complexType> - - -<!-- Bala commented - <xsd:complexType name="MonolithicImplementationDescription"> - <xsd:sequence> - <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/> + <xsd:element name="property" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> ---> - <xsd:complexType name="ComponentPackageReference"> <xsd:sequence> - <xsd:element name="requiredUUID" type="xsd:string"/> - <xsd:element name="requiredName" type="xsd:string"/> - <xsd:element name="requiredType" type="xsd:string"/> + <xsd:element name="requiredUUID" type="xsd:string" minOccurs="0" /> + <xsd:element name="requiredName" type="xsd:string" minOccurs="0" /> + <xsd:element name="requiredType" type="xsd:string"/> </xsd:sequence> </xsd:complexType> - -<!-- Bala commented - <xsd:complexType name="SubcomponentInstantiationDescription"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> ---> - - <xsd:complexType name="SubcomponentPortEndpoint"> <xsd:sequence> <xsd:element name="portName" type="xsd:string"/> @@ -385,13 +336,12 @@ </xsd:sequence> </xsd:complexType> - <xsd:complexType name="AssemblyConnectionDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/CIAOServerResources.xsd b/TAO/CIAO/docs/schema/CIAOServerResources.xsd index d9fb63da88f..3d1554c861a 100644 --- a/TAO/CIAO/docs/schema/CIAOServerResources.xsd +++ b/TAO/CIAO/docs/schema/CIAOServerResources.xsd @@ -7,10 +7,10 @@ <xsd:element name="ServerResources" type="CIAO:ServerResourcesDef"> <xsd:annotation> <xsd:documentation> - Root element for defining all the resources used by a DeploymentPlan. - A CIAO:ServerResources document should reside in a separate file. + Root element for defining all the resources used by a DeploymentPlan. + A CIAO:ServerResources document should reside in a separate file. A DeploymentPlan can refer to one or more CIAO:ServerResources file names - using the "infoProperty" tag. + using the "infoProperty" tag. </xsd:documentation> </xsd:annotation> </xsd:element> @@ -73,7 +73,7 @@ </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="resources" type="CIAO:ORBResources" + <xsd:element name="resources" type="CIAO:ORBResources" minOccurs="0"/> <xsd:element name="policySet" type="CIAO:PolicySet" maxOccurs="unbounded"/> @@ -113,7 +113,7 @@ <xsd:complexType name="ThreadpoolWithLanesDef"> <xsd:sequence> - <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef" + <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef" maxOccurs="unbounded"/> <xsd:element name="stacksize" type="xsd:unsignedLong" /> <xsd:element name="allow_borrowing" type="xsd:boolean"/> @@ -121,7 +121,7 @@ <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/> <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/> </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> <!-- Threadpool ID should be + <xsd:attribute name="id" type="xsd:ID"/> <!-- Threadpool ID should be referenced by individual policies in the policysets below --> </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/README.html b/TAO/CIAO/docs/schema/README.html index d810c8a6065..7b8e84b98ca 100644 --- a/TAO/CIAO/docs/schema/README.html +++ b/TAO/CIAO/docs/schema/README.html @@ -9,7 +9,7 @@ The schema in this directory are all based on the new Deployment and Configuration spec. As part of our work on DAnCE we have tried to subset and normalize the schema so that our developers, and tools -would be able to parse and use the information effectively. +would be able to parse and use the information effectively. The following table illustrates the meaning and use of the various schemata in this directory: @@ -18,7 +18,7 @@ schemata in this directory: <td><b>Spec_Defined_Deployment.xsd</b></td> <td>This is the schema file from the spec which is unaltered. This is just for reference. CIAO and DAnCE will not be using this file - directly. + directly. </td> </tr> <tr valign=top> @@ -36,7 +36,7 @@ schemata in this directory: Deployment and Configuration spec talks about the various descriptors that are part of the package. The schema files are broken down in accordance with the suggested descriptor format in - the section mentioned above. + the section mentioned above. </td> </tr> <tr valign=top"> @@ -59,6 +59,6 @@ schemata in this directory: the ones that CIAo and DAnCedoesn't support.</td> </tr> </table> -</body> +</body> </html> diff --git a/TAO/CIAO/docs/schema/ServerResourceUsage.txt b/TAO/CIAO/docs/schema/ServerResourceUsage.txt index 1300110babb..80acc81026c 100644 --- a/TAO/CIAO/docs/schema/ServerResourceUsage.txt +++ b/TAO/CIAO/docs/schema/ServerResourceUsage.txt @@ -27,7 +27,7 @@ So, the DeploymentPlan should look something like: <type>tk_tring</type> <value>RTConfig4LinuxBox</value> <!-- Component instances will refer to this - name to specify + name to specify required server config --> </value> @@ -52,7 +52,7 @@ So, the DeploymentPlan should look something like: <type>tk_tring</type> <value>RTConfig4Win32Box</value> <!-- Component instances will refer to this - name to specify + name to specify required server config --> </value> @@ -75,7 +75,7 @@ policySet as following: .... <instance ...> - + <deployedResource> <resourceUsage>InstanceUsesResource</resourceUsage> <requirementName>CIAO:PolicySet</requirementName> @@ -99,7 +99,7 @@ policySet as following: </instance> </deploymentplan> - + If only ID of CIAO:ServerResources is specified, we are using it as a collocation constraint. I.e., if two instances are deployed to the same target node with different ServerResources IDs, DAnCE should diff --git a/TAO/CIAO/docs/schema/ccd.xsd b/TAO/CIAO/docs/schema/ccd.xsd index edc80f3b720..b52996c4bab 100644 --- a/TAO/CIAO/docs/schema/ccd.xsd +++ b/TAO/CIAO/docs/schema/ccd.xsd @@ -4,15 +4,16 @@ xmlns:Deployment="http://www.omg.org/Deployment" targetNamespace="http://www.omg.org/Deployment"> - <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> + <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> <xsd:complexType name="ComponentInterfaceDescription"> <xsd:choice minOccurs="0" maxOccurs="1"> <xsd:sequence> <xsd:element name="label" type="xsd:string" minOccurs="0"/> <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> - <xsd:element name="specificType" type="xsd:string"/> - <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded"/> + <!-- @@ MAJO : HACK - SpecificType and SupportedType should be required! --> + <xsd:element name="specificType" type="xsd:string" minOccurs="0" /> + <xsd:element name="supportedType" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="idlFile" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="port" type="Deployment:ComponentPortDescription" minOccurs="0" maxOccurs="unbounded"/> diff --git a/TAO/CIAO/docs/schema/cdd.xsd b/TAO/CIAO/docs/schema/cdd.xsd index 711ec8d4e0a..18d9760f155 100644 --- a/TAO/CIAO/docs/schema/cdd.xsd +++ b/TAO/CIAO/docs/schema/cdd.xsd @@ -8,13 +8,13 @@ <xsd:complexType name="Domain"> <xsd:sequence> - <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> <xsd:element name="label" type="xsd:string" minOccurs="0" /> <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/> - <xsd:element name="interconnect" type="Deployment:Interconnect"/> - <xsd:element name="bridge" type="Deployment:Bridge"/> - <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="interconnect" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="bridge" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> @@ -23,7 +23,7 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="label" type="xsd:string" minOccurs="0" /> <xsd:element name="connect" type="Deployment:Interconnect" maxOccurs="unbounded" /> - <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> @@ -33,17 +33,17 @@ <xsd:element name="label" type="xsd:string" minOccurs="0" /> <xsd:element name="connection" type="Deployment:Bridge" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="connect" type="Deployment:Node" maxOccurs="unbounded" /> - <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - + <xsd:complexType name="Node"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="label" type="xsd:string" minOccurs="0" /> <xsd:element name="connection" type="Deployment:Interconnect" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0" maxOccurs="unbounded" /> - <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="resource" type="Deployment:Resource" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> @@ -53,8 +53,8 @@ <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> <xsd:element name="node" type="Deployment:Node"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:sequence> </xsd:complexType> -</xsd:schema>
\ No newline at end of file +</xsd:schema> diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd index 4fa69acd3fe..36fc24f5fc7 100644 --- a/TAO/CIAO/docs/schema/cdp.xsd +++ b/TAO/CIAO/docs/schema/cdp.xsd @@ -9,8 +9,8 @@ <xsd:complexType name="DeploymentPlan"> <xsd:sequence> <xsd:element name="label" type="xsd:string" minOccurs="0"/> - <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0"/> + <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" /> <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" /> <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> diff --git a/TAO/CIAO/docs/schema/ciaopolicy.xsd b/TAO/CIAO/docs/schema/ciaopolicy.xsd index 93a7415c4b4..0d663ff2166 100644 --- a/TAO/CIAO/docs/schema/ciaopolicy.xsd +++ b/TAO/CIAO/docs/schema/ciaopolicy.xsd @@ -17,7 +17,7 @@ </xs:sequence> </xs:complexType> </xs:element> - + <xs:complexType name="policyType"> <xs:sequence> <xs:choice> @@ -43,12 +43,12 @@ </xs:choice> </xs:sequence> </xs:complexType> - + <xs:complexType name="policyBase" abstract="true"> <xs:annotation> <xs:documentation> This is the base policy type. All policies - should be an extension of this type. + should be an extension of this type. </xs:documentation> </xs:annotation> <xs:sequence> @@ -69,24 +69,24 @@ <xs:simpleType name="policyIDType"> <xs:annotation> <xs:documentation> - This type represents the policy ID. + This type represents the policy ID. Need to add a restriction. </xs:documentation> </xs:annotation> <xs:restriction base="xs:integer"> </xs:restriction> </xs:simpleType> - + <xs:simpleType name="overrideType"> <xs:restriction base="xs:string"> <xs:enumeration value="SET_OVERRIDE" /> <xs:enumeration value="ADD_OVERRIDE" /> </xs:restriction> </xs:simpleType> - - - <!-- The following are extensions of policyBase, one each for each policy + + + <!-- The following are extensions of policyBase, one each for each policy we may want to group these into seperate schema documents, for our own sanity. --> @@ -109,7 +109,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:simpleType name="rebindModeType"> <xs:annotation> <xs:documentation> @@ -170,7 +170,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="replyPriorityPolicyType"> <xs:annotation> <xs:documentation> @@ -186,7 +186,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="priorityRangeType"> <xs:annotation> <xs:documentation> @@ -198,8 +198,8 @@ <xs:element name="max" type="xs:integer" /> </xs:sequence> </xs:complexType> - - + + <xs:complexType name="requestStartTimePolicyType"> <xs:annotation> <xs:documentation> @@ -215,8 +215,8 @@ </xs:extension> </xs:complexContent> </xs:complexType> - - + + <xs:complexType name="requestEndTimePolicyType"> <xs:annotation> <xs:documentation> @@ -232,7 +232,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="replyStartTimePolicyType"> <xs:annotation> @@ -249,7 +249,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="replyEndTimePolicyType"> <xs:annotation> @@ -266,7 +266,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="utcTime"> <xs:annotation> <xs:documentation> @@ -296,7 +296,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:complexType name="relativeRoundtripPolicyType"> <xs:annotation> <xs:documentation> @@ -375,7 +375,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:simpleType name="ordersType"> <xs:annotation> <xs:documentation> @@ -399,7 +399,7 @@ Represents the Priority Model Policy, ID 40 </xs:documentation> </xs:annotation> - + <xs:complexContent> <xs:extension base="ciao:policyBase"> <xs:sequence> @@ -410,7 +410,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <xs:simpleType name="priorityModelType"> <xs:restriction base="xs:string"> <xs:enumeration value="CLIENT_PROPAGATED" /> @@ -426,7 +426,7 @@ Represents the ThreadPool policy, ID 41 </xs:documentation> </xs:annotation> - + <xs:complexContent> <xs:extension base="ciao:policyBase"> <xs:sequence> @@ -436,8 +436,8 @@ </xs:extension> </xs:complexContent> </xs:complexType> - - + + <!-- serverProtocolPolicy --> <xs:complexType name="serverProtocolPolicyType"> @@ -446,7 +446,7 @@ Represents the Server Protocol policy, ID 42 </xs:documentation> </xs:annotation> - + <xs:complexContent> <xs:extension base="ciao:policyBase"> <xs:sequence> @@ -457,8 +457,8 @@ </xs:extension> </xs:complexContent> </xs:complexType> - - + + <!-- clientProtocolPolicy --> <xs:complexType name="clientProtocolPolicyType"> <xs:annotation> @@ -466,7 +466,7 @@ Represents the Client Protocol policy, ID 43 </xs:documentation> </xs:annotation> - + <xs:complexContent> <xs:extension base="ciao:policyBase"> <xs:sequence> @@ -477,7 +477,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <!-- Protocol definitions for client and server Protocol properties types. --> <xs:complexType name="protocolType"> @@ -487,7 +487,7 @@ <xs:element name="transportProtocolProperties" type="ciao:protocolPropertyType" /> </xs:sequence> </xs:complexType> - + <xs:complexType name="protocolPropertyType"> <xs:sequence> <xs:choice> @@ -507,7 +507,7 @@ </xs:annotation> <xs:attribute name="type" type="xs:string" use="required" /> </xs:complexType> - + <xs:complexType name="tcpProtocolPropertiesType"> <xs:complexContent> <xs:extension base="ciao:protocolPropertyBase"> @@ -528,7 +528,7 @@ <xs:extension base="ciao:protocolPropertyBase" /> </xs:complexContent> </xs:complexType> - + <xs:complexType name="unixDomainProtocolPropertiesType"> <xs:complexContent> <xs:extension base="ciao:protocolPropertyBase"> @@ -551,7 +551,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - + <!-- TODO: Provide other protocolProperties types --> <!-- privateConnectionPolicy --> @@ -568,8 +568,8 @@ </xs:extension> </xs:complexContent> </xs:complexType> - - + + <!-- priorityBandedPolicy --> <xs:complexType name="priorityBandedPolicyType"> <xs:annotation> @@ -577,7 +577,7 @@ priorityBandedPolicy extension of policyBase, ID 45 </xs:documentation> </xs:annotation> - + <xs:complexContent> <xs:extension base="ciao:policyBase"> <xs:sequence> @@ -589,7 +589,7 @@ </xs:complexContent> </xs:complexType> - + <xs:complexType name="priorityBandType"> <xs:annotation> <xs:documentation> @@ -601,7 +601,7 @@ <xs:element name="high" type="xs:integer" /> </xs:sequence> </xs:complexType> - -</xs:schema>
\ No newline at end of file + +</xs:schema> diff --git a/TAO/CIAO/docs/schema/cid.xsd b/TAO/CIAO/docs/schema/cid.xsd index c8ecb846d33..7e5233d770f 100644 --- a/TAO/CIAO/docs/schema/cid.xsd +++ b/TAO/CIAO/docs/schema/cid.xsd @@ -4,80 +4,75 @@ xmlns:Deployment="http://www.omg.org/Deployment" targetNamespace="http://www.omg.org/Deployment"> - <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> - <xsd:include schemaLocation="cpd.xsd" /> - <xsd:include schemaLocation="iad.xsd" /> - + <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> + <xsd:include schemaLocation="cpd.xsd" /> + <xsd:include schemaLocation="iad.xsd" /> + <xsd:include schemaLocation="pcd.xsd" /> <xsd:complexType name="SubcomponentInstantiationDescription"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="package" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/> + <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" /> + <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" /> + <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/> + <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> - <xsd:complexType name="SubcomponentPropertyReference"> <xsd:sequence> <xsd:element name="propertyName" type="xsd:string"/> - <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/> + <xsd:element name="instance" type="xsd:IDREF"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="AssemblyPropertyMapping"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> <xsd:element name="externalName" type="xsd:string"/> - <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/> + <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <xsd:complexType name="ComponentAssemblyDescription"> <xsd:sequence> <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/> - <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/> - <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> + <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" minOccurs="0" maxOccurs="unbounded"/> + <!-- <xsd:element name="locality" type="Deployment:Locality" minOccurs="0" maxOccurs="unbounded" /> --> + <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <xsd:complexType name="MonolithicImplementationDescription"> <xsd:sequence> - <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="nodeExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="componentExecParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/> - <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="ComponentImplementationDescription"> - <!-- @@mxiong: added minOccurs="0" maxOccurs="unbounded" - when adding config_handler support - for repoMan - --> <xsd:choice minOccurs="0" maxOccurs="1"> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> + <xsd:element name="label" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> + <!-- @@ MAJO : Hack: Implements should be required. --> + <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0" /> <xsd:choice> <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/> <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/> </xsd:choice> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/> - <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="capability" type="Deployment:Capability" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> - <!-- @@mxiong: added href - when adding config_handler support - for repoMan - --> <xsd:attribute name="href" type="xsd:string" use="optional"/> </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/cpd.xsd b/TAO/CIAO/docs/schema/cpd.xsd index dc8cb81be3f..6f049fa839b 100644 --- a/TAO/CIAO/docs/schema/cpd.xsd +++ b/TAO/CIAO/docs/schema/cpd.xsd @@ -16,25 +16,18 @@ </xsd:complexType> <xsd:complexType name="ComponentPackageDescription"> - <!-- @@mxiong: added minOccurs="0" maxOccurs="1" - when adding config_handler support - for repoMan - --> <xsd:choice minOccurs="0" maxOccurs="1"> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="label" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> + <!-- @@MAJO - This is a hack, realizes is required. --> + <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" /> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation" maxOccurs="unbounded" /> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> - <!-- @@mxiong: added href - when adding config_handler support - for repoMan - --> <xsd:attribute name="href" type="xsd:string" use="optional"/> </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/iad.xsd b/TAO/CIAO/docs/schema/iad.xsd index 246af16cd43..c44166c7d9d 100644 --- a/TAO/CIAO/docs/schema/iad.xsd +++ b/TAO/CIAO/docs/schema/iad.xsd @@ -15,29 +15,18 @@ </xsd:complexType> <xsd:complexType name="ImplementationArtifactDescription"> - <!-- @@mxiong: added minOccurs="0" maxOccurs="1" - when adding config_handler support - for repoMan - --> <xsd:choice minOccurs="0" maxOccurs="1"> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> - - <!-- @@ There probably should be only one location? --> + <xsd:element name="label" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/> - <!-- @@mxiong: move <dependsOn> before <execParameter> --> <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/> - <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> - <!-- @@mxiong: added a href attribute - when adding config_handler support - for repoMan - --> <xsd:attribute name="href" type="xsd:string" use="optional"/> </xsd:complexType> -</xsd:schema>
\ No newline at end of file +</xsd:schema> diff --git a/TAO/CIAO/docs/schema/pcd.xsd b/TAO/CIAO/docs/schema/pcd.xsd index 99a6f62f6be..61f32ddcee7 100644 --- a/TAO/CIAO/docs/schema/pcd.xsd +++ b/TAO/CIAO/docs/schema/pcd.xsd @@ -4,26 +4,29 @@ xmlns:Deployment="http://www.omg.org/Deployment" targetNamespace="http://www.omg.org/Deployment"> - <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> - <xsd:include schemaLocation="cpd.xsd" /> + <xsd:include schemaLocation="Basic_Deployment_Data.xsd" /> + <xsd:include schemaLocation="cpd.xsd" /> + + <xsd:complexType name="ComponentPackageImport"> + <xsd:sequence> + <xsd:element name="location" type="xsd:string" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> <xsd:complexType name="PackageConfiguration"> <xsd:choice> <xsd:sequence> - <xsd:element name="label" type="xsd:string"/> - <xsd:element name="UUID" type="xsd:string"/> -<!-- -@@ recursive, not used - <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/> ---> - - <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/> - <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/> - <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/> + <xsd:element name="label" type="xsd:string" minOccurs="0" /> + <xsd:element name="UUID" type="xsd:string" minOccurs="0" /> + <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription" minOccurs="0" /> + <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration" minOccurs="0" /> + <xsd:element name="importedPackage" type="Deployment:ComponentPackageImport" minOccurs="0" /> + <xsd:element name="referencedPackage" type="Deployment:ComponentPackageReference" minOccurs="0"/> + <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:element name="contentLocation" type="xsd:string"/> </xsd:choice> </xsd:complexType> -</xsd:schema>
\ No newline at end of file +</xsd:schema> diff --git a/TAO/CIAO/docs/schema/toplevel.xsd b/TAO/CIAO/docs/schema/toplevel.xsd index e456a1bc005..0c67f5fb7a9 100644 --- a/TAO/CIAO/docs/schema/toplevel.xsd +++ b/TAO/CIAO/docs/schema/toplevel.xsd @@ -8,8 +8,8 @@ <xsd:complexType name="TopLevelPackageDescription"> <xsd:sequence> - <xsd:element name="package" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/> + <xsd:element name="basePackage" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> -</xsd:schema>
\ No newline at end of file +</xsd:schema> diff --git a/TAO/CIAO/docs/schema/unused_elements.xsd b/TAO/CIAO/docs/schema/unused_elements.xsd index c1200b088e9..6f5aaddabdb 100644 --- a/TAO/CIAO/docs/schema/unused_elements.xsd +++ b/TAO/CIAO/docs/schema/unused_elements.xsd @@ -4,7 +4,7 @@ xmlns:Deployment="http://www.omg.org/Deployment" targetNamespace="http://www.omg.org/Deployment"> -<!-- VAULT +<!-- VAULT Place for strange things. Nobody knows what they are for... @@ -23,14 +23,14 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="ObjrefType"> <xsd:sequence> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="typeId" type="xsd:string"/> + <xsd:element name="typeId" type="xsd:string"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="BoundedStringType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="bound" type="xsd:string"/> + <xsd:element name="bound" type="xsd:string"/> </xsd:choice> </xsd:complexType> @@ -38,7 +38,7 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="FixedType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="digits" type="xsd:string"/> - <xsd:element name="scale" type="xsd:string"/> + <xsd:element name="scale" type="xsd:string"/> </xsd:choice> </xsd:complexType> @@ -46,14 +46,14 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="ArrayType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="length" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> <xsd:complexType name="SequenceType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="bound" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -61,7 +61,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="elementType" type="Deployment:DataType"/> + <xsd:element name="elementType" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -69,14 +69,14 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="typeId" type="xsd:string"/> - <xsd:element name="member" type="Deployment:StructMemberType"/> + <xsd:element name="member" type="Deployment:StructMemberType"/> </xsd:choice> </xsd:complexType> <xsd:complexType name="StructMemberType"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -86,7 +86,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="modifier" type="xsd:string"/> <xsd:element name="baseType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:ValueMemberType"/> + <xsd:element name="member" type="Deployment:ValueMemberType"/> </xsd:choice> </xsd:complexType> @@ -94,7 +94,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="visibility" type="xsd:string"/> - <xsd:element name="type" type="Deployment:DataType"/> + <xsd:element name="type" type="Deployment:DataType"/> </xsd:choice> </xsd:complexType> @@ -104,7 +104,7 @@ Place for strange things. Nobody knows what they are for... <xsd:element name="typeId" type="xsd:string"/> <xsd:element name="default" type="Deployment:UnionMemberType"/> <xsd:element name="discriminatorType" type="Deployment:DataType"/> - <xsd:element name="member" type="Deployment:UnionMemberType"/> + <xsd:element name="member" type="Deployment:UnionMemberType"/> </xsd:choice> </xsd:complexType> @@ -112,7 +112,7 @@ Place for strange things. Nobody knows what they are for... <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="type" type="Deployment:DataType"/> - <xsd:element name="label" type="Deployment:DataValue"/> + <xsd:element name="label" type="Deployment:DataValue"/> </xsd:choice> </xsd:complexType> @@ -120,7 +120,7 @@ Place for strange things. Nobody knows what they are for... <xsd:complexType name="NamedValue"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> - <xsd:element name="value" type="Deployment:DataValue"/> + <xsd:element name="value" type="Deployment:DataValue"/> </xsd:choice> </xsd:complexType> @@ -146,13 +146,13 @@ Place for strange things. Nobody knows what they are for... <!-- - This type is not referenced anywhere. + This type is not referenced anywhere. <xsd:complexType name="RequirementSatisfier"> <xsd:choice minOccurs="0" maxOccurs="unbounded"> <xsd:element name="name" type="xsd:string"/> <xsd:element name="resourceType" type="xsd:string"/> - <xsd:element name="property" type="Deployment:SatisfierProperty"/> + <xsd:element name="property" type="Deployment:SatisfierProperty"/> </xsd:choice> </xsd:complexType> diff --git a/TAO/CIAO/docs/schema/xsc-banner.cpp b/TAO/CIAO/docs/schema/xsc-banner.cpp index ecd90a877a6..53cf582e37e 100644 --- a/TAO/CIAO/docs/schema/xsc-banner.cpp +++ b/TAO/CIAO/docs/schema/xsc-banner.cpp @@ -3,9 +3,9 @@ * * Changes made to this code will most likely be overwritten * when the handlers are recompiled. - * + * * If you find errors or feel that there are bugfixes to be made, * please contact the current XSC maintainer: * Will Otte <wotte@dre.vanderbilt.edu> */ - + diff --git a/TAO/CIAO/docs/schema/xsc-banner.h b/TAO/CIAO/docs/schema/xsc-banner.h index 361ae2c84d1..4208948eae2 100644 --- a/TAO/CIAO/docs/schema/xsc-banner.h +++ b/TAO/CIAO/docs/schema/xsc-banner.h @@ -3,7 +3,7 @@ * * Changes made to this code will most likely be overwritten * when the handlers are recompiled. - * + * * If you find errors or feel that there are bugfixes to be made, * please contact the current XSC maintainer: * Will Otte <wotte@dre.vanderbilt.edu> @@ -12,7 +12,7 @@ // Fixes the VC6 warning 4786. #include "vc6-4786.h" - + // Fix for Borland compilers, which seem to have a broken // <string> include. #ifdef __BORLANDC__ diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp index b692eb6a859..d51f32288be 100644 --- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp +++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp @@ -101,7 +101,7 @@ void this->ciao_emits_[event name]_consumer_->push_[event name] (ev ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + ## else [event name] belongs to a 'publishes' port ACE_Active_Map_Manager<[eventtype]Consumer_var>::iterator end = this->ciao_publishes_[event name]_map_.end (); @@ -469,7 +469,7 @@ CORBA::Object_ptr x->type_id ((const char *) "[facet type's repo id]"); // x->facet_ref (this->provide_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK_RETURN (0); - + collection[i] = x._retn (); ++i; ##end foreach [facet name] with [facet type] @@ -1018,7 +1018,7 @@ void ::Components::FacetDescriptions_var facets_desc = this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + ::Components::ReceptacleDescriptions_var receptacle_desc = get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -1030,7 +1030,7 @@ void ::Components::EmitterDescriptions_var emitter_desc = this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + ::Components::PublisherDescriptions_var publisher_desc = this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif Binary files differindex 3604d32946d..fb224304ecd 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif Binary files differindex 6dcad861f07..05be9c8595c 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg Binary files differindex a8550fe1176..26adb41aaad 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg Binary files differindex 7cf8dc9863e..a35073607cf 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg Binary files differindex e3be06e88de..a55ce9de74f 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg Binary files differindex ceb172b12a8..f8b7670094b 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg Binary files differindex 0559dc7382b..9a6c2ec3772 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg Binary files differindex ba8196220b7..e2fceceb0b1 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg Binary files differindex e4f18c39782..b3c0f2a35ed 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg Binary files differindex 3d3700d9016..dc23399c32e 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg Binary files differindex 8c5f88fd65e..e318a0e123f 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg Binary files differindex c39343517e5..200f332f5e4 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg Binary files differindex c577448df84..1f9d0a670ca 100644 --- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg +++ b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc index 014838a3b5a..ee9912aaa4d 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc @@ -22,7 +22,7 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc { after += Stock_Base_svnt Stock_Base_Distributor_stub sharedname = Distributor_svnt libs += Distributor_stub Stock_Base_stub Stock_Base_svnt - + idlflags += -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL @@ -46,16 +46,16 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc { after += Stock_Base_Distributor_svnt sharedname = Distributor_exec libs += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt - + idlflags += -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h dynamicflags = DISTRIBUTOR_EXEC_BUILD_DLL IDL_Files { - + } Source_Files { - + Distributor_exec.cpp } } diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp index 236bcc345a1..07111b62da3 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp @@ -40,7 +40,7 @@ namespace CIDL_StockDistributor_Impl pulse_Generator::open_h () { // convert the task into a active object that runs in separate thread - return this->activate (); + return this->activate (); } int @@ -49,7 +49,7 @@ namespace CIDL_StockDistributor_Impl this->reactor ()->end_reactor_event_loop (); // wait for all threads in the task to exit before it returns - return this->wait (); + return this->wait (); } int diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd index c2a0630b87b..f6afd13c695 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.ccd @@ -30,4 +30,4 @@ <kind>SimplexReceptacle</kind> </port> -</Deployment:ComponentInterfaceDescription>
\ No newline at end of file +</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid index 47f49102136..c484e8cb273 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cid @@ -32,4 +32,4 @@ </value> </value> </configProperty> -</Deployment:ComponentImplementationDescription>
\ No newline at end of file +</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd index cc6381b658a..e43bb88aa83 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker.cpd @@ -11,4 +11,4 @@ <name>Broker</name> <referencedImplementation href="Broker.cid"/> </implementation> -</Deployment:ComponentPackageDescription>
\ No newline at end of file +</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad index 724a5b2c6bb..b488032ec40 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad @@ -26,4 +26,4 @@ </value> </value> </execParameter> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad index ac1f0834e19..ebd2d43b33a 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad @@ -11,4 +11,4 @@ <name>ACE</name> <referencedArtifact href="Libraries.iad"/> </dependsOn> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad index 2944181e015..85d2bb10eec 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad @@ -26,4 +26,4 @@ </value> </value> </execParameter> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd index 7557e143c56..ceb0380d2ac 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd @@ -38,4 +38,4 @@ <specificType>IDL:Stock/StockQuoter:1.0</specificType> <kind>Facet</kind> </port> -</Deployment:ComponentInterfaceDescription>
\ No newline at end of file +</Deployment:ComponentInterfaceDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid index b5eac80c543..91b9eb7d834 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cid @@ -32,4 +32,4 @@ </value> </value> </configProperty> -</Deployment:ComponentImplementationDescription>
\ No newline at end of file +</Deployment:ComponentImplementationDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd index c451a5637e8..5656275762b 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd @@ -11,4 +11,4 @@ <name>Distributor</name> <referencedImplementation href="Distributor.cid"/> </implementation> -</Deployment:ComponentPackageDescription>
\ No newline at end of file +</Deployment:ComponentPackageDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad index 784e11b99bf..5806e835588 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad @@ -26,4 +26,4 @@ </value> </value> </execParameter> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad index c55a74916ef..bde35461864 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad @@ -11,4 +11,4 @@ <name>ACE</name> <referencedArtifact href="Libraries.iad"/> </dependsOn> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad index 7643089044f..3d755206763 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad @@ -26,4 +26,4 @@ </value> </value> </execParameter> -</Deployment:ImplementationArtifactDescription>
\ No newline at end of file +</Deployment:ImplementationArtifactDescription> diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg b/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg Binary files differindex 2f3edd11329..4a0d9980316 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/images/quoter.jpg diff --git a/TAO/CIAO/docs/value_factory_registration.html b/TAO/CIAO/docs/value_factory_registration.html index 3c2a45d6815..66a4804cdad 100644 --- a/TAO/CIAO/docs/value_factory_registration.html +++ b/TAO/CIAO/docs/value_factory_registration.html @@ -1,49 +1,49 @@ -<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <meta name="Author" content="Jeff Parsons"> - <meta name="GENERATOR" content="Mozilla/4.76 [en] (Windows NT 5.0; U) [Netscape]"> - <title>Registration of Valuetype Factories for Event Sinks</title> - <!-- $Id$ --> - </head> - <body> - <h3>Registration of Valuetype Factories for Event Sinks</h3> - <p>Components with one or more event sink (consumer) ports will need to have a - valuetype factory registered with the underlying ORB in order to correctly - demarshal the state of eventtypes it receives over the wire.</p> - <p>For the common case (eventtypes that contain only one or more state members), - the IDL compiler generates a concrete class with a name constructed from the - valuetype name and an '_init' suffix, and the CIDL compiler generates a macro - in the servant constructor that registers this factory with the container's - ORB. However, an eventtype, like any valuetype, may also contain operation - and/or factory declarations. In these cases things are not so simple. For - example a factory declaration in an IDL valuetype or eventtype will generate a - pure virtual function of the same name in the associated _init class, meaning - that ORB factory registration for this type must be with a derived factory - class written by the application developer. The table below shows all possible - cases of IDL compiler factory generation.</p> - <TABLE BORDER="4" CELLSPACING="4" CELLPADDING="4" ID="Table1"> - <TR> - <TD></TD> - <TD><b>Has Operation</b></TD> - <TD><b>Has No Operation</b></TD> - </TR> - <tr> - <td><b>Has Factory</b></td> - <td>ABSTRACT FACTORY</td> - <td>ABSTRACT FACTORY</td> - </tr> - <tr> - <td><b>Has No Factory</b></td> - <td>NO FACTORY</td> - <td>CONCRETE FACTORY</td> - </tr> - </TABLE> - <p>The CIAO CIDL compiler will generate a macro to register the factory with the - container's ORB only in the case where a concrete factory is generated by the - IDL compiler, and thus no subclassing is necessary. There is also a command - line option for the CIDL compiler, <tt>--suppress-register-factory</tt>, - that turns off generation of the macro in all cases.</p> - </body> -</html> + <!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"> + <html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <meta name="Author" content="Jeff Parsons"> + <meta name="GENERATOR" content="Mozilla/4.76 [en] (Windows NT 5.0; U) [Netscape]"> + <title>Registration of Valuetype Factories for Event Sinks</title> + <!-- $Id$ --> + </head> + <body> + <h3>Registration of Valuetype Factories for Event Sinks</h3> + <p>Components with one or more event sink (consumer) ports will need to have a + valuetype factory registered with the underlying ORB in order to correctly + demarshal the state of eventtypes it receives over the wire.</p> + <p>For the common case (eventtypes that contain only one or more state members), + the IDL compiler generates a concrete class with a name constructed from the + valuetype name and an '_init' suffix, and the CIDL compiler generates a macro + in the servant constructor that registers this factory with the container's + ORB. However, an eventtype, like any valuetype, may also contain operation + and/or factory declarations. In these cases things are not so simple. For + example a factory declaration in an IDL valuetype or eventtype will generate a + pure virtual function of the same name in the associated _init class, meaning + that ORB factory registration for this type must be with a derived factory + class written by the application developer. The table below shows all possible + cases of IDL compiler factory generation.</p> + <TABLE BORDER="4" CELLSPACING="4" CELLPADDING="4" ID="Table1"> + <TR> + <TD></TD> + <TD><b>Has Operation</b></TD> + <TD><b>Has No Operation</b></TD> + </TR> + <tr> + <td><b>Has Factory</b></td> + <td>ABSTRACT FACTORY</td> + <td>ABSTRACT FACTORY</td> + </tr> + <tr> + <td><b>Has No Factory</b></td> + <td>NO FACTORY</td> + <td>CONCRETE FACTORY</td> + </tr> + </TABLE> + <p>The CIAO CIDL compiler will generate a macro to register the factory with the + container's ORB only in the case where a concrete factory is generated by the + IDL compiler, and thus no subclassing is necessary. There is also a command + line option for the CIDL compiler, <tt>--suppress-register-factory</tt>, + that turns off generation of the macro in all cases.</p> + </body> + </html> |
