Revert "infoprovider: remove single SRM instance limitation"

This reverts commit 9448a43.

Sites that use a DNS alias for their published SRM endpoint may
be misconfigured by not specifying this in their srm.net.listen
property yet be unaware of this as the SRM will mostly work.

The previous patch ("infoprovider: remove single SRM instance
limitation") causes such misconfigured sites to fail.  Therefore
the patch is removed from this supported branch.

skel/share/info-provider/glue-1.3-defn.xml

@@ -943,9 +943,14 @@
           </allow>
 
 
-          <attr name="GlueServiceUniqueID">httpg://<lookup
-              path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='url-name']"><lookup
-              path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='FQDN']"/></lookup>:<lookup
+          <!-- The GlueService's UniqueID MUST be the URI of the end-point.
+               This is acknowledged as a broken requirement, but it
+               persists.  To support DNS aliases we may need to
+               publish something other than the self-discovered (public)
+               FQDN of the interface.  Currently, the SE-UNIQUE-ID
+               MUST be the SRM's FQDN.  We use this here to support
+               aliases  -->
+          <attr name="GlueServiceUniqueID">httpg://&info-provider.se-unique-id;:<lookup
               path="d:metric[@name='port']"/>/srm/managerv2</attr>
 
           <!-- GlueServiceName is a human-readable string -->
@@ -955,10 +960,10 @@
           <attr name="GlueServiceType">SRM</attr>
           <attr name="GlueServiceVersion">2.2.0</attr>
 
-          <attr name="GlueServiceEndpoint">httpg://<lookup
-              path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='url-name']"><lookup
-              path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='FQDN']"/></lookup>:<lookup
-              path="d:metric[@name='port']"/>/srm/managerv2</attr>
+          <!-- as above, we use the fact that the SRM FQDN must be
+               the SRM FQDN to support DNS aliases -->
+          <attr name="GlueServiceEndpoint">httpg://&info-provider.se-unique-id;:<lookup
+            path="d:metric[@name='port']"/>/srm/managerv2</attr>
 
           <!-- When should we publish something other than "OK" ? -->
           <attr name="GlueServiceStatus">OK</attr>
@@ -1188,12 +1193,15 @@
         </map>
       </attr>
 
-      <attr name="GlueSEControlProtocolEndpoint">httpg://<lookup
-          path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='url-name']"><lookup
-          path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='FQDN']"/></lookup>:<lookup
+      <!-- Publish the URI.  To support DNS aliases we may need to
+           publish something other than the self-discovered (public)
+           FQDN of the interface.  Currently, the SE-UNIQUE-ID
+           MUST be the SRM's FQDN.  We use this here to support
+           aliases  -->
+      <attr name="GlueSEControlProtocolEndpoint">httpg://&info-provider.se-unique-id;:<lookup
           path="d:metric[@name='port']"/>/srm/managerv2</attr>
 
-      <!-- For now we hard-code this. -->
+      <!-- For now we hard-code this, which is wrong -->
       <attr name="GlueSEControlProtocolVersion">2.2.0</attr>
 
       <!-- The following two attributes should depend in whether we are

skel/share/info-provider/glue-2.0-defn.xml

@@ -458,10 +458,8 @@
                 <attr name="GLUE2EndpointInterfaceVersion">2.2</attr>
                 <attr name="GLUE2EndpointCapability">data.management.storage</attr>
                 <attr name="GLUE2EndpointCapability">data.management.transfer</attr>
-                <attr name="GLUE2EndpointURL">httpg://<lookup
-                          path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='url-name']"><lookup
-                          path="d:interfaces/d:interface[d:metric[@name='order']=1]/d:metric[@name='FQDN']"/></lookup>:<lookup
-                          path="d:metric[@name='port']"/>/srm/managerv2</attr>
+                <attr name="GLUE2EndpointURL">httpg://&info-provider.se-unique-id;:<lookup
+                        path="d:metric[@name='port']"/>/srm/managerv2</attr>
               </optionally>
 
               <otherwise>