synch up resolver file with schema cleanup changes Will just made
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 4 Jun 2007 23:42:24 +0000 (23:42 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 4 Jun 2007 23:42:24 +0000 (23:42 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2232 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

tests/data/conf1/attribute-resolver.xml

index 3c7461b..5e84696 100644 (file)
@@ -4,38 +4,38 @@
                    xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
-                   xmlns:simple="urn:mace:shibboleth:2.0:resolver:ad:simple"
-                      xmlns:static="urn:mace:shibboleth:2.0:resolver:dc:static"
+                   xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
+                      xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
                    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
                       xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver classpath:/schema/shibboleth-2.0-attribute-resolver.xsd
                                        urn:mace:shibboleth:2.0:resolver:pc classpath:/schema/shibboleth-2.0-attribute-resolver-pc.xsd
-                                       urn:mace:shibboleth:2.0:resolver:ad:simple classpath:/schema/shibboleth-2.0-attribute-resolver-ad-simple.xsd
-                                       urn:mace:shibboleth:2.0:resolver:dc:static classpath:/schema/shibboleth-2.0-attribute-resolver-dc-static.xsd
+                                       urn:mace:shibboleth:2.0:resolver:ad classpath:/schema/shibboleth-2.0-attribute-resolver-ad.xsd
+                                       urn:mace:shibboleth:2.0:resolver:dc classpath:/schema/shibboleth-2.0-attribute-resolver-dc.xsd
                                        urn:mace:shibboleth:2.0:attribute:encoder classpath:/schema/shibboleth-2.0-attribute-encoder.xsd">
                                        
-    <resolver:AttributeDefinition xsi:type="simple:Simple" id="uid">
+    <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid">
         <resolver:DataConnectorDependency ref="static" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" />
     </resolver:AttributeDefinition>
     
-    <resolver:AttributeDefinition xsi:type="simple:Simple" id="cn">
+    <resolver:AttributeDefinition xsi:type="ad:Simple" id="cn">
         <resolver:DataConnectorDependency ref="static" />
     </resolver:AttributeDefinition>
     
-    <resolver:AttributeDefinition xsi:type="simple:Simple" id="email">
+    <resolver:AttributeDefinition xsi:type="ad:Simple" id="email">
         <resolver:DataConnectorDependency ref="static" />
     </resolver:AttributeDefinition>
                                        
-    <resolver:DataConnector xsi:type="static:Static" id="static">
-        <static:Attribute id="uid">
-            <static:Value>testUser</static:Value>
-        </static:Attribute>
-        <static:Attribute id="cn">
-            <static:Value>Test User</static:Value>
-        </static:Attribute>
-        <static:Attribute id="email">
-            <static:Value>t.user@example.org</static:Value>
-        </static:Attribute>
+    <resolver:DataConnector xsi:type="dc:Static" id="static">
+        <dc:Attribute id="uid">
+            <dc:Value>testUser</dc:Value>
+        </dc:Attribute>
+        <dc:Attribute id="cn">
+            <dc:Value>Test User</dc:Value>
+        </dc:Attribute>
+        <dc:Attribute id="email">
+            <dc:Value>t.user@example.org</dc:Value>
+        </dc:Attribute>
     </resolver:DataConnector>
     
     <resolver:PrincipalConnector xsi:type="pc:Direct"