Final? rename of SHAR/SHIRE sections

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1869 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index 59c452d..3660a33 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -8,8 +8,8 @@
                <Library path="@-LIBEXECDIR-@/xmlproviders.so" fatal="true"/>
        </Extensions>
 
-       <!-- The Global section pertains to shared Shibboleth processes like the shibd daemon. -->
-       <Global logger="@-PKGSYSCONFDIR-@/shibd.logger">
+       <!-- The OutOfProcess section pertains to components that rely on a single long-lived process. -->
+       <OutOfProcess logger="@-PKGSYSCONFDIR-@/shibd.logger">
                
                <!--
                <Extensions>
@@ -51,10 +51,10 @@
                        <Argument>&#x2D;&#x2D;datadir=@-PREFIX-@/data</Argument>
                </MySQLReplayCache>
                -->
-       </Global>
+       </OutOfProcess>
     
-       <!-- The Local section pertains to resource-serving processes (often process pools) like web servers. -->
-       <Local logger="@-PKGSYSCONFDIR-@/native.logger" localRelayState="true">
+       <!-- The InProcess section pertains to components that support transient process pools like most web servers. -->
+       <InProcess logger="@-PKGSYSCONFDIR-@/native.logger" localRelayState="true">
                <!--
                To customize behavior, map hostnames and path components to applicationId and other settings.
                The following provider types are available with the delivered code:
@@ -112,7 +112,7 @@
                                </Site>
                        </ISAPI>
                </Implementation>
-       </Local>
+       </InProcess>
 
        <!--
        The Applications section is where most of Shibboleth's SAML bits are defined.

diff --git a/schemas/shibboleth-targetconfig-1.0.xsd b/schemas/shibboleth-targetconfig-1.0.xsd
index 3f2db64..a0b29c3 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -37,10 +37,12 @@
                <sequence>
                        <element ref="conf:Extensions" minOccurs="0"/>
                        <choice minOccurs="0">
+                               <element name="OutOfProcess" type="conf:GlobalConfigurationType"/>
                                <element name="Global" type="conf:GlobalConfigurationType"/>
                                <element name="SHAR" type="conf:GlobalConfigurationType"/>
                        </choice>
                        <choice minOccurs="0">
+                               <element name="InProcess" type="conf:LocalConfigurationType"/>
                                <element name="Local" type="conf:LocalConfigurationType"/>
                                <element name="SHIRE" type="conf:LocalConfigurationType"/>
                        </choice>