Change to new eduPerson URNs.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@613 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/data/resolver1.xml b/data/resolver1.xml
index 89364b8..ee4df06 100644 (file)
--- a/data/resolver1.xml
+++ b/data/resolver1.xml
@@ -1,18 +1,18 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonPrincipalName" smartScope="columbia.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="columbia.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonNickName">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonNickName">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver10.xml b/data/resolver10.xml
index f4e72ca..f63bf85 100644 (file)
--- a/data/resolver10.xml
+++ b/data/resolver10.xml
@@ -1,10 +1,10 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonScopedAffiliation" smartScope="example.edu">
-               <DataConnectorDependency requires="urn:mace:eduPerson:1.0:eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="example.edu">
+               <DataConnectorDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
 
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver11.xml b/data/resolver11.xml
index fc86d32..2b7ebdb 100644 (file)
--- a/data/resolver11.xml
+++ b/data/resolver11.xml
@@ -1,6 +1,6 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <AttributeDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver2.xml b/data/resolver2.xml
index 6f47804..cea621b 100644 (file)
--- a/data/resolver2.xml
+++ b/data/resolver2.xml
@@ -1,6 +1,6 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonPrincipalName" smartScope="example.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="example.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver8.xml b/data/resolver8.xml
index 039ed9d..399d0df 100644 (file)
--- a/data/resolver8.xml
+++ b/data/resolver8.xml
@@ -1,14 +1,14 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonPrincipalName" smartScope="example.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="example.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
                <DataConnectorDependency requires="echo2"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <DataConnectorDependency requires="echo3"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver9.xml b/data/resolver9.xml
index c64dcf7..5a5258a 100644 (file)
--- a/data/resolver9.xml
+++ b/data/resolver9.xml
@@ -1,10 +1,10 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonScopedAffiliation" smartScope="example.edu">
-               <AttributeDependency requires="urn:mace:eduPerson:1.0:eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="example.edu">
+               <AttributeDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
 
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/src/conf/log4j.properties b/src/conf/log4j.properties
index 11d90a2..636f1f0 100755 (executable)
--- a/src/conf/log4j.properties
+++ b/src/conf/log4j.properties
@@ -7,21 +7,13 @@
 
 # Default configuration.  Sends logging output to STDOUT.
 
-log4j.rootCategory=WARN, stdout
+# The following block represents an example of how to enable very verbose logging.
+
+log4j.rootCategory=DEBUG, stdout
 log4j.logger.org.apache.xml.security=OFF
-log4j.logger.org.opensaml=OFF
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} - %m%n
-
-
-# The following block represents an example of how to enable very verbose logging.
-
-#log4j.rootCategory=DEBUG, stdout
-#log4j.logger.org.apache.xml.security=OFF
-#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n
 
 
 # The following block represents an example of how to direct logging output to a file.

diff --git a/src/conf/origin.properties b/src/conf/origin.properties
index fbb2089..44c4f75 100755 (executable)
--- a/src/conf/origin.properties
+++ b/src/conf/origin.properties
@@ -7,13 +7,13 @@
 ##### General Configuration #####
 
  # [Required] Name of this Handle Service (usually a dns name)
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.issuer = shib2.internet2.edu
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.issuer = shib2.internet2.edu
 
  # [Required] The name of this origin site (a URI)
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.siteName = urn:mace:incommon:pilot:shibdev.edu
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.siteName = urn:mace:incommon:pilot:shibdev.edu
 
  # [Required] URL at which the corresponding Attribute Authority can be reached
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.AAUrl = http://host.test.edu/shibboleth/AA
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.AAUrl = http://snc.cc.columbia.edu/shibboleth/AA
 
  # [Optional] HTTP Request Header to get principal name from (defaults to REMOTE_USER)
  #edu.internet2.middleware.shibboleth.hs.HandleServlet.username = REMOTE_USER
@@ -25,16 +25,16 @@
 
  # [Required] Location of a Java keystore containing an X509 certificate
  # and matching key.  Used to sign assertions made by this HS
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /conf/keystore.jks
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /conf/keystore.jks
 
  # [Required] Password for the keystore
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword = shibhs
 
  # [Required] Keystore alias for the private key
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyAlias = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyAlias = shibhs
 
  # [Required] Password for the private key
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyPassword = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyPassword = shibhs
 
  # [Optional] Keystore alias for the X509 certificate (Defaults to the private key alias)
  #edu.internet2.middleware.shibboleth.hs.HandleServlet.certAlias = shibhs
@@ -49,7 +49,7 @@
 ##### General Configuration #####
 
  # [Required] Name of this Attribute Authority (usually a dns name)
- #edu.internet2.middleware.shibboleth.aa.AAServlet.authorityName = shib2.internet2.edu
+ edu.internet2.middleware.shibboleth.aa.AAServlet.authorityName = shib2.internet2.edu
  
  # [Optional] Set to true if the Attribute Authority should pass internal error messages to 
  # the SHAR (for debugging purposes) (defaults to false)

diff --git a/src/conf/resolver.xml b/src/conf/resolver.xml
index d85359f..171e71c 100644 (file)
--- a/src/conf/resolver.xml
+++ b/src/conf/resolver.xml
@@ -1,19 +1,19 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonPrincipalName" smartScope="shibdev.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="shibdev.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:eduPerson:1.0:eduPersonScopedAffiliation" smartScope="shibdev.edu">
-               <AttributeDependency requires="urn:mace:eduPerson:1.0:eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="shibdev.edu">
+               <AttributeDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
        
        <CustomDataConnector id="echo"

diff --git a/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java b/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
index 3a1fbc3..50a9db1 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
@@ -107,14 +107,14 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonNickName"),
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonEntitlement")});
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonNickName"),
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonEntitlement")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                 new AAAttribute(
-                                                       "urn:mace:eduPerson:1.0:eduPersonEntitlement",
+                                                       "urn:mace:dir:eduperson#eduPersonEntitlement",
                                                        new Object[] { "urn:mace:example.edu:exampleEntitlement" })
                                                });
 
@@ -145,13 +145,13 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonPrincipalName"),
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonPrincipalName"),
                                                new AAAttribute("foo")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet(new AAAttribute[] {
                                //Attribute should have scope appended to connector output
                                new AAAttribute(
-                                       "urn:mace:eduPerson:1.0:eduPersonPrincipalName",
+                                       "urn:mace:dir:eduperson#eduPersonPrincipalName",
                                        new Object[] { "mytestuser@example.edu" },
                                        new ScopedStringValueHandler("example.edu")),
                                //Attribute should retain scope from connector output
@@ -288,20 +288,20 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonPrincipalName"),
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonAffiliation"),
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonEntitlement")});
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonPrincipalName"),
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonAffiliation"),
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonEntitlement")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                new AAAttribute(
-                                                       "urn:mace:eduPerson:1.0:eduPersonPrincipalName",
+                                                       "urn:mace:dir:eduperson#eduPersonPrincipalName",
                                                        new Object[] { "mytestuser@example.edu" },
                                                        new ScopedStringValueHandler("example.edu")),
-                                               new AAAttribute("urn:mace:eduPerson:1.0:eduPersonAffiliation", new Object[] { "member" }),
+                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonAffiliation", new Object[] { "member" }),
                                                new AAAttribute(
-                                                       "urn:mace:eduPerson:1.0:eduPersonEntitlement",
+                                                       "urn:mace:dir:eduperson#eduPersonEntitlement",
                                                        new Object[] { "urn:mace:example.edu:exampleEntitlement" })
                                                });
 
@@ -331,13 +331,13 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:eduPerson:1.0:eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                 new AAAttribute(
-                                                       "urn:mace:eduPerson:1.0:eduPersonScopedAffiliation",
+                                                       "urn:mace:dir:eduperson#eduPersonScopedAffiliation",
                                                        new Object[] { "member@example.edu" },
                                                        new ScopedStringValueHandler("example.edu"))
                                                });
@@ -368,7 +368,7 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:eduPerson:1.0:eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet();
 
@@ -398,7 +398,7 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:eduPerson:1.0:eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet();